]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 19:48:46 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 19:48:46 +0000 (12:48 -0700)
Pull ARM DT updates from Arnd Bergmann:
 "These are all the updates to device tree files for 32-bit platforms,
  which as usual makes up the bulk of the ARM SoC changes: 462 non-merge
  changesets, 450 files changed, 23340 insertions, 5216 deletions.

  The three platforms that are added with the "soc" branch are here as
  well, and we add some related machine files:

   - For Aspeed AST2400/AST2500, we get the evaluation platform and the
     Tyan Palmetto POWER8 mainboard that uses the AST2400 BMC
   - For Oxnas 810SE, the Western Digital "My Book World Edition" is
     added as the only platform at the moment.
   - For ARM MPS2, the AN385 (Cortex-M3) and AN399 (Cortex-M7) are
     supported

  On the ARM Realview development platform, we now support all machines
  with device tree, previously only the board files were supported,
  which in turn will likely be removed soon.

  Qualcomm IPQ4019 is the second generation ARM based "Internet
  Processor", following the IPQ806x that is used in many high-end WiFi
  routers.  This one integrates two ath10k wifi radios that were
  previously on separate chips.

  Other boards that got added for existing chips are:

  Ti OMAP family:
     - Amazon Kindle Fire, first generation, tablet and ebook reader
     - OnRISC Baltos iR 2110 and 3220 embedded industrial PCs
     - TI AM5728 IDK, TI AM3359 ICE-V2, and TI DRA722 Rev C EVM
       development systems

  Samsung EXYNOS platform:
     - Samsung ARTIK5 evaluation board, see

        https://www.artik.io/modules/overview/artik-5/

  NXP i.MX platforms:
     - Ka-Ro electronics TX6S-8034, TX6S-8035, TX6U-8033, TX6U-81xx,
       TX6Q-1036, TX6Q-1110/-1130, TXUL-0010 and TXUL-0011 industrial
       SoM modules
     - Embest MarS Board i.MX6Dual DIY platform
     - Boundary Devices i.MX6 Quad Plus Nitrogen6_MAX and SoloX
       Nitrogen6sx embedded boards
     - Technexion Pico i.MX6UL compute module
     - ZII VF610 Development Board

  Marvell embedded (mvebu, orion, kirkwood) platforms:
     - Linksys Viper (E4200v2 / EA4500) WiFi router
     - Buffalo Kurobox Pro NAS

  Qualcomm Snapdragon:
     - Arrow DragonBoard 600c (96boards) with APQ8064 Snapdragon 600

  Rockchips platform:
     - mqmaker MiQi single-board computer

  Altera SoCFPGA:
     - samtec VIN|ING 1000 vehicle communication interface

  Allwinner Sunxi platforms:
     - Dserve DSRV9703C tablet
     - Difrnce DIT4350 tablet
     - Colorfly E708 Q1 tablet
     - Polaroid MID2809PXE04 tablet
     - Olimex A20 OLinuXino LIME2 single board computer
     - Xunlong Orange Pi 2, Orange Pi One, and Orange Pi PC single board
       computers

  Across many platforms, bug fixes went in to address warnings that dtc
  now emits with 'make dtbs W=1'.  Further changes for device enablement
  went into Ti OMAP, bcm283x (Raspberry Pi), bcm47xx (wifi router), Ti
  Davinci, Samsung EXYNOS, Marvell mvebu/kirkwood/orion, NXP i.MX/Vybrid
  NXP LPC18xx, NXP LPC32xx, Renesas shmobile/r-mobile/r-car, Rockchips
  rk3xxx, ST Ux500, ST STi, Atmel AT91/SAMA5, Altera SoCFPGA, Allwinner
  Sunxi, Sigma Designs Tango, NVIDIA Tegra, Socionext Uniphier and ARM
  Versatile Express"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (458 commits)
  ARM: dts: tango4: Import watchdog node
  ARM: dts: tango4: Update cpus node for cpufreq
  ARM: dts: tango4: Update DT to match clk driver
  ARM: dts: tango4: Initial thermal support
  arm/dst: Add Aspeed ast2500 device tree
  arm/dts: Add Aspeed ast2400 device tree
  ARM: sun7i: dt: Add pll3 and pll7 clocks
  ARM: dts: sunxi: Add a olinuxino-lime2-emmc
  ARM: dts: at91: sama5d4: add trng node
  ARM: dts: at91: sama5d3: add trng node
  ARM: dts: at91: sama5d2: add trng node
  ARM: dts: at91: at91sam9g45 family: reduce the trng register map size
  ARM: sun4i: dt: Add pll3 and pll7 clocks
  ARM: sun5i: chip: Enable the TV Encoder
  ARM: sun5i: r8: Add display blocks to the DTSI
  ARM: sun5i: a13: Add display and TCON clocks
  ARM: dts: ux500: configure the accelerometers open drain
  ARM: mx5: dts: Enable USB OTG on M53EVK
  ARM: dts: imx6ul-14x14-evk: Add audio support
  ARM: dts: imx6qdl: Remove unneeded unit-addresses
  ...

20 files changed:
1  2 
Documentation/devicetree/bindings/arm/atmel-at91.txt
MAINTAINERS
arch/arm/boot/dts/am335x-baltos-ir5221.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/armada-385-linksys.dtsi
arch/arm/boot/dts/dra7xx-clocks.dtsi
arch/arm/boot/dts/exynos5420-peach-pit.dts
arch/arm/boot/dts/omap34xx.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-board-common.dtsi
arch/arm/boot/dts/omap5-cm-t54.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/qcom-apq8064.dtsi
arch/arm/boot/dts/qcom-msm8974.dtsi
arch/arm/boot/dts/sama5d2.dtsi
arch/arm/mach-davinci/da8xx-dt.c
arch/arm64/boot/dts/renesas/r8a7795.dtsi

index 0b1fcbfe2299c3c350b0c8e1a9a76ce113969d0d,550fd66379936bb533b382ead2dceb51045f07d7..1d800463347942fffb3a8fbb4433116f6da7ff97
@@@ -41,10 -41,6 +41,10 @@@ compatible: must be one of
         - "atmel,sama5d43"
         - "atmel,sama5d44"
  
 +Chipid required properties:
 +- compatible: Should be "atmel,sama5d2-chipid"
 +- reg : Should contain registers location and length
 +
  PIT Timer required properties:
  - compatible: Should be "atmel,at91sam9260-pit"
  - reg: Should contain registers location and length
@@@ -159,7 -155,7 +159,7 @@@ elsewhere
  
  required properties:
  - compatible: Should be "atmel,<chip>-sfr", "syscon".
-   <chip> can be "sama5d3" or "sama5d4".
+   <chip> can be "sama5d3", "sama5d4" or "sama5d2".
  - reg: Should contain registers location and length
  
        sfr@f0038000 {
diff --combined MAINTAINERS
index 8d61475b0a1e6bd06f4e39cfe6a1679ab146da71,efa0d392f5e7c0a6bd6db32a923686773eb0b3cc..eb23a20d0e5b72110ace3cdc1e1ed8a6b60e5b81
@@@ -627,7 -627,6 +627,7 @@@ F: include/linux/altera_jtaguart.
  
  AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
  M:    Tom Lendacky <thomas.lendacky@amd.com>
 +M:    Gary Hook <gary.hook@amd.com>
  L:    linux-crypto@vger.kernel.org
  S:    Supported
  F:    drivers/crypto/ccp/
@@@ -873,9 -872,9 +873,9 @@@ F: drivers/perf/arm_pmu.
  F:    include/linux/perf/arm_pmu.h
  
  ARM PORT
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    arch/arm/
  
@@@ -887,35 -886,35 +887,35 @@@ F:      arch/arm/plat-*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
  
  ARM PRIMECELL AACI PL041 DRIVER
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    sound/arm/aaci.*
  
  ARM PRIMECELL CLCD PL110 DRIVER
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    drivers/video/fbdev/amba-clcd.*
  
  ARM PRIMECELL KMI PL050 DRIVER
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    drivers/input/serio/ambakmi.*
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    drivers/mmc/host/mmci.*
  F:    include/linux/amba/mmci.h
  
  ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    drivers/tty/serial/amba-pl01*.c
  F:    include/linux/amba/serial.h
  
  ARM PRIMECELL BUS SUPPORT
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
@@@ -949,15 -948,12 +949,15 @@@ F:      drivers/clk/sunxi
  
  ARM/Amlogic Meson SoC support
  M:    Carlo Caione <carlo@caione.org>
 +M:    Kevin Hilman <khilman@baylibre.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    linux-meson@googlegroups.com
 +L:    linux-amlogic@lists.infradead.org
  W:    http://linux-meson.com/
  S:    Maintained
  F:    arch/arm/mach-meson/
  F:    arch/arm/boot/dts/meson*
 +F:    arch/arm64/boot/dts/amlogic/
 +F:    drivers/pinctrl/meson/
  N:    meson
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
@@@ -979,13 -975,6 +979,13 @@@ F:       arch/arm/mach-artpe
  F:    arch/arm/boot/dts/artpec6*
  F:    drivers/clk/clk-artpec6.c
  
 +ARM/ASPEED MACHINE SUPPORT
 +M:    Joel Stanley <joel@jms.id.au>
 +S:    Maintained
 +F:    arch/arm/mach-aspeed/
 +F:    arch/arm/boot/dts/aspeed-*
 +F:    drivers/*/*aspeed*
 +
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@@ -1047,7 -1036,7 +1047,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  
  ARM/CLKDEV SUPPORT
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/include/asm/clkdev.h
@@@ -1104,9 -1093,9 +1104,9 @@@ F:      arch/arm/boot/dts/cx92755
  N:    digicolor
  
  ARM/EBSA110 MACHINE SUPPORT
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    arch/arm/mach-ebsa110/
  F:    drivers/net/ethernet/amd/am79c961a.*
@@@ -1135,9 -1124,9 +1135,9 @@@ T:      git git://git.berlios.de/gemini-boar
  F:    arch/arm/mm/*-fa*
  
  ARM/FOOTBRIDGE ARCHITECTURE
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    arch/arm/include/asm/hardware/dec21285.h
  F:    arch/arm/mach-footbridge/
@@@ -1271,7 -1260,7 +1271,7 @@@ M:      Santosh Shilimkar <ssantosh@kernel.o
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
- F:    arch/arm/boot/dts/k2*
+ F:    arch/arm/boot/dts/keystone-*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -1299,12 -1288,6 +1299,12 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/memory/*emif*
  
 +ARM/LG1K ARCHITECTURE
 +M:    Chanho Min <chanho.min@lge.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/lg/
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1323,25 -1306,11 +1323,25 @@@ F:   drivers/mtd/spi-nor/nxp-spifi.
  F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
 +ARM/LPC32XX SOC SUPPORT
 +M:    Vladimir Zapolskiy <vz@mleia.com>
 +M:    Sylvain Lemieux <slemieux.tyco@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
 +S:    Maintained
 +F:    arch/arm/boot/dts/lpc32*
 +F:    arch/arm/mach-lpc32xx/
 +F:    drivers/i2c/busses/i2c-pnx.c
 +F:    drivers/net/ethernet/nxp/lpc_eth.c
 +F:    drivers/usb/host/ohci-nxp.c
 +F:    drivers/watchdog/pnx4008_wdt.c
 +N:    lpc32xx
 +
  ARM/MAGICIAN MACHINE SUPPORT
  M:    Philipp Zabel <philipp.zabel@gmail.com>
  S:    Maintained
  
 -ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support
 +ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Gregory Clement <gregory.clement@free-electrons.com>
@@@ -1353,7 -1322,6 +1353,7 @@@ F:      drivers/rtc/rtc-armada38x.
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
  F:    arch/arm64/boot/dts/marvell/armada*
 +F:    drivers/cpufreq/mvebu-cpufreq.c
  
  
  ARM/Marvell Berlin SoC support
@@@ -1387,15 -1355,6 +1387,15 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/OXNAS platform support
 +M:    Neil Armstrong <narmstrong@baylibre.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-oxnas/
 +F:    arch/arm/boot/dts/oxnas*
 +F:    arch/arm/boot/dts/wd-mbwe.dts
 +N:    oxnas
 +
  ARM/Mediatek RTC DRIVER
  M:    Eddie Huang <eddie.huang@mediatek.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1498,7 -1457,7 +1498,7 @@@ S:      Maintaine
  ARM/PT DIGITAL BOARD PORT
  M:    Stefan Eletzhofer <stefan.eletzhofer@eletztrick.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
@@@ -1511,10 -1470,7 +1511,10 @@@ F:    arch/arm/boot/dts/qcom-*.dt
  F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
  F:    arch/arm64/boot/dts/qcom/*
 +F:    drivers/i2c/busses/i2c-qup.c
 +F:    drivers/clk/qcom/
  F:    drivers/soc/qcom/
 +F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
@@@ -1537,9 -1493,9 +1537,9 @@@ S:      Supporte
  F:    arch/arm64/boot/dts/renesas/
  
  ARM/RISCPC ARCHITECTURE
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    arch/arm/include/asm/hardware/entry-macro-iomd.S
  F:    arch/arm/include/asm/hardware/ioc.h
@@@ -1682,7 -1638,6 +1682,7 @@@ F:      arch/arm/boot/dts/sti
  F:    drivers/char/hw_random/st-rng.c
  F:    drivers/clocksource/arm_global_timer.c
  F:    drivers/clocksource/clksrc_st_lpc.c
 +F:    drivers/cpufreq/sti-cpufreq.c
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
@@@ -1692,7 -1647,6 +1692,7 @@@ F:      drivers/phy/phy-miphy365x.
  F:    drivers/phy/phy-stih407-usb.c
  F:    drivers/phy/phy-stih41x-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
 +F:    drivers/remoteproc/st_remoteproc.c
  F:    drivers/reset/sti/
  F:    drivers/rtc/rtc-st-lpc.c
  F:    drivers/tty/serial/st-asc.c
@@@ -1817,12 -1771,11 +1817,12 @@@ F:   */*/vexpress
  F:    */*/*/vexpress*
  F:    drivers/clk/versatile/clk-vexpress-osc.c
  F:    drivers/clocksource/versatile.c
 +N:    mps2
  
  ARM/VFP SUPPORT
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    arch/arm/vfp/
  
@@@ -2250,13 -2203,10 +2250,13 @@@ BATMAN ADVANCE
  M:    Marek Lindner <mareklindner@neomailbox.ch>
  M:    Simon Wunderlich <sw@simonwunderlich.de>
  M:    Antonio Quartulli <a@unstable.cc>
 -L:    b.a.t.m.a.n@lists.open-mesh.org
 +L:    b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
  W:    https://www.open-mesh.org/
  Q:    https://patchwork.open-mesh.org/project/batman/list/
  S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
 +F:    Documentation/ABI/testing/sysfs-class-net-mesh
 +F:    Documentation/networking/batman-adv.txt
  F:    net/batman-adv/
  
  BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@@ -2971,7 -2921,7 +2971,7 @@@ F:      mm/cleancache.
  F:    include/linux/cleancache.h
  
  CLK API
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-clk@vger.kernel.org
  S:    Maintained
  F:    include/linux/clk.h
@@@ -3398,16 -3348,15 +3398,16 @@@ F:   Documentation/powerpc/cxlflash.tx
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <peppe.cavallaro@st.com>
 +M:    Alexandre Torgue <alexandre.torgue@st.com>
  L:    netdev@vger.kernel.org
  W:    http://www.stlinux.com
  S:    Supported
  F:    drivers/net/ethernet/stmicro/stmmac/
  
  CYBERPRO FB DRIVER
 -M:    Russell King <linux@arm.linux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -W:    http://www.arm.linux.org.uk/
 +W:    http://www.armlinux.org.uk/
  S:    Maintained
  F:    drivers/video/fbdev/cyber2000fb.*
  
@@@ -3590,15 -3539,6 +3590,15 @@@ F:    drivers/devfreq/devfreq-event.
  F:    include/linux/devfreq-event.h
  F:    Documentation/devicetree/bindings/devfreq/event/
  
 +BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-samsung-soc@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +S:    Maintained
 +F:    drivers/devfreq/exynos-bus.c
 +F:    Documentation/devicetree/bindings/devfreq/exynos-bus.txt
 +
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <device@lanana.org>
  W:    http://lanana.org/docs/device-list/index.html
@@@ -3941,7 -3881,7 +3941,7 @@@ F:      Documentation/devicetree/bindings/di
  
  DRM DRIVERS FOR VIVANTE GPU IP
  M:    Lucas Stach <l.stach@pengutronix.de>
 -R:    Russell King <linux+etnaviv@arm.linux.org.uk>
 +R:    Russell King <linux+etnaviv@armlinux.org.uk>
  R:    Christian Gmeiner <christian.gmeiner@gmail.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
@@@ -4283,8 -4223,8 +4283,8 @@@ F:      Documentation/efi-stub.tx
  F:    arch/ia64/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/x86/include/asm/efi.h
 -F:    arch/x86/platform/efi/*
 -F:    drivers/firmware/efi/*
 +F:    arch/x86/platform/efi/
 +F:    drivers/firmware/efi/
  F:    include/linux/efi*.h
  
  EFI VARIABLE FILESYSTEM
@@@ -4804,7 -4744,7 +4804,7 @@@ F:      drivers/platform/x86/fujitsu-tablet.
  
  FUSE: FILESYSTEM IN USERSPACE
  M:    Miklos Szeredi <miklos@szeredi.hu>
 -L:    fuse-devel@lists.sourceforge.net
 +L:    linux-fsdevel@vger.kernel.org
  W:    http://fuse.sourceforge.net/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
  S:    Maintained
@@@ -4944,7 -4884,6 +4944,7 @@@ M:      Alexandre Courbot <gnurou@gmail.com
  L:    linux-gpio@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/gpio/
  F:    Documentation/ABI/testing/gpio-cdev
  F:    Documentation/ABI/obsolete/sysfs-gpio
@@@ -4964,7 -4903,7 +4964,7 @@@ F:      net/ipv4/gre_offload.
  F:    include/net/gre.h
  
  GRETH 10/100/1G Ethernet MAC device driver
 -M:    Kristoffer Glembo <kristoffer@gaisler.com>
 +M:    Andreas Larsson <andreas@gaisler.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/net/ethernet/aeroflex/
@@@ -5805,6 -5744,13 +5805,6 @@@ F:     drivers/char/hw_random/ixp4xx-rng.
  
  INTEL ETHERNET DRIVERS
  M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 -R:    Jesse Brandeburg <jesse.brandeburg@intel.com>
 -R:    Shannon Nelson <shannon.nelson@intel.com>
 -R:    Carolyn Wyborny <carolyn.wyborny@intel.com>
 -R:    Don Skidmore <donald.c.skidmore@intel.com>
 -R:    Bruce Allan <bruce.w.allan@intel.com>
 -R:    John Ronciak <john.ronciak@intel.com>
 -R:    Mitch Williams <mitch.a.williams@intel.com>
  L:    intel-wired-lan@lists.osuosl.org (moderated for non-subscribers)
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -6081,7 -6027,7 +6081,7 @@@ F:      include/scsi/*iscsi
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Or Gerlitz <ogerlitz@mellanox.com>
 -M:    Sagi Grimberg <sagig@mellanox.com>
 +M:    Sagi Grimberg <sagi@grimberg.me>
  M:    Roi Dayan <roid@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
@@@ -6091,7 -6037,7 +6091,7 @@@ Q:      http://patchwork.kernel.org/project/
  F:    drivers/infiniband/ulp/iser/
  
  ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
 -M:    Sagi Grimberg <sagig@mellanox.com>
 +M:    Sagi Grimberg <sagi@grimberg.me>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
  L:    linux-rdma@vger.kernel.org
  L:    target-devel@vger.kernel.org
@@@ -6306,8 -6252,8 +6306,8 @@@ S:      Maintaine
  F:    tools/testing/selftests
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Gleb Natapov <gleb@kernel.org>
  M:    Paolo Bonzini <pbonzini@redhat.com>
 +M:    Radim Krčmář <rkrcmar@redhat.com>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@ -6454,7 -6400,7 +6454,7 @@@ F:      mm/kmemleak.
  F:    mm/kmemleak-test.c
  
  KPROBES
 -M:    Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 +M:    Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
  M:    Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  M:    "David S. Miller" <davem@davemloft.net>
  M:    Masami Hiramatsu <mhiramat@kernel.org>
@@@ -6742,7 -6688,6 +6742,7 @@@ F:      kernel/livepatch
  F:    include/linux/livepatch.h
  F:    arch/x86/include/asm/livepatch.h
  F:    arch/x86/kernel/livepatch.c
 +F:    Documentation/livepatch/
  F:    Documentation/ABI/testing/sysfs-kernel-livepatch
  F:    samples/livepatch/
  L:    live-patching@vger.kernel.org
@@@ -6831,6 -6776,12 +6831,6 @@@ W:     logfs.or
  S:    Maintained
  F:    fs/logfs/
  
 -LPC32XX MACHINE SUPPORT
 -M:    Roland Stigge <stigge@antcom.de>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-lpc32xx/
 -
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <sathya.prakash@broadcom.com>
  M:    Chaitra P B <chaitra.basappa@broadcom.com>
@@@ -6954,7 -6905,7 +6954,7 @@@ L:      linux-man@vger.kernel.or
  S:    Maintained
  
  MARVELL ARMADA DRM SUPPORT
 -M:    Russell King <rmk+kernel@arm.linux.org.uk>
 +M:    Russell King <rmk+kernel@armlinux.org.uk>
  S:    Maintained
  F:    drivers/gpu/drm/armada/
  
@@@ -7069,9 -7020,9 +7069,9 @@@ M:      Chanwoo Choi <cw00.choi@samsung.com
  M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    drivers/*/max14577.c
 +F:    drivers/*/max14577*.c
  F:    drivers/*/max77686*.c
 -F:    drivers/*/max77693.c
 +F:    drivers/*/max77693*.c
  F:    drivers/extcon/extcon-max14577.c
  F:    drivers/extcon/extcon-max77693.c
  F:    drivers/rtc/rtc-max77686.c
@@@ -7954,7 -7905,7 +7954,7 @@@ S:      Supporte
  F:    drivers/nfc/nxp-nci
  
  NXP TDA998X DRM DRIVER
 -M:    Russell King <rmk+kernel@arm.linux.org.uk>
 +M:    Russell King <rmk+kernel@armlinux.org.uk>
  S:    Supported
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
@@@ -8027,7 -7978,7 +8027,7 @@@ F:      arch/arm/*omap*/*pm
  F:    drivers/cpufreq/omap-cpufreq.c
  
  OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 -M:    Rajendra Nayak <rnayak@ti.com>
 +M:    Rajendra Nayak <rnayak@codeaurora.org>
  M:    Paul Walmsley <paul@pwsan.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
@@@ -9538,7 -9489,7 +9538,7 @@@ F:      drivers/net/wireless/realtek/rtlwifi
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <Jes.Sorensen@redhat.com>
  L:    linux-wireless@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  S:    Maintained
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
@@@ -10063,8 -10014,7 +10063,8 @@@ F:   drivers/infiniband/hw/ocrdma
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
 -M:    Shradha Shah <sshah@solarflare.com>
 +M:    Edward Cree <ecree@solarflare.com>
 +M:    Bert Kenward <bkenward@solarflare.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/sfc/
@@@ -10210,8 -10160,8 +10210,8 @@@ F:   arch/arm/mach-s3c24xx/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
  M:    Kevin Hilman <khilman@kernel.org>
 -T:    git git://gitorious.org/linux-davinci/linux-davinci.git
 -Q:    http://patchwork.kernel.org/project/linux-davinci/list/
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
@@@ -11121,15 -11071,6 +11121,15 @@@ S: Maintaine
  F:    drivers/clk/ti/
  F:    include/linux/clk/ti.h
  
 +TI ETHERNET SWITCH DRIVER (CPSW)
 +M:    Mugunthan V N <mugunthanvnm@ti.com>
 +R:    Grygorii Strashko <grygorii.strashko@ti.com>
 +L:    linux-omap@vger.kernel.org
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/ti/cpsw*
 +F:    drivers/net/ethernet/ti/davinci*
 +
  TI FLASH MEDIA INTERFACE DRIVER
  M:    Alex Dubov <oakad@yahoo.com>
  S:    Maintained
@@@ -11295,13 -11236,14 +11295,13 @@@ S:        Maintaine
  F:    drivers/media/i2c/tc358743*
  F:    include/media/i2c/tc358743.h
  
 -TMIO MMC DRIVER
 -M:    Ian Molton <ian@mnementh.co.uk>
 +TMIO/SDHI MMC DRIVER
 +M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  L:    linux-mmc@vger.kernel.org
 -S:    Maintained
 +S:    Supported
  F:    drivers/mmc/host/tmio_mmc*
  F:    drivers/mmc/host/sh_mobile_sdhi.c
 -F:    include/linux/mmc/tmio.h
 -F:    include/linux/mmc/sh_mobile_sdhi.h
 +F:    include/linux/mfd/tmio.h
  
  TMP401 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -11366,20 -11308,6 +11366,20 @@@ F: include/trace
  F:    kernel/trace/
  F:    tools/testing/selftests/ftrace/
  
 +TRACING MMIO ACCESSES (MMIOTRACE)
 +M:    Steven Rostedt <rostedt@goodmis.org>
 +M:    Ingo Molnar <mingo@kernel.org>
 +R:    Karol Herbst <karolherbst@gmail.com>
 +R:    Pekka Paalanen <ppaalanen@gmail.com>
 +S:    Maintained
 +L:    linux-kernel@vger.kernel.org
 +L:    nouveau@lists.freedesktop.org
 +F:    kernel/trace/trace_mmiotrace.c
 +F:    include/linux/mmiotrace.h
 +F:    arch/x86/mm/kmmio.c
 +F:    arch/x86/mm/mmio-mod.c
 +F:    arch/x86/mm/testmmiotrace.c
 +
  TRIVIAL PATCHES
  M:    Jiri Kosina <trivial@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
@@@ -12059,9 -11987,7 +12059,9 @@@ L:   linux-kernel@vger.kernel.or
  W:    http://www.slimlogic.co.uk/?p=48
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:    Supported
 +F:    Documentation/devicetree/bindings/regulator/
  F:    drivers/regulator/
 +F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
  
  VRF
index 4e28d87e935637140af712abf5a661f338437db9,227cdfb4df086b013ab99b06123f9000aee292bb..d0faa7b8c5da91f318c2de4c5be19af910f17386
  
  /dts-v1/;
  
- #include "am33xx.dtsi"
- #include <dt-bindings/pwm/pwm.h>
- #include <dt-bindings/interrupt-controller/irq.h>
+ #include "am335x-baltos.dtsi"
  
  / {
        model = "OnRISC Baltos iR 5221";
-       compatible = "vscom,onrisc", "ti,am33xx";
-       cpus {
-               cpu@0 {
-                       cpu0-supply = <&vdd1_reg>;
-               };
-       };
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x10000000>; /* 256 MB */
-       };
-       vbat: fixedregulator@0 {
-               compatible = "regulator-fixed";
-               regulator-name = "vbat";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-boot-on;
-       };
-       wl12xx_vmmc: fixedregulator@2 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&wl12xx_gpio>;
-               compatible = "regulator-fixed";
-               regulator-name = "vwl1271";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio3 8 0>;
-               startup-delay-us = <70000>;
-               enable-active-high;
-       };
  };
  
  &am33xx_pinmux {
-       mmc2_pins: pinmux_mmc2_pins {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x820, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_ad8.mmc1_dat0_mux0 */
-                       AM33XX_IOPAD(0x824, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_ad9.mmc1_dat1_mux0 */
-                       AM33XX_IOPAD(0x828, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_ad10.mmc1_dat2_mux0 */
-                       AM33XX_IOPAD(0x82c, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_ad11.mmc1_dat3_mux0 */
-                       AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_csn1.mmc1_clk_mux0 */
-                       AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2)      /* gpmc_csn2.mmc1_cmd_mux0 */
-                       AM33XX_IOPAD(0x9e4, PIN_INPUT_PULLUP | MUX_MODE7)      /* emu0.gpio3[7] */
-               >;
-       };
-       wl12xx_gpio: pinmux_wl12xx_gpio {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x9e8, PIN_OUTPUT_PULLUP | MUX_MODE7)      /* emu1.gpio3[8] */
-               >;
-       };
-       tps65910_pins: pinmux_tps65910_pins {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x878, PIN_INPUT_PULLUP | MUX_MODE7)      /* gpmc_ben1.gpio1[28] */
-               >;
-       };
        tca6416_pins: pinmux_tca6416_pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x9b4, PIN_INPUT_PULLUP | MUX_MODE7)      /* xdma_event_intr1.gpio0[20] tca6416 stuff */
                >;
        };
  
-       i2c1_pins: pinmux_i2c1_pins {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x958, PIN_INPUT | MUX_MODE2)      /* spi0_d1.i2c1_sda_mux3 */
-                       AM33XX_IOPAD(0x95c, PIN_INPUT | MUX_MODE2)      /* spi0_cs0.i2c1_scl_mux3 */
-               >;
-       };
  
        dcan1_pins: pinmux_dcan1_pins {
                pinctrl-single,pins = <
                >;
        };
  
-       uart0_pins: pinmux_uart0_pins {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)       /* uart0_rxd.uart0_rxd */
-                       AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)            /* uart0_txd.uart0_txd */
-               >;
-       };
        uart1_pins: pinmux_uart1_pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x980, PIN_INPUT | MUX_MODE0)      /* uart1_rxd */
                        AM33XX_IOPAD(0x984, PIN_INPUT | MUX_MODE0)      /* uart1_txd */
-                       AM33XX_IOPAD(0x978, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* uart1_ctsn, INPUT | MODE0 */
-                       AM33XX_IOPAD(0x97c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)      /* uart1_rtsn, OUTPUT | MODE0 */
+                       AM33XX_IOPAD(0x978, PIN_INPUT_PULLDOWN | MUX_MODE0)      /* uart1_ctsn */
+                       AM33XX_IOPAD(0x97c, PIN_OUTPUT_PULLDOWN | MUX_MODE0)      /* uart1_rtsn */
                        AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE7)      /* lcd_vsync.gpio2[22] DTR */
                        AM33XX_IOPAD(0x8e4, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* lcd_hsync.gpio2[23] DSR */
                        AM33XX_IOPAD(0x8e8, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* lcd_pclk.gpio2[24] DCD */
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1)      /* spi0_sclk.uart2_rxd_mux3 */
                        AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1)      /* spi0_d0.uart2_txd_mux3 */
-                       AM33XX_IOPAD(0x988, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* i2c0_sda.uart2_ctsn_mux0 */
-                       AM33XX_IOPAD(0x98c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)      /* i2c0_scl.uart2_rtsn_mux0 */
+                       AM33XX_IOPAD(0x988, PIN_INPUT_PULLDOWN | MUX_MODE2)      /* i2c0_sda.uart2_ctsn_mux0 */
+                       AM33XX_IOPAD(0x98c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)      /* i2c0_scl.uart2_rtsn_mux0 */
                        AM33XX_IOPAD(0x830, PIN_OUTPUT_PULLDOWN | MUX_MODE7)      /* gpmc_ad12.gpio1[12] DTR */
                        AM33XX_IOPAD(0x834, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* gpmc_ad13.gpio1[13] DSR */
                        AM33XX_IOPAD(0x838, PIN_INPUT_PULLDOWN | MUX_MODE7)      /* gpmc_ad14.gpio1[14] DCD */
                >;
        };
  
-       cpsw_default: cpsw_default {
-               pinctrl-single,pins = <
-                       /* Slave 1 */
-                       AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE1)       /* mii1_crs.rmii1_crs_dv */
-                       AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE1)      /* mii1_tx_en.rmii1_txen */
-                       AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE1)      /* mii1_txd1.rmii1_txd1 */
-                       AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE1)      /* mii1_txd0.rmii1_txd0 */
-                       AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE1)      /* mii1_rxd1.rmii1_rxd1 */
-                       AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE1)      /* mii1_rxd0.rmii1_rxd0 */
-                       AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE0)      /* rmii1_ref_clk.rmii1_refclk */
-                       /* Slave 2 */
-                       AM33XX_IOPAD(0x840, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a0.rgmii2_tctl */
-                       AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a1.rgmii2_rctl */
-                       AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a2.rgmii2_td3 */
-                       AM33XX_IOPAD(0x84c, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a3.rgmii2_td2 */
-                       AM33XX_IOPAD(0x850, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a4.rgmii2_td1 */
-                       AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a5.rgmii2_td0 */
-                       AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLDOWN | MUX_MODE2)    /* gpmc_a6.rgmii2_tclk */
-                       AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a7.rgmii2_rclk */
-                       AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a8.rgmii2_rd3 */
-                       AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a9.rgmii2_rd2 */
-                       AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a10.rgmii2_rd1 */
-                       AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE2)     /* gpmc_a11.rgmii2_rd0 */
-               >;
-       };
-       cpsw_sleep: cpsw_sleep {
-               pinctrl-single,pins = <
-                       /* Slave 1 reset value */
-                       AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       /* Slave 2 reset value*/
-                       AM33XX_IOPAD(0x840, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x848, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x84c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x850, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-               >;
-       };
-       davinci_mdio_default: davinci_mdio_default {
-               pinctrl-single,pins = <
-                       /* MDIO */
-                       AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)       /* mdio_data.mdio_data */
-                       AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0)                      /* mdio_clk.mdio_clk */
-               >;
-       };
-       davinci_mdio_sleep: davinci_mdio_sleep {
-               pinctrl-single,pins = <
-                       /* MDIO reset value */
-                       AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7)
-                       AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7)
-               >;
-       };
-       nandflash_pins_s0: nandflash_pins_s0 {
-               pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad0.gpmc_ad0 */
-                       AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad1.gpmc_ad1 */
-                       AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad2.gpmc_ad2 */
-                       AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad3.gpmc_ad3 */
-                       AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad4.gpmc_ad4 */
-                       AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad5.gpmc_ad5 */
-                       AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad6.gpmc_ad6 */
-                       AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_ad7.gpmc_ad7 */
-                       AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE0)       /* gpmc_wait0.gpmc_wait0 */
-                       AM33XX_IOPAD(0x874, PIN_INPUT_PULLUP | MUX_MODE7)       /* gpmc_wpn.gpio0_30 */
-                       AM33XX_IOPAD(0x87c, PIN_OUTPUT | MUX_MODE0)             /* gpmc_csn0.gpmc_csn0  */
-                       AM33XX_IOPAD(0x890, PIN_OUTPUT | MUX_MODE0)             /* gpmc_advn_ale.gpmc_advn_ale */
-                       AM33XX_IOPAD(0x894, PIN_OUTPUT | MUX_MODE0)             /* gpmc_oen_ren.gpmc_oen_ren */
-                       AM33XX_IOPAD(0x898, PIN_OUTPUT | MUX_MODE0)             /* gpmc_wen.gpmc_wen */
-                       AM33XX_IOPAD(0x89c, PIN_OUTPUT | MUX_MODE0)             /* gpmc_be0n_cle.gpmc_be0n_cle */
-               >;
-       };
- };
- &elm {
-       status = "okay";
- };
- &gpmc {
-       pinctrl-names = "default";
-       pinctrl-0 = <&nandflash_pins_s0>;
-       ranges = <0 0 0x08000000 0x10000000>;   /* CS0: NAND */
-       status = "okay";
-       nand@0,0 {
-               compatible = "ti,omap2-nand";
-               reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
-               interrupt-parent = <&gpmc>;
-               interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
-                            <1 IRQ_TYPE_NONE>; /* termcount */
-               nand-bus-width = <8>;
-               ti,nand-ecc-opt = "bch8";
-               ti,nand-xfer-type = "polled";
-               gpmc,device-nand = "true";
-               gpmc,device-width = <1>;
-               gpmc,sync-clk-ps = <0>;
-               gpmc,cs-on-ns = <0>;
-               gpmc,cs-rd-off-ns = <44>;
-               gpmc,cs-wr-off-ns = <44>;
-               gpmc,adv-on-ns = <6>;
-               gpmc,adv-rd-off-ns = <34>;
-               gpmc,adv-wr-off-ns = <44>;
-               gpmc,we-on-ns = <0>;
-               gpmc,we-off-ns = <40>;
-               gpmc,oe-on-ns = <0>;
-               gpmc,oe-off-ns = <54>;
-               gpmc,access-ns = <64>;
-               gpmc,rd-cycle-ns = <82>;
-               gpmc,wr-cycle-ns = <82>;
-               gpmc,bus-turnaround-ns = <0>;
-               gpmc,cycle2cycle-delay-ns = <0>;
-               gpmc,clk-activation-ns = <0>;
-               gpmc,wr-access-ns = <40>;
-               gpmc,wr-data-mux-bus-ns = <0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               elm_id = <&elm>;
-       };
- };
- &uart0 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins>;
-       status = "okay";
  };
  
  &uart1 {
        dsr-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;
        dcd-gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;
        rng-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;
-       cts-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-       rts-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
  
        status = "okay";
  };
        dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
        dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
        rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
-       cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;
-       rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
  
        status = "okay";
  };
  
  &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c1_pins>;
-       status = "okay";
-       clock-frequency = <400000>;
-       tps: tps@2d {
-               reg = <0x2d>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <28 GPIO_ACTIVE_LOW>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&tps65910_pins>;
-       };
-       at24@50 {
-               compatible = "at24,24c02";
-               pagesize = <8>;
-               reg = <0x50>;
-       };
        tca6416: gpio@20 {
                compatible = "ti,tca6416";
                reg = <0x20>;
        };
  };
  
- &usb {
-       status = "okay";
- };
- &usb_ctrl_mod {
-       status = "okay";
- };
  &usb0_phy {
        status = "okay";
  };
        dr_mode = "otg";
  };
  
- &cppi41dma  {
-       status = "okay";
- };
- #include "tps65910.dtsi"
- &tps {
-       vcc1-supply = <&vbat>;
-       vcc2-supply = <&vbat>;
-       vcc3-supply = <&vbat>;
-       vcc4-supply = <&vbat>;
-       vcc5-supply = <&vbat>;
-       vcc6-supply = <&vbat>;
-       vcc7-supply = <&vbat>;
-       vccio-supply = <&vbat>;
-       ti,en-ck32k-xtal = <1>;
-       regulators {
-               vrtc_reg: regulator@0 {
-                       regulator-always-on;
-               };
-               vio_reg: regulator@1 {
-                       regulator-always-on;
-               };
-               vdd1_reg: regulator@2 {
-                       /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-                       regulator-name = "vdd_mpu";
-                       regulator-min-microvolt = <912500>;
-                       regulator-max-microvolt = <1312500>;
-                       regulator-boot-on;
-                       regulator-always-on;
-               };
-               vdd2_reg: regulator@3 {
-                       /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-                       regulator-name = "vdd_core";
-                       regulator-min-microvolt = <912500>;
-                       regulator-max-microvolt = <1150000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-               };
-               vdd3_reg: regulator@4 {
-                       regulator-always-on;
-               };
-               vdig1_reg: regulator@5 {
-                       regulator-always-on;
-               };
-               vdig2_reg: regulator@6 {
-                       regulator-always-on;
-               };
-               vpll_reg: regulator@7 {
-                       regulator-always-on;
-               };
-               vdac_reg: regulator@8 {
-                       regulator-always-on;
-               };
-               vaux1_reg: regulator@9 {
-                       regulator-always-on;
-               };
-               vaux2_reg: regulator@10 {
-                       regulator-always-on;
-               };
-               vaux33_reg: regulator@11 {
-                       regulator-always-on;
-               };
-               vmmc_reg: regulator@12 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-       };
- };
- &mac {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&cpsw_default>;
-       pinctrl-1 = <&cpsw_sleep>;
-       dual_emac = <1>;
-       status = "okay";
- };
- &davinci_mdio {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&davinci_mdio_default>;
-       pinctrl-1 = <&davinci_mdio_sleep>;
-       status = "okay";
- };
  &cpsw_emac0 {
 -      phy_id = <&davinci_mdio>, <0>;
        phy-mode = "rmii";
        dual_emac_res_vlan = <1>;
 +      fixed-link {
 +              speed = <100>;
 +              full-duplex;
 +      };
  };
  
  &cpsw_emac1 {
        rmii-clock-ext = <1>;
  };
  
- &mmc1 {
-       vmmc-supply = <&vmmc_reg>;
-       status = "okay";
- };
- &mmc2 {
-       status = "okay";
-       vmmc-supply = <&wl12xx_vmmc>;
-       ti,non-removable;
-       bus-width = <4>;
-       cap-power-off-card;
-       pinctrl-names = "default";
-       pinctrl-0 = <&mmc2_pins>;
-       #address-cells = <1>;
-       #size-cells = <0>;
-       wlcore: wlcore@2 {
-               compatible = "ti,wl1835";
-               reg = <2>;
-               interrupt-parent = <&gpio3>;
-               interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
-       };
- };
- &sham {
-       status = "okay";
- };
- &aes {
-       status = "okay";
- };
- &gpio0 {
-       ti,no-reset-on-init;
- };
  &dcan1 {
        pinctrl-names = "default";
        pinctrl-0 = <&dcan1_pins>;
index 0467846b4cc33cd0e5bf22c1973407fdc38248a9,63e333a80a24e4fb4b2dd053205816256ee538a5..52be48bbd2dd945d567060b0157cbc8d9c98b5ea
                                status = "disabled";
                        };
  
-                       ehrpwm0: ehrpwm@48300200 {
+                       ehrpwm0: pwm@48300200 {
                                compatible = "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48300200 0x80>;
                                status = "disabled";
                        };
  
-                       ehrpwm1: ehrpwm@48302200 {
+                       ehrpwm1: pwm@48302200 {
                                compatible = "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48302200 0x80>;
                                status = "disabled";
                        };
  
-                       ehrpwm2: ehrpwm@48304200 {
+                       ehrpwm2: pwm@48304200 {
                                compatible = "ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48304200 0x80>;
                        ti,no-idle-on-init;
                        reg = <0x50000000 0x2000>;
                        interrupts = <100>;
 -                      dmas = <&edma 52>;
 +                      dmas = <&edma 52 0>;
                        dma-names = "rxtx";
                        gpmc,num-cs = <7>;
                        gpmc,num-waitpins = <2>;
                        #size-cells = <1>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                        status = "disabled";
                };
  
index ba580a9da390fb3dc1a723b7b77da08e6600e96e,e338c9f4c0618949890fbb1de816884d220e6670..12fcde4d4d2e474ce856c91be2363147e04b3046
                        ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
                                   <&edma_tptc2 0>;
  
 -                      ti,edma-memcpy-channels = <32 33>;
 +                      ti,edma-memcpy-channels = <58 59>;
                };
  
                edma_tptc0: tptc@49800000 {
                                status = "disabled";
                        };
  
-                       ehrpwm0: ehrpwm@48300200 {
+                       ehrpwm0: pwm@48300200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48300200 0x80>;
                                status = "disabled";
                        };
  
-                       ehrpwm1: ehrpwm@48302200 {
+                       ehrpwm1: pwm@48302200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48302200 0x80>;
                                status = "disabled";
                        };
  
-                       ehrpwm2: ehrpwm@48304200 {
+                       ehrpwm2: pwm@48304200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48304200 0x80>;
                        ti,hwmods = "epwmss3";
                        status = "disabled";
  
-                       ehrpwm3: ehrpwm@48306200 {
+                       ehrpwm3: pwm@48306200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48306200 0x80>;
                        ti,hwmods = "epwmss4";
                        status = "disabled";
  
-                       ehrpwm4: ehrpwm@48308200 {
+                       ehrpwm4: pwm@48308200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x48308200 0x80>;
                        ti,hwmods = "epwmss5";
                        status = "disabled";
  
-                       ehrpwm5: ehrpwm@4830a200 {
+                       ehrpwm5: pwm@4830a200 {
                                compatible = "ti,am4372-ehrpwm","ti,am33xx-ehrpwm";
                                #pwm-cells = <3>;
                                reg = <0x4830a200 0x80>;
                gpmc: gpmc@50000000 {
                        compatible = "ti,am3352-gpmc";
                        ti,hwmods = "gpmc";
 -                      dmas = <&edma 52>;
 +                      dmas = <&edma 52 0>;
                        dma-names = "rxtx";
                        clocks = <&l3s_gclk>;
                        clock-names = "fck";
                        #size-cells = <1>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                        status = "disabled";
                };
  
index d5dd72047a7ed4a4ea102a571085a2e58c47c0b6,965d548037efaa279888459fe3223ebbbf52a193..3549b8c9ac49aaa0833b70b9cf9580668d4a8d26
                default-brightness-level = <8>;
        };
  
-       sound0: sound@0 {
+       sound0: sound0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "AM43-EPOS-EVM";
                simple-audio-card,widgets =
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
+               rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>;  /* gpmc_wait0 */
                ti,nand-ecc-opt = "bch16";
                ti,elm-id = <&elm>;
                nand-bus-width = <8>;
        tx-num-evt = <32>;
        rx-num-evt = <32>;
  };
 +
 +&synctimer_32kclk {
 +      assigned-clocks = <&mux_synctimer32k_ck>;
 +      assigned-clock-parents = <&clkdiv32k_ick>;
 +};
index 4168eb9dd3698c827e8707007ecca0d0f918349a,b379a8c7b3cb4655c3784813d003f889aa3c8499..81d6c3033b51028a01d06c64e9a514db3af0271c
@@@ -8,6 -8,7 +8,7 @@@
  /dts-v1/;
  
  #include "dra74x.dtsi"
+ #include "am57xx-commercial-grade.dtsi"
  #include <dt-bindings/gpio/gpio.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  
                #cooling-cells = <2>;
        };
  
 -      extcon_usb1: extcon_usb1 {
 -              compatible = "linux,extcon-usb-gpio";
 -              id-gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>;
 -              pinctrl-names = "default";
 -              pinctrl-0 = <&extcon_usb1_pins>;
 -      };
 -
        hdmi0: connector {
                compatible = "hdmi-connector";
                label = "hdmi";
                };
        };
  
-       sound0: sound@0 {
+       sound0: sound0 {
                compatible = "simple-audio-card";
                simple-audio-card,name = "BeagleBoard-X15";
                simple-audio-card,widgets =
  
                sound0_master: simple-audio-card,codec {
                        sound-dai = <&tlv320aic3104>;
-                       assigned-clocks = <&clkoutmux2_clk_mux>;
-                       assigned-clock-parents = <&sys_clk2_dclk_div>;
                        clocks = <&clkout2_clk>;
                };
        };
                >;
        };
  
 -      extcon_usb1_pins: extcon_usb1_pins {
 -              pinctrl-single,pins = <
 -                      DRA7XX_CORE_IOPAD(0x37ec, PIN_INPUT_PULLUP | MUX_MODE14) /* uart1_rtsn.gpio7_25 */
 -              >;
 -      };
 -
        tpd12s015_pins: pinmux_tpd12s015_pins {
                pinctrl-single,pins = <
                        DRA7XX_CORE_IOPAD(0x37b0, PIN_OUTPUT | MUX_MODE14)              /* gpio7_10 CT_CP_HPD */
                                        /* VDD_DSPEVE, VDD_IVA, VDD_GPU */
                                        regulator-name = "smps45";
                                        regulator-min-microvolt = < 850000>;
-                                       regulator-max-microvolt = <1150000>;
+                                       regulator-max-microvolt = <1250000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
                                        /* VDD_CORE */
                                        regulator-name = "smps6";
                                        regulator-min-microvolt = <850000>;
-                                       regulator-max-microvolt = <1030000>;
+                                       regulator-max-microvolt = <1150000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
                pinctrl-names = "default", "sleep";
                pinctrl-0 = <&clkout2_pins_default>;
                pinctrl-1 = <&clkout2_pins_sleep>;
+               assigned-clocks = <&clkoutmux2_clk_mux>;
+               assigned-clock-parents = <&sys_clk2_dclk_div>;
                status = "okay";
                adc-settle-ms = <40>;
  
        pinctrl-0 = <&usb1_pins>;
  };
  
 -&omap_dwc3_1 {
 -      extcon = <&extcon_usb1>;
 -};
 -
  &omap_dwc3_2 {
        extcon = <&extcon_usb2>;
  };
        serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
                1 2 0 0
        >;
+       tx-num-evt = <32>;
+       rx-num-evt = <32>;
  };
  
  &mailbox5 {
index 85d2c377c3322f6be3a612d85661534771896153,6ebe9a78fc6564b6ef5d6254c3dbb9a3bf36f3f9..8450944b28e6bb7728ccd731dcb709fa7346aa28
                        };
  
                        /* USB part of the eSATA/USB 2.0 port */
 -                      usb@50000 {
 +                      usb@58000 {
                                status = "okay";
                        };
  
                button@2 {
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;
-                       gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
                };
        };
  
                };
  
                sata {
-                       gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+                       gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
        };
  
  &pinctrl {
        keys_pin: keys-pin {
-               marvell,pins = "mpp24", "mpp47";
+               marvell,pins = "mpp24", "mpp29";
                marvell,function = "gpio";
        };
  
index ef2164a99d0f0202a8f2c021c626dc55ec3f1390,c01362b4fc343a490e3dd63e78517eccbf104fd6..8378b44ee567048e27bcb6c5530bbded506d1d41
                clock-frequency = <32768>;
        };
  
 -      sys_32k_ck: sys_32k_ck {
 +      sys_clk32_crystal_ck: sys_clk32_crystal_ck {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <32768>;
        };
  
 +      sys_clk32_pseudo_ck: sys_clk32_pseudo_ck {
 +              #clock-cells = <0>;
 +              compatible = "fixed-factor-clock";
 +              clocks = <&sys_clkin1>;
 +              clock-mult = <1>;
 +              clock-div = <610>;
 +      };
 +
        virt_12000000_ck: virt_12000000_ck {
                #clock-cells = <0>;
                compatible = "fixed-clock";
                clock-frequency = <0>;
        };
  
-       dpll_abe_ck: dpll_abe_ck {
+       dpll_abe_ck: dpll_abe_ck@1e0 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-m4xen-clock";
                clocks = <&abe_dpll_clk_mux>, <&abe_dpll_bypass_clk_mux>;
                clocks = <&dpll_abe_ck>;
        };
  
-       dpll_abe_m2x2_ck: dpll_abe_m2x2_ck {
+       dpll_abe_m2x2_ck: dpll_abe_m2x2_ck@1f0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       abe_clk: abe_clk {
+       abe_clk: abe_clk@108 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_m2x2_ck>;
                ti,index-power-of-two;
        };
  
-       dpll_abe_m2_ck: dpll_abe_m2_ck {
+       dpll_abe_m2_ck: dpll_abe_m2_ck@1f0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_abe_m3x2_ck: dpll_abe_m3x2_ck {
+       dpll_abe_m3x2_ck: dpll_abe_m3x2_ck@1f4 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_byp_mux: dpll_core_byp_mux {
+       dpll_core_byp_mux: dpll_core_byp_mux@12c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;
                reg = <0x012c>;
        };
  
-       dpll_core_ck: dpll_core_ck {
+       dpll_core_ck: dpll_core_ck@120 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-core-clock";
                clocks = <&sys_clkin1>, <&dpll_core_byp_mux>;
                clocks = <&dpll_core_ck>;
        };
  
-       dpll_core_h12x2_ck: dpll_core_h12x2_ck {
+       dpll_core_h12x2_ck: dpll_core_h12x2_ck@13c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                clock-div = <1>;
        };
  
-       dpll_mpu_ck: dpll_mpu_ck {
+       dpll_mpu_ck: dpll_mpu_ck@160 {
                #clock-cells = <0>;
                compatible = "ti,omap5-mpu-dpll-clock";
                clocks = <&sys_clkin1>, <&mpu_dpll_hs_clk_div>;
                reg = <0x0160>, <0x0164>, <0x016c>, <0x0168>;
        };
  
-       dpll_mpu_m2_ck: dpll_mpu_m2_ck {
+       dpll_mpu_m2_ck: dpll_mpu_m2_ck@170 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_mpu_ck>;
                clock-div = <1>;
        };
  
-       dpll_dsp_byp_mux: dpll_dsp_byp_mux {
+       dpll_dsp_byp_mux: dpll_dsp_byp_mux@240 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&dsp_dpll_hs_clk_div>;
                reg = <0x0240>;
        };
  
-       dpll_dsp_ck: dpll_dsp_ck {
+       dpll_dsp_ck: dpll_dsp_ck@234 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_dsp_byp_mux>;
                reg = <0x0234>, <0x0238>, <0x0240>, <0x023c>;
        };
  
-       dpll_dsp_m2_ck: dpll_dsp_m2_ck {
+       dpll_dsp_m2_ck: dpll_dsp_m2_ck@244 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_dsp_ck>;
                clock-div = <1>;
        };
  
-       dpll_iva_byp_mux: dpll_iva_byp_mux {
+       dpll_iva_byp_mux: dpll_iva_byp_mux@1ac {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&iva_dpll_hs_clk_div>;
                reg = <0x01ac>;
        };
  
-       dpll_iva_ck: dpll_iva_ck {
+       dpll_iva_ck: dpll_iva_ck@1a0 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_iva_byp_mux>;
                reg = <0x01a0>, <0x01a4>, <0x01ac>, <0x01a8>;
        };
  
-       dpll_iva_m2_ck: dpll_iva_m2_ck {
+       dpll_iva_m2_ck: dpll_iva_m2_ck@1b0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_iva_ck>;
                clock-div = <1>;
        };
  
-       dpll_gpu_byp_mux: dpll_gpu_byp_mux {
+       dpll_gpu_byp_mux: dpll_gpu_byp_mux@2e4 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;
                reg = <0x02e4>;
        };
  
-       dpll_gpu_ck: dpll_gpu_ck {
+       dpll_gpu_ck: dpll_gpu_ck@2d8 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_gpu_byp_mux>;
                reg = <0x02d8>, <0x02dc>, <0x02e4>, <0x02e0>;
        };
  
-       dpll_gpu_m2_ck: dpll_gpu_m2_ck {
+       dpll_gpu_m2_ck: dpll_gpu_m2_ck@2e8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gpu_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_m2_ck: dpll_core_m2_ck {
+       dpll_core_m2_ck: dpll_core_m2_ck@130 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_ck>;
                clock-div = <1>;
        };
  
-       dpll_ddr_byp_mux: dpll_ddr_byp_mux {
+       dpll_ddr_byp_mux: dpll_ddr_byp_mux@21c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;
                reg = <0x021c>;
        };
  
-       dpll_ddr_ck: dpll_ddr_ck {
+       dpll_ddr_ck: dpll_ddr_ck@210 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_ddr_byp_mux>;
                reg = <0x0210>, <0x0214>, <0x021c>, <0x0218>;
        };
  
-       dpll_ddr_m2_ck: dpll_ddr_m2_ck {
+       dpll_ddr_m2_ck: dpll_ddr_m2_ck@220 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_ddr_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_gmac_byp_mux: dpll_gmac_byp_mux {
+       dpll_gmac_byp_mux: dpll_gmac_byp_mux@2b4 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>;
                reg = <0x02b4>;
        };
  
-       dpll_gmac_ck: dpll_gmac_ck {
+       dpll_gmac_ck: dpll_gmac_ck@2a8 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_gmac_byp_mux>;
                reg = <0x02a8>, <0x02ac>, <0x02b4>, <0x02b0>;
        };
  
-       dpll_gmac_m2_ck: dpll_gmac_m2_ck {
+       dpll_gmac_m2_ck: dpll_gmac_m2_ck@2b8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_ck>;
                clock-div = <1>;
        };
  
-       dpll_eve_byp_mux: dpll_eve_byp_mux {
+       dpll_eve_byp_mux: dpll_eve_byp_mux@290 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&eve_dpll_hs_clk_div>;
                reg = <0x0290>;
        };
  
-       dpll_eve_ck: dpll_eve_ck {
+       dpll_eve_ck: dpll_eve_ck@284 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_eve_byp_mux>;
                reg = <0x0284>, <0x0288>, <0x0290>, <0x028c>;
        };
  
-       dpll_eve_m2_ck: dpll_eve_m2_ck {
+       dpll_eve_m2_ck: dpll_eve_m2_ck@294 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_eve_ck>;
                clock-div = <1>;
        };
  
-       dpll_core_h13x2_ck: dpll_core_h13x2_ck {
+       dpll_core_h13x2_ck: dpll_core_h13x2_ck@140 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_h14x2_ck: dpll_core_h14x2_ck {
+       dpll_core_h14x2_ck: dpll_core_h14x2_ck@144 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_h22x2_ck: dpll_core_h22x2_ck {
+       dpll_core_h22x2_ck: dpll_core_h22x2_ck@154 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_h23x2_ck: dpll_core_h23x2_ck {
+       dpll_core_h23x2_ck: dpll_core_h23x2_ck@158 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_core_h24x2_ck: dpll_core_h24x2_ck {
+       dpll_core_h24x2_ck: dpll_core_h24x2_ck@15c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_core_x2_ck>;
                clocks = <&dpll_ddr_ck>;
        };
  
-       dpll_ddr_h11x2_ck: dpll_ddr_h11x2_ck {
+       dpll_ddr_h11x2_ck: dpll_ddr_h11x2_ck@228 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_ddr_x2_ck>;
                clocks = <&dpll_dsp_ck>;
        };
  
-       dpll_dsp_m3x2_ck: dpll_dsp_m3x2_ck {
+       dpll_dsp_m3x2_ck: dpll_dsp_m3x2_ck@248 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_dsp_x2_ck>;
                clocks = <&dpll_gmac_ck>;
        };
  
-       dpll_gmac_h11x2_ck: dpll_gmac_h11x2_ck {
+       dpll_gmac_h11x2_ck: dpll_gmac_h11x2_ck@2c0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_gmac_h12x2_ck: dpll_gmac_h12x2_ck {
+       dpll_gmac_h12x2_ck: dpll_gmac_h12x2_ck@2c4 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_gmac_h13x2_ck: dpll_gmac_h13x2_ck {
+       dpll_gmac_h13x2_ck: dpll_gmac_h13x2_ck@2c8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_gmac_m3x2_ck: dpll_gmac_m3x2_ck {
+       dpll_gmac_m3x2_ck: dpll_gmac_m3x2_ck@2bc {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_x2_ck>;
                clock-div = <1>;
        };
  
-       l3_iclk_div: l3_iclk_div {
+       l3_iclk_div: l3_iclk_div@100 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                ti,max-div = <2>;
                clock-div = <1>;
        };
  
-       ipu1_gfclk_mux: ipu1_gfclk_mux {
+       ipu1_gfclk_mux: ipu1_gfclk_mux@520 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>;
                reg = <0x0520>;
        };
  
-       mcasp1_ahclkr_mux: mcasp1_ahclkr_mux {
+       mcasp1_ahclkr_mux: mcasp1_ahclkr_mux@550 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x0550>;
        };
  
-       mcasp1_ahclkx_mux: mcasp1_ahclkx_mux {
+       mcasp1_ahclkx_mux: mcasp1_ahclkx_mux@550 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x0550>;
        };
  
-       mcasp1_aux_gfclk_mux: mcasp1_aux_gfclk_mux {
+       mcasp1_aux_gfclk_mux: mcasp1_aux_gfclk_mux@550 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x0550>;
        };
  
-       timer5_gfclk_mux: timer5_gfclk_mux {
+       timer5_gfclk_mux: timer5_gfclk_mux@558 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>;
                reg = <0x0558>;
        };
  
-       timer6_gfclk_mux: timer6_gfclk_mux {
+       timer6_gfclk_mux: timer6_gfclk_mux@560 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>;
                reg = <0x0560>;
        };
  
-       timer7_gfclk_mux: timer7_gfclk_mux {
+       timer7_gfclk_mux: timer7_gfclk_mux@568 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>;
                reg = <0x0568>;
        };
  
-       timer8_gfclk_mux: timer8_gfclk_mux {
+       timer8_gfclk_mux: timer8_gfclk_mux@570 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>;
                reg = <0x0570>;
        };
  
-       uart6_gfclk_mux: uart6_gfclk_mux {
+       uart6_gfclk_mux: uart6_gfclk_mux@580 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
        };
  };
  &prm_clocks {
-       sys_clkin1: sys_clkin1 {
+       sys_clkin1: sys_clkin1@110 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&virt_12000000_ck>, <&virt_20000000_ck>, <&virt_16800000_ck>, <&virt_19200000_ck>, <&virt_26000000_ck>, <&virt_27000000_ck>, <&virt_38400000_ck>;
                ti,index-starts-at-one;
        };
  
-       abe_dpll_sys_clk_mux: abe_dpll_sys_clk_mux {
+       abe_dpll_sys_clk_mux: abe_dpll_sys_clk_mux@118 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>;
                reg = <0x0118>;
        };
  
-       abe_dpll_bypass_clk_mux: abe_dpll_bypass_clk_mux {
+       abe_dpll_bypass_clk_mux: abe_dpll_bypass_clk_mux@114 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_dpll_sys_clk_mux>, <&sys_32k_ck>;
                reg = <0x0114>;
        };
  
-       abe_dpll_clk_mux: abe_dpll_clk_mux {
+       abe_dpll_clk_mux: abe_dpll_clk_mux@10c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_dpll_sys_clk_mux>, <&sys_32k_ck>;
                reg = <0x010c>;
        };
  
-       abe_24m_fclk: abe_24m_fclk {
+       abe_24m_fclk: abe_24m_fclk@11c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_m2x2_ck>;
                ti,dividers = <8>, <16>;
        };
  
-       aess_fclk: aess_fclk {
+       aess_fclk: aess_fclk@178 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&abe_clk>;
                ti,max-div = <2>;
        };
  
-       abe_giclk_div: abe_giclk_div {
+       abe_giclk_div: abe_giclk_div@174 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&aess_fclk>;
                ti,max-div = <2>;
        };
  
-       abe_lp_clk_div: abe_lp_clk_div {
+       abe_lp_clk_div: abe_lp_clk_div@1d8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_m2x2_ck>;
                ti,dividers = <16>, <32>;
        };
  
-       abe_sys_clk_div: abe_sys_clk_div {
+       abe_sys_clk_div: abe_sys_clk_div@120 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin1>;
                ti,max-div = <2>;
        };
  
-       adc_gfclk_mux: adc_gfclk_mux {
+       adc_gfclk_mux: adc_gfclk_mux@1dc {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>, <&sys_32k_ck>;
                reg = <0x01dc>;
        };
  
-       sys_clk1_dclk_div: sys_clk1_dclk_div {
+       sys_clk1_dclk_div: sys_clk1_dclk_div@1c8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin1>;
                ti,index-power-of-two;
        };
  
-       sys_clk2_dclk_div: sys_clk2_dclk_div {
+       sys_clk2_dclk_div: sys_clk2_dclk_div@1cc {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin2>;
                ti,index-power-of-two;
        };
  
-       per_abe_x1_dclk_div: per_abe_x1_dclk_div {
+       per_abe_x1_dclk_div: per_abe_x1_dclk_div@1bc {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_m2_ck>;
                ti,index-power-of-two;
        };
  
-       dsp_gclk_div: dsp_gclk_div {
+       dsp_gclk_div: dsp_gclk_div@18c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_dsp_m2_ck>;
                ti,index-power-of-two;
        };
  
-       gpu_dclk: gpu_dclk {
+       gpu_dclk: gpu_dclk@1a0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gpu_m2_ck>;
                ti,index-power-of-two;
        };
  
-       emif_phy_dclk_div: emif_phy_dclk_div {
+       emif_phy_dclk_div: emif_phy_dclk_div@190 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_ddr_m2_ck>;
                ti,index-power-of-two;
        };
  
-       gmac_250m_dclk_div: gmac_250m_dclk_div {
+       gmac_250m_dclk_div: gmac_250m_dclk_div@19c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_m2_ck>;
                ti,index-power-of-two;
        };
  
-       l3init_480m_dclk_div: l3init_480m_dclk_div {
+       l3init_480m_dclk_div: l3init_480m_dclk_div@1ac {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_usb_m2_ck>;
                ti,index-power-of-two;
        };
  
-       usb_otg_dclk_div: usb_otg_dclk_div {
+       usb_otg_dclk_div: usb_otg_dclk_div@184 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&usb_otg_clkin_ck>;
                ti,index-power-of-two;
        };
  
-       sata_dclk_div: sata_dclk_div {
+       sata_dclk_div: sata_dclk_div@1c0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin1>;
                ti,index-power-of-two;
        };
  
-       pcie2_dclk_div: pcie2_dclk_div {
+       pcie2_dclk_div: pcie2_dclk_div@1b8 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_pcie_ref_m2_ck>;
                ti,index-power-of-two;
        };
  
-       pcie_dclk_div: pcie_dclk_div {
+       pcie_dclk_div: pcie_dclk_div@1b4 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&apll_pcie_m2_ck>;
                ti,index-power-of-two;
        };
  
-       emu_dclk_div: emu_dclk_div {
+       emu_dclk_div: emu_dclk_div@194 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin1>;
                ti,index-power-of-two;
        };
  
-       secure_32k_dclk_div: secure_32k_dclk_div {
+       secure_32k_dclk_div: secure_32k_dclk_div@1c4 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&secure_32k_clk_src_ck>;
                ti,index-power-of-two;
        };
  
-       clkoutmux0_clk_mux: clkoutmux0_clk_mux {
+       clkoutmux0_clk_mux: clkoutmux0_clk_mux@158 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>;
                reg = <0x0158>;
        };
  
-       clkoutmux1_clk_mux: clkoutmux1_clk_mux {
+       clkoutmux1_clk_mux: clkoutmux1_clk_mux@15c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>;
                reg = <0x015c>;
        };
  
-       clkoutmux2_clk_mux: clkoutmux2_clk_mux {
+       clkoutmux2_clk_mux: clkoutmux2_clk_mux@160 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>;
                clock-div = <2>;
        };
  
-       eve_clk: eve_clk {
+       eve_clk: eve_clk@180 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_eve_m2_ck>, <&dpll_dsp_m3x2_ck>;
                reg = <0x0180>;
        };
  
-       hdmi_dpll_clk_mux: hdmi_dpll_clk_mux {
+       hdmi_dpll_clk_mux: hdmi_dpll_clk_mux@164 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>;
                reg = <0x0164>;
        };
  
-       mlb_clk: mlb_clk {
+       mlb_clk: mlb_clk@134 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mlb_clkin_ck>;
                ti,index-power-of-two;
        };
  
-       mlbp_clk: mlbp_clk {
+       mlbp_clk: mlbp_clk@130 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mlbp_clkin_ck>;
                ti,index-power-of-two;
        };
  
-       per_abe_x1_gfclk2_div: per_abe_x1_gfclk2_div {
+       per_abe_x1_gfclk2_div: per_abe_x1_gfclk2_div@138 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_abe_m2_ck>;
                ti,index-power-of-two;
        };
  
-       timer_sys_clk_div: timer_sys_clk_div {
+       timer_sys_clk_div: timer_sys_clk_div@144 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&sys_clkin1>;
                ti,max-div = <2>;
        };
  
-       video1_dpll_clk_mux: video1_dpll_clk_mux {
+       video1_dpll_clk_mux: video1_dpll_clk_mux@168 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>;
                reg = <0x0168>;
        };
  
-       video2_dpll_clk_mux: video2_dpll_clk_mux {
+       video2_dpll_clk_mux: video2_dpll_clk_mux@16c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>;
                reg = <0x016c>;
        };
  
-       wkupaon_iclk_mux: wkupaon_iclk_mux {
+       wkupaon_iclk_mux: wkupaon_iclk_mux@108 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&abe_lp_clk_div>;
                reg = <0x0108>;
        };
  
-       gpio1_dbclk: gpio1_dbclk {
+       gpio1_dbclk: gpio1_dbclk@1838 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1838>;
        };
  
-       dcan1_sys_clk_mux: dcan1_sys_clk_mux {
+       dcan1_sys_clk_mux: dcan1_sys_clk_mux@1888 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&sys_clkin2>;
                reg = <0x1888>;
        };
  
-       timer1_gfclk_mux: timer1_gfclk_mux {
+       timer1_gfclk_mux: timer1_gfclk_mux@1840 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1840>;
        };
  
-       uart10_gfclk_mux: uart10_gfclk_mux {
+       uart10_gfclk_mux: uart10_gfclk_mux@1880 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
        };
  };
  &cm_core_clocks {
-       dpll_pcie_ref_ck: dpll_pcie_ref_ck {
+       dpll_pcie_ref_ck: dpll_pcie_ref_ck@200 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&sys_clkin1>;
                reg = <0x0200>, <0x0204>, <0x020c>, <0x0208>;
        };
  
-       dpll_pcie_ref_m2ldo_ck: dpll_pcie_ref_m2ldo_ck {
+       dpll_pcie_ref_m2ldo_ck: dpll_pcie_ref_m2ldo_ck@210 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_pcie_ref_ck>;
                ti,bit-shift = <7>;
        };
  
-       apll_pcie_ck: apll_pcie_ck {
+       apll_pcie_ck: apll_pcie_ck@21c {
                #clock-cells = <0>;
                compatible = "ti,dra7-apll-clock";
                clocks = <&apll_pcie_in_clk_mux>, <&dpll_pcie_ref_ck>;
                clock-div = <1>;
        };
  
-       dpll_per_byp_mux: dpll_per_byp_mux {
+       dpll_per_byp_mux: dpll_per_byp_mux@14c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&per_dpll_hs_clk_div>;
                reg = <0x014c>;
        };
  
-       dpll_per_ck: dpll_per_ck {
+       dpll_per_ck: dpll_per_ck@140 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-clock";
                clocks = <&sys_clkin1>, <&dpll_per_byp_mux>;
                reg = <0x0140>, <0x0144>, <0x014c>, <0x0148>;
        };
  
-       dpll_per_m2_ck: dpll_per_m2_ck {
+       dpll_per_m2_ck: dpll_per_m2_ck@150 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_ck>;
                clock-div = <1>;
        };
  
-       dpll_usb_byp_mux: dpll_usb_byp_mux {
+       dpll_usb_byp_mux: dpll_usb_byp_mux@18c {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_clkin1>, <&usb_dpll_hs_clk_div>;
                reg = <0x018c>;
        };
  
-       dpll_usb_ck: dpll_usb_ck {
+       dpll_usb_ck: dpll_usb_ck@180 {
                #clock-cells = <0>;
                compatible = "ti,omap4-dpll-j-type-clock";
                clocks = <&sys_clkin1>, <&dpll_usb_byp_mux>;
                reg = <0x0180>, <0x0184>, <0x018c>, <0x0188>;
        };
  
-       dpll_usb_m2_ck: dpll_usb_m2_ck {
+       dpll_usb_m2_ck: dpll_usb_m2_ck@190 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_usb_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_pcie_ref_m2_ck: dpll_pcie_ref_m2_ck {
+       dpll_pcie_ref_m2_ck: dpll_pcie_ref_m2_ck@210 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_pcie_ref_ck>;
                clocks = <&dpll_per_ck>;
        };
  
-       dpll_per_h11x2_ck: dpll_per_h11x2_ck {
+       dpll_per_h11x2_ck: dpll_per_h11x2_ck@158 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_per_h12x2_ck: dpll_per_h12x2_ck {
+       dpll_per_h12x2_ck: dpll_per_h12x2_ck@15c {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_per_h13x2_ck: dpll_per_h13x2_ck {
+       dpll_per_h13x2_ck: dpll_per_h13x2_ck@160 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_per_h14x2_ck: dpll_per_h14x2_ck {
+       dpll_per_h14x2_ck: dpll_per_h14x2_ck@164 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_x2_ck>;
                ti,invert-autoidle-bit;
        };
  
-       dpll_per_m2x2_ck: dpll_per_m2x2_ck {
+       dpll_per_m2x2_ck: dpll_per_m2x2_ck@150 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_per_x2_ck>;
                clock-div = <2>;
        };
  
-       l3init_60m_fclk: l3init_60m_fclk {
+       l3init_60m_fclk: l3init_60m_fclk@104 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_usb_m2_ck>;
                ti,dividers = <1>, <8>;
        };
  
-       clkout2_clk: clkout2_clk {
+       clkout2_clk: clkout2_clk@6b0 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&clkoutmux2_clk_mux>;
                reg = <0x06b0>;
        };
  
-       l3init_960m_gfclk: l3init_960m_gfclk {
+       l3init_960m_gfclk: l3init_960m_gfclk@6c0 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&dpll_usb_clkdcoldo>;
                reg = <0x06c0>;
        };
  
-       dss_32khz_clk: dss_32khz_clk {
+       dss_32khz_clk: dss_32khz_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1120>;
        };
  
-       dss_48mhz_clk: dss_48mhz_clk {
+       dss_48mhz_clk: dss_48mhz_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&func_48m_fclk>;
                reg = <0x1120>;
        };
  
-       dss_dss_clk: dss_dss_clk {
+       dss_dss_clk: dss_dss_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&dpll_per_h12x2_ck>;
                ti,set-rate-parent;
        };
  
-       dss_hdmi_clk: dss_hdmi_clk {
+       dss_hdmi_clk: dss_hdmi_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&hdmi_dpll_clk_mux>;
                reg = <0x1120>;
        };
  
-       dss_video1_clk: dss_video1_clk {
+       dss_video1_clk: dss_video1_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&video1_dpll_clk_mux>;
                reg = <0x1120>;
        };
  
-       dss_video2_clk: dss_video2_clk {
+       dss_video2_clk: dss_video2_clk@1120 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&video2_dpll_clk_mux>;
                reg = <0x1120>;
        };
  
-       gpio2_dbclk: gpio2_dbclk {
+       gpio2_dbclk: gpio2_dbclk@1760 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1760>;
        };
  
-       gpio3_dbclk: gpio3_dbclk {
+       gpio3_dbclk: gpio3_dbclk@1768 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1768>;
        };
  
-       gpio4_dbclk: gpio4_dbclk {
+       gpio4_dbclk: gpio4_dbclk@1770 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1770>;
        };
  
-       gpio5_dbclk: gpio5_dbclk {
+       gpio5_dbclk: gpio5_dbclk@1778 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1778>;
        };
  
-       gpio6_dbclk: gpio6_dbclk {
+       gpio6_dbclk: gpio6_dbclk@1780 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1780>;
        };
  
-       gpio7_dbclk: gpio7_dbclk {
+       gpio7_dbclk: gpio7_dbclk@1810 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1810>;
        };
  
-       gpio8_dbclk: gpio8_dbclk {
+       gpio8_dbclk: gpio8_dbclk@1818 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1818>;
        };
  
-       mmc1_clk32k: mmc1_clk32k {
+       mmc1_clk32k: mmc1_clk32k@1328 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1328>;
        };
  
-       mmc2_clk32k: mmc2_clk32k {
+       mmc2_clk32k: mmc2_clk32k@1330 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1330>;
        };
  
-       mmc3_clk32k: mmc3_clk32k {
+       mmc3_clk32k: mmc3_clk32k@1820 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1820>;
        };
  
-       mmc4_clk32k: mmc4_clk32k {
+       mmc4_clk32k: mmc4_clk32k@1828 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x1828>;
        };
  
-       sata_ref_clk: sata_ref_clk {
+       sata_ref_clk: sata_ref_clk@1388 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_clkin1>;
                reg = <0x1388>;
        };
  
-       usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m {
+       usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m@13f0 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l3init_960m_gfclk>;
                reg = <0x13f0>;
        };
  
-       usb_otg_ss2_refclk960m: usb_otg_ss2_refclk960m {
+       usb_otg_ss2_refclk960m: usb_otg_ss2_refclk960m@1340 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l3init_960m_gfclk>;
                reg = <0x1340>;
        };
  
-       usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k {
+       usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k@640 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x0640>;
        };
  
-       usb_phy2_always_on_clk32k: usb_phy2_always_on_clk32k {
+       usb_phy2_always_on_clk32k: usb_phy2_always_on_clk32k@688 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x0688>;
        };
  
-       usb_phy3_always_on_clk32k: usb_phy3_always_on_clk32k {
+       usb_phy3_always_on_clk32k: usb_phy3_always_on_clk32k@698 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&sys_32k_ck>;
                reg = <0x0698>;
        };
  
-       atl_dpll_clk_mux: atl_dpll_clk_mux {
+       atl_dpll_clk_mux: atl_dpll_clk_mux@c00 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&sys_32k_ck>, <&video1_clkin_ck>, <&video2_clkin_ck>, <&hdmi_clkin_ck>;
                reg = <0x0c00>;
        };
  
-       atl_gfclk_mux: atl_gfclk_mux {
+       atl_gfclk_mux: atl_gfclk_mux@c00 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&l3_iclk_div>, <&dpll_abe_m2_ck>, <&atl_dpll_clk_mux>;
                reg = <0x0c00>;
        };
  
-       gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div {
+       gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div@13d0 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&dpll_gmac_m2_ck>;
                ti,dividers = <2>;
        };
  
-       gmac_rft_clk_mux: gmac_rft_clk_mux {
+       gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&video1_clkin_ck>, <&video2_clkin_ck>, <&dpll_abe_m2_ck>, <&hdmi_clkin_ck>, <&l3_iclk_div>;
                reg = <0x13d0>;
        };
  
-       gpu_core_gclk_mux: gpu_core_gclk_mux {
+       gpu_core_gclk_mux: gpu_core_gclk_mux@1220 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_core_h14x2_ck>, <&dpll_per_h14x2_ck>, <&dpll_gpu_m2_ck>;
                reg = <0x1220>;
        };
  
-       gpu_hyd_gclk_mux: gpu_hyd_gclk_mux {
+       gpu_hyd_gclk_mux: gpu_hyd_gclk_mux@1220 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&dpll_core_h14x2_ck>, <&dpll_per_h14x2_ck>, <&dpll_gpu_m2_ck>;
                reg = <0x1220>;
        };
  
-       l3instr_ts_gclk_div: l3instr_ts_gclk_div {
+       l3instr_ts_gclk_div: l3instr_ts_gclk_div@e50 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&wkupaon_iclk_mux>;
                ti,dividers = <8>, <16>, <32>;
        };
  
-       mcasp2_ahclkr_mux: mcasp2_ahclkr_mux {
+       mcasp2_ahclkr_mux: mcasp2_ahclkr_mux@1860 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1860>;
        };
  
-       mcasp2_ahclkx_mux: mcasp2_ahclkx_mux {
+       mcasp2_ahclkx_mux: mcasp2_ahclkx_mux@1860 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1860>;
        };
  
-       mcasp2_aux_gfclk_mux: mcasp2_aux_gfclk_mux {
+       mcasp2_aux_gfclk_mux: mcasp2_aux_gfclk_mux@1860 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1860>;
        };
  
-       mcasp3_ahclkx_mux: mcasp3_ahclkx_mux {
+       mcasp3_ahclkx_mux: mcasp3_ahclkx_mux@1868 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1868>;
        };
  
-       mcasp3_aux_gfclk_mux: mcasp3_aux_gfclk_mux {
+       mcasp3_aux_gfclk_mux: mcasp3_aux_gfclk_mux@1868 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1868>;
        };
  
-       mcasp4_ahclkx_mux: mcasp4_ahclkx_mux {
+       mcasp4_ahclkx_mux: mcasp4_ahclkx_mux@1898 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1898>;
        };
  
-       mcasp4_aux_gfclk_mux: mcasp4_aux_gfclk_mux {
+       mcasp4_aux_gfclk_mux: mcasp4_aux_gfclk_mux@1898 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1898>;
        };
  
-       mcasp5_ahclkx_mux: mcasp5_ahclkx_mux {
+       mcasp5_ahclkx_mux: mcasp5_ahclkx_mux@1878 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1878>;
        };
  
-       mcasp5_aux_gfclk_mux: mcasp5_aux_gfclk_mux {
+       mcasp5_aux_gfclk_mux: mcasp5_aux_gfclk_mux@1878 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1878>;
        };
  
-       mcasp6_ahclkx_mux: mcasp6_ahclkx_mux {
+       mcasp6_ahclkx_mux: mcasp6_ahclkx_mux@1904 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1904>;
        };
  
-       mcasp6_aux_gfclk_mux: mcasp6_aux_gfclk_mux {
+       mcasp6_aux_gfclk_mux: mcasp6_aux_gfclk_mux@1904 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1904>;
        };
  
-       mcasp7_ahclkx_mux: mcasp7_ahclkx_mux {
+       mcasp7_ahclkx_mux: mcasp7_ahclkx_mux@1908 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1908>;
        };
  
-       mcasp7_aux_gfclk_mux: mcasp7_aux_gfclk_mux {
+       mcasp7_aux_gfclk_mux: mcasp7_aux_gfclk_mux@1908 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1908>;
        };
  
-       mcasp8_ahclk_mux: mcasp8_ahclk_mux {
+       mcasp8_ahclkx_mux: mcasp8_ahclkx_mux@1890 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atl_clkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>;
                reg = <0x1890>;
        };
  
-       mcasp8_aux_gfclk_mux: mcasp8_aux_gfclk_mux {
+       mcasp8_aux_gfclk_mux: mcasp8_aux_gfclk_mux@1890 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>;
                reg = <0x1890>;
        };
  
-       mmc1_fclk_mux: mmc1_fclk_mux {
+       mmc1_fclk_mux: mmc1_fclk_mux@1328 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_128m_clk>, <&dpll_per_m2x2_ck>;
                reg = <0x1328>;
        };
  
-       mmc1_fclk_div: mmc1_fclk_div {
+       mmc1_fclk_div: mmc1_fclk_div@1328 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mmc1_fclk_mux>;
                ti,index-power-of-two;
        };
  
-       mmc2_fclk_mux: mmc2_fclk_mux {
+       mmc2_fclk_mux: mmc2_fclk_mux@1330 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_128m_clk>, <&dpll_per_m2x2_ck>;
                reg = <0x1330>;
        };
  
-       mmc2_fclk_div: mmc2_fclk_div {
+       mmc2_fclk_div: mmc2_fclk_div@1330 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mmc2_fclk_mux>;
                ti,index-power-of-two;
        };
  
-       mmc3_gfclk_mux: mmc3_gfclk_mux {
+       mmc3_gfclk_mux: mmc3_gfclk_mux@1820 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1820>;
        };
  
-       mmc3_gfclk_div: mmc3_gfclk_div {
+       mmc3_gfclk_div: mmc3_gfclk_div@1820 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mmc3_gfclk_mux>;
                ti,index-power-of-two;
        };
  
-       mmc4_gfclk_mux: mmc4_gfclk_mux {
+       mmc4_gfclk_mux: mmc4_gfclk_mux@1828 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1828>;
        };
  
-       mmc4_gfclk_div: mmc4_gfclk_div {
+       mmc4_gfclk_div: mmc4_gfclk_div@1828 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&mmc4_gfclk_mux>;
                ti,index-power-of-two;
        };
  
-       qspi_gfclk_mux: qspi_gfclk_mux {
+       qspi_gfclk_mux: qspi_gfclk_mux@1838 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_128m_clk>, <&dpll_per_h13x2_ck>;
                reg = <0x1838>;
        };
  
-       qspi_gfclk_div: qspi_gfclk_div {
+       qspi_gfclk_div: qspi_gfclk_div@1838 {
                #clock-cells = <0>;
                compatible = "ti,divider-clock";
                clocks = <&qspi_gfclk_mux>;
                ti,index-power-of-two;
        };
  
-       timer10_gfclk_mux: timer10_gfclk_mux {
+       timer10_gfclk_mux: timer10_gfclk_mux@1728 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1728>;
        };
  
-       timer11_gfclk_mux: timer11_gfclk_mux {
+       timer11_gfclk_mux: timer11_gfclk_mux@1730 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1730>;
        };
  
-       timer13_gfclk_mux: timer13_gfclk_mux {
+       timer13_gfclk_mux: timer13_gfclk_mux@17c8 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x17c8>;
        };
  
-       timer14_gfclk_mux: timer14_gfclk_mux {
+       timer14_gfclk_mux: timer14_gfclk_mux@17d0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x17d0>;
        };
  
-       timer15_gfclk_mux: timer15_gfclk_mux {
+       timer15_gfclk_mux: timer15_gfclk_mux@17d8 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x17d8>;
        };
  
-       timer16_gfclk_mux: timer16_gfclk_mux {
+       timer16_gfclk_mux: timer16_gfclk_mux@1830 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1830>;
        };
  
-       timer2_gfclk_mux: timer2_gfclk_mux {
+       timer2_gfclk_mux: timer2_gfclk_mux@1738 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1738>;
        };
  
-       timer3_gfclk_mux: timer3_gfclk_mux {
+       timer3_gfclk_mux: timer3_gfclk_mux@1740 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1740>;
        };
  
-       timer4_gfclk_mux: timer4_gfclk_mux {
+       timer4_gfclk_mux: timer4_gfclk_mux@1748 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1748>;
        };
  
-       timer9_gfclk_mux: timer9_gfclk_mux {
+       timer9_gfclk_mux: timer9_gfclk_mux@1750 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>;
                reg = <0x1750>;
        };
  
-       uart1_gfclk_mux: uart1_gfclk_mux {
+       uart1_gfclk_mux: uart1_gfclk_mux@1840 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1840>;
        };
  
-       uart2_gfclk_mux: uart2_gfclk_mux {
+       uart2_gfclk_mux: uart2_gfclk_mux@1848 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1848>;
        };
  
-       uart3_gfclk_mux: uart3_gfclk_mux {
+       uart3_gfclk_mux: uart3_gfclk_mux@1850 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1850>;
        };
  
-       uart4_gfclk_mux: uart4_gfclk_mux {
+       uart4_gfclk_mux: uart4_gfclk_mux@1858 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1858>;
        };
  
-       uart5_gfclk_mux: uart5_gfclk_mux {
+       uart5_gfclk_mux: uart5_gfclk_mux@1870 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x1870>;
        };
  
-       uart7_gfclk_mux: uart7_gfclk_mux {
+       uart7_gfclk_mux: uart7_gfclk_mux@18d0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x18d0>;
        };
  
-       uart8_gfclk_mux: uart8_gfclk_mux {
+       uart8_gfclk_mux: uart8_gfclk_mux@18e0 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x18e0>;
        };
  
-       uart9_gfclk_mux: uart9_gfclk_mux {
+       uart9_gfclk_mux: uart9_gfclk_mux@18e8 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>;
                reg = <0x18e8>;
        };
  
-       vip1_gclk_mux: vip1_gclk_mux {
+       vip1_gclk_mux: vip1_gclk_mux@1020 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>;
                reg = <0x1020>;
        };
  
-       vip2_gclk_mux: vip2_gclk_mux {
+       vip2_gclk_mux: vip2_gclk_mux@1028 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>;
                reg = <0x1028>;
        };
  
-       vip3_gclk_mux: vip3_gclk_mux {
+       vip3_gclk_mux: vip3_gclk_mux@1030 {
                #clock-cells = <0>;
                compatible = "ti,mux-clock";
                clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>;
  };
  
  &scm_conf_clocks {
-       dss_deshdcp_clk: dss_deshdcp_clk {
+       dss_deshdcp_clk: dss_deshdcp_clk@558 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l3_iclk_div>;
                reg = <0x558>;
        };
  
-        ehrpwm0_tbclk: ehrpwm0_tbclk {
+        ehrpwm0_tbclk: ehrpwm0_tbclk@558 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l4_root_clk_div>;
                reg = <0x0558>;
        };
  
-       ehrpwm1_tbclk: ehrpwm1_tbclk {
+       ehrpwm1_tbclk: ehrpwm1_tbclk@558 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l4_root_clk_div>;
                reg = <0x0558>;
        };
  
-       ehrpwm2_tbclk: ehrpwm2_tbclk {
+       ehrpwm2_tbclk: ehrpwm2_tbclk@558 {
                #clock-cells = <0>;
                compatible = "ti,gate-clock";
                clocks = <&l4_root_clk_div>;
                ti,bit-shift = <22>;
                reg = <0x0558>;
        };
 +
 +      sys_32k_ck: sys_32k_ck {
 +              #clock-cells = <0>;
 +              compatible = "ti,mux-clock";
 +              clocks = <&sys_clk32_crystal_ck>, <&sys_clk32_pseudo_ck>, <&sys_clk32_pseudo_ck>, <&sys_clk32_pseudo_ck>;
 +              ti,bit-shift = <8>;
 +              reg = <0x6c4>;
 +      };
  };
index e036e6467a7b81e1d1afaebdcb31a441cb5773e6,e36975b6f625a0740d4a620db8ca453ef767b85c..8811e170c2afb7c970a855bee8368ae450b5292c
        samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
  
        ports {
-               port@0 {
+               port0 {
                        dp_out: endpoint {
                                remote-endpoint = <&bridge_in>;
                        };
                use-external-pwm;
  
                ports {
-                       port@0 {
+                       port0 {
                                bridge_out: endpoint {
                                        remote-endpoint = <&panel_in>;
                                };
                        };
  
-                       port@1 {
+                       port1 {
                                bridge_in: endpoint {
                                        remote-endpoint = <&dp_out>;
                                };
        status = "okay";
  };
  
 +&mfc {
 +      samsung,mfc-r = <0x43000000 0x800000>;
 +      samsung,mfc-l = <0x51000000 0x800000>;
 +};
 +
  &mmc_0 {
        status = "okay";
        num-slots = <1>;
index 96f8ce7bd2afc0aa5507d81cf98e59b4eddd61ec,5cdba1f6499fc97dca05019f64cc81dc7c2cbaf3..e44656258225038d1ae8124fde99202331c13d1e
@@@ -46,7 -46,7 +46,7 @@@
                               0x480bd800 0x017c>;
                        interrupts = <24>;
                        iommus = <&mmu_isp>;
 -                      syscon = <&scm_conf 0xdc>;
 +                      syscon = <&scm_conf 0x6c>;
                        ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
                        #clock-cells = <1>;
                        ports {
@@@ -55,7 -55,7 +55,7 @@@
                        };
                };
  
-               bandgap {
+               bandgap@48002524 {
                        reg = <0x48002524 0x4>;
                        compatible = "ti,omap34xx-bandgap";
                        #thermal-sensor-cells = <0>;
index 421fe9f8a9ebd779fdf79044cde8be1b387cb0dc,6ca61a2f36421d3905ef9b5da49b7196395937ed..3fdc51cd0fad60074019f24986d32766cfbab754
@@@ -70,7 -70,7 +70,7 @@@
                compatible = "arm,cortex-a9-twd-timer";
                clocks = <&mpu_periphclk>;
                reg = <0x48240600 0x20>;
 -              interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_LEVEL_HIGH)>;
 +              interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) | IRQ_TYPE_EDGE_RISING)>;
                interrupt-parent = <&gic>;
        };
  
                                        #size-cells = <1>;
                                        ranges = <0 0x5a0 0x170>;
  
-                                       pbias_regulator: pbias_regulator {
+                                       pbias_regulator: pbias_regulator@60 {
                                                compatible = "ti,pbias-omap4", "ti,pbias-omap";
                                                reg = <0x60 0x4>;
                                                syscon = <&omap4_padconf_global>;
                        ti,no-idle-on-init;
                        clocks = <&l3_div_ck>;
                        clock-names = "fck";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
  
                uart1: serial@4806a000 {
index 914bf4c47404f641f823a122c26ff93127f8d25e,d0990606d16e95d370051cff3919187157d019ba..dc759a3028b790d1b525ee889077c5cca0ce2b8d
                        ti,backup-battery-charge-high-current;
                };
  
+               gpadc {
+                       compatible = "ti,palmas-gpadc";
+                       interrupts = <18 0
+                                     16 0
+                                     17 0>;
+                       #io-channel-cells = <1>;
+                       ti,channel0-current-microamp = <5>;
+                       ti,channel3-current-microamp = <10>;
+               };
                palmas_pmic {
                        compatible = "ti,palmas-pmic";
                        interrupt-parent = <&palmas>;
                        interrupts = <14 IRQ_TYPE_NONE>;
-                       interrupt-name = "short-irq";
+                       interrupt-names = "short-irq";
  
                        ti,ldo6-vibrator;
  
                                ldo1_reg: ldo1 {
                                        /* VDDAPHY_CAM: vdda_csiport */
                                        regulator-name = "ldo1";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
                                ldo4_reg: ldo4 {
                                        /* VDDAPHY_DISP: vdda_dsiport/hdmi */
                                        regulator-name = "ldo4";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
index 4d87d9c6c86d85ec32ae1bc4444fdd06ed5b317e,467291d71e96e5fe2b0d314fe953fbd1f05a1e32..93fdfa96776e57c601525f9740b0244374faa299
                        compatible = "ti,palmas-pmic";
                        interrupt-parent = <&palmas>;
                        interrupts = <14 IRQ_TYPE_NONE>;
-                       interrupt-name = "short-irq";
+                       interrupt-names = "short-irq";
  
                        ti,ldo6-vibrator;
  
                                ldo1_reg: ldo1 {
                                        /* VDDAPHY_CAM: vdda_csiport */
                                        regulator-name = "ldo1";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
                                ldo4_reg: ldo4 {
                                        /* VDDAPHY_DISP: vdda_dsiport/hdmi */
                                        regulator-name = "ldo4";
 -                                      regulator-min-microvolt = <1500000>;
 +                                      regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
                                };
  
index 120b6b80cd39eacc2c874768e89eb14ab147b531,ca1db07330f4d7dd2c8bfd13e4032560236065ee..84c10195e79bbcc446561c3994ac93dbadf19ba6
                                        #size-cells = <1>;
                                        ranges = <0 0x5a0 0xec>;
  
-                                       pbias_regulator: pbias_regulator {
+                                       pbias_regulator: pbias_regulator@60 {
                                                compatible = "ti,pbias-omap5", "ti,pbias-omap";
                                                reg = <0x60 0x4>;
                                                syscon = <&omap5_padconf_global>;
                        omap5_pmx_wkup: pinmux@c840 {
                                compatible = "ti,omap5-padconf",
                                             "pinctrl-single";
 -                              reg = <0xc840 0x0038>;
 +                              reg = <0xc840 0x003c>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                #interrupt-cells = <1>;
                        ti,hwmods = "gpmc";
                        clocks = <&l3_iclk_div>;
                        clock-names = "fck";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
  
                i2c1: i2c@48070000 {
index 04f541bffbdd52d677c77cc717d2d82c63f3c549,b176c094cd6f1f074c2001e1790fac5aecb3600a..df96ccdc9bb4728c5561fa79e5274ecc2e991691
                hwlocks = <&sfpb_mutex 3>;
        };
  
+       smd {
+               compatible = "qcom,smd";
+               modem@0 {
+                       interrupts = <0 37 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&l2cc 8 3>;
+                       qcom,smd-edge = <0>;
+                       status = "disabled";
+               };
+               q6@1 {
+                       interrupts = <0 90 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&l2cc 8 15>;
+                       qcom,smd-edge = <1>;
+                       status = "disabled";
+               };
+               dsps@3 {
+                       interrupts = <0 138 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&sps_sic_non_secure 0x4080 0>;
+                       qcom,smd-edge = <3>;
+                       status = "disabled";
+               };
+               riva@6 {
+                       interrupts = <0 198 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&l2cc 8 25>;
+                       qcom,smd-edge = <6>;
+                       status = "disabled";
+               };
+       };
+       smsm {
+               compatible = "qcom,smsm";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               qcom,ipc-1 = <&l2cc 8 4>;
+               qcom,ipc-2 = <&l2cc 8 14>;
+               qcom,ipc-3 = <&l2cc 8 23>;
+               qcom,ipc-4 = <&sps_sic_non_secure 0x4094 0>;
+               apps_smsm: apps@0 {
+                       reg = <0>;
+                       #qcom,state-cells = <1>;
+               };
+               modem_smsm: modem@1 {
+                       reg = <1>;
+                       interrupts = <0 38 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+               q6_smsm: q6@2 {
+                       reg = <2>;
+                       interrupts = <0 89 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+               wcnss_smsm: wcnss@3 {
+                       reg = <3>;
+                       interrupts = <0 204 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+               dsps_smsm: dsps@4 {
+                       reg = <4>;
+                       interrupts = <0 137 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
                        regulator;
                };
  
+               sps_sic_non_secure: sps-sic-non-secure@12100000 {
+                       compatible      = "syscon";
+                       reg             = <0x12100000 0x10000>;
+               };
                gsbi1: gsbi@12440000 {
                        status = "disabled";
                        compatible = "qcom,gsbi-v1.0.0";
  
                        syscon-tcsr = <&tcsr>;
  
+                       gsbi1_serial: serial@12450000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x12450000 0x100>,
+                                     <0x12400000 0x03>;
+                               interrupts = <0 193 0x0>;
+                               clocks = <&gcc GSBI1_UART_CLK>, <&gcc GSBI1_H_CLK>;
+                               clock-names = "core", "iface";
+                               status = "disabled";
+                       };
                        gsbi1_i2c: i2c@12460000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
-                               pinctrl-0 = <&i2c1_pins &i2c1_pins_sleep>;
+                               pinctrl-0 = <&i2c1_pins>;
+                               pinctrl-1 = <&i2c1_pins_sleep>;
                                pinctrl-names = "default", "sleep";
                                reg = <0x12460000 0x1000>;
                                interrupts = <0 194 IRQ_TYPE_NONE>;
                        gsbi2_i2c: i2c@124a0000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
                                reg = <0x124a0000 0x1000>;
-                               pinctrl-0 = <&i2c2_pins &i2c2_pins_sleep>;
+                               pinctrl-0 = <&i2c2_pins>;
+                               pinctrl-1 = <&i2c2_pins_sleep>;
                                pinctrl-names = "default", "sleep";
                                interrupts = <0 196 IRQ_TYPE_NONE>;
                                clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;
                        ranges;
                        gsbi3_i2c: i2c@16280000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
-                               pinctrl-0 = <&i2c3_pins &i2c3_pins_sleep>;
+                               pinctrl-0 = <&i2c3_pins>;
+                               pinctrl-1 = <&i2c3_pins_sleep>;
                                pinctrl-names = "default", "sleep";
                                reg = <0x16280000 0x1000>;
                                interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
  
                        gsbi4_i2c: i2c@16380000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
-                               pinctrl-0 = <&i2c4_pins &i2c4_pins_sleep>;
+                               pinctrl-0 = <&i2c4_pins>;
+                               pinctrl-1 = <&i2c4_pins_sleep>;
                                pinctrl-names = "default", "sleep";
                                reg = <0x16380000 0x1000>;
                                interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
                                compatible = "qcom,spi-qup-v1.1.1";
                                reg = <0x1a280000 0x1000>;
                                interrupts = <0 155 0>;
-                               pinctrl-0 = <&spi5_default &spi5_sleep>;
+                               pinctrl-0 = <&spi5_default>;
+                               pinctrl-1 = <&spi5_sleep>;
                                pinctrl-names = "default", "sleep";
                                clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
                                clock-names = "core", "iface";
  
                        gsbi6_i2c: i2c@16580000 {
                                compatible = "qcom,i2c-qup-v1.1.1";
-                               pinctrl-0 = <&i2c6_pins &i2c6_pins_sleep>;
+                               pinctrl-0 = <&i2c6_pins>;
+                               pinctrl-1 = <&i2c6_pins_sleep>;
                                pinctrl-names = "default", "sleep";
                                reg = <0x16580000 0x1000>;
                                interrupts = <GIC_SPI 157 IRQ_TYPE_NONE>;
                                clock-names = "core", "iface";
                                status = "disabled";
                        };
+                       gsbi7_i2c: i2c@16680000 {
+                               compatible = "qcom,i2c-qup-v1.1.1";
+                               pinctrl-0 = <&i2c7_pins>;
+                               pinctrl-1 = <&i2c7_pins_sleep>;
+                               pinctrl-names = "default", "sleep";
+                               reg = <0x16680000 0x1000>;
+                               interrupts = <GIC_SPI 159 IRQ_TYPE_NONE>;
+                               clocks = <&gcc GSBI7_QUP_CLK>,
+                                        <&gcc GSBI7_H_CLK>;
+                               clock-names = "core", "iface";
+                               status = "disabled";
+                       };
                };
  
                rng@1a500000 {
                };
  
                sata0: sata@29000000 {
 -                      compatible              = "generic-ahci";
 +                      compatible              = "qcom,apq8064-ahci", "generic-ahci";
                        status                  = "disabled";
                        reg                     = <0x29000000 0x180>;
                        interrupts              = <GIC_SPI 209 IRQ_TYPE_NONE>;
  
                        phys                    = <&sata_phy0>;
                        phy-names               = "sata-phy";
 +                      ports-implemented       = <0x1>;
                };
  
                /* Temporary fixed regulator */
index 8193139d0d8706037a29b5c03516f8d8dd15d12c,e98b3738ee424f3ac12a2ef8ed5bbe58d837c72a..6f164266a01053f4c5e291aca8c36b5f953ff54e
@@@ -1,6 -1,6 +1,6 @@@
  /dts-v1/;
  
 -#include <dt-bindings/interrupt-controller/arm-gic.h>
 +#include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/clock/qcom,gcc-msm8974.h>
  #include "skeleton.dtsi"
  
                        no-map;
                };
  
-               efs@0fd600000 {
-                       reg = <0x0fd60000 0x1a0000>;
+               rfsa@0fd60000 {
+                       reg = <0x0fd60000 0x20000>;
+                       no-map;
+               };
+               rmtfs@0fd80000 {
+                       reg = <0x0fd80000 0x180000>;
                        no-map;
                };
  
                hwlocks = <&tcsr_mutex 3>;
        };
  
+       smp2p-modem {
+               compatible = "qcom,smp2p";
+               qcom,smem = <435>, <428>;
+               interrupt-parent = <&intc>;
+               interrupts = <0 27 IRQ_TYPE_EDGE_RISING>;
+               qcom,ipc = <&apcs 8 14>;
+               qcom,local-pid = <0>;
+               qcom,remote-pid = <1>;
+               modem_smp2p_out: master-kernel {
+                       qcom,entry-name = "master-kernel";
+                       #qcom,state-cells = <1>;
+               };
+               modem_smp2p_in: slave-kernel {
+                       qcom,entry-name = "slave-kernel";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
        smp2p-wcnss {
                compatible = "qcom,smp2p";
                qcom,smem = <451>, <431>;
                        interrupts = <0 208 0>;
                };
  
+               i2c@f9924000 {
+                       status = "disabled";
+                       compatible = "qcom,i2c-qup-v2.1.1";
+                       reg = <0xf9924000 0x1000>;
+                       interrupts = <0 96 IRQ_TYPE_NONE>;
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
                blsp_i2c8: i2c@f9964000 {
                        status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        clock-names = "core", "iface";
                        #address-cells = <1>;
                        #size-cells = <0>;
 -                      dmas = <&blsp2_dma 20>, <&blsp2_dma 21>;
 -                      dma-names = "tx", "rx";
                };
  
                spmi_bus: spmi@fc4cf000 {
                        interrupt-controller;
                        #interrupt-cells = <4>;
                };
 -
 -              blsp2_dma: dma-controller@f9944000 {
 -                      compatible = "qcom,bam-v1.4.0";
 -                      reg = <0xf9944000 0x19000>;
 -                      interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
 -                      clocks = <&gcc GCC_BLSP2_AHB_CLK>;
 -                      clock-names = "bam_clk";
 -                      #dma-cells = <1>;
 -                      qcom,ee = <0>;
 -              };
        };
  
        smd {
                compatible = "qcom,smd";
  
+               modem {
+                       interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;
+                       qcom,ipc = <&apcs 8 12>;
+                       qcom,smd-edge = <0>;
+               };
                rpm {
                        interrupts = <0 168 1>;
                        qcom,ipc = <&apcs 8 0>;
index 9817090c1b731540a2dcd4cb3dc480608040fbfa,8fc78ff6cbc081eeda1a0dfdf8e54ceb2a351a95..2827e7ab5ebcd9a379f0afa390f255b2a986833d
                        status = "disabled";
  
                        nfc@c0000000 {
 -                              compatible = "atmel,sama5d4-nfc";
 +                              compatible = "atmel,sama5d3-nfc";
                                #address-cells = <1>;
                                #size-cells = <1>;
                                reg = < /* NFC Command Registers */
                        #size-cells = <1>;
                        ranges;
  
+                       hlcdc: hlcdc@f0000000 {
+                               compatible = "atmel,sama5d2-hlcdc";
+                               reg = <0xf0000000 0x2000>;
+                               interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>;
+                               clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
+                               clock-names = "periph_clk","sys_clk", "slow_clk";
+                               status = "disabled";
+                               hlcdc-display-controller {
+                                       compatible = "atmel,hlcdc-display-controller";
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       port@0 {
+                                               #address-cells = <1>;
+                                               #size-cells = <0>;
+                                               reg = <0>;
+                                       };
+                               };
+                               hlcdc_pwm: hlcdc-pwm {
+                                       compatible = "atmel,hlcdc-pwm";
+                                       #pwm-cells = <3>;
+                               };
+                       };
                        ramc0: ramc@f000c000 {
                                compatible = "atmel,sama5d3-ddramc";
                                reg = <0xf000c000 0x200>;
                                status = "disabled";
                        };
  
+                       sfr: sfr@f8030000 {
+                               compatible = "atmel,sama5d2-sfr", "syscon";
+                               reg = <0xf8030000 0x98>;
+                       };
                        flx0: flexcom@f8034000 {
                                compatible = "atmel,sama5d2-flexcom";
                                reg = <0xf8034000 0x200>;
                                clocks = <&clk32k>;
                        };
  
+                       shdwc@f8048010 {
+                               compatible = "atmel,sama5d2-shdwc";
+                               reg = <0xf8048010 0x10>;
+                               clocks = <&clk32k>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               atmel,wakeup-rtc-timer;
+                       };
                        pit: timer@f8048030 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xf8048030 0x10>;
                                compatible = "atmel,sama5d4-wdt";
                                reg = <0xf8048040 0x10>;
                                interrupts = <4 IRQ_TYPE_LEVEL_HIGH 7>;
+                               clocks = <&clk32k>;
                                status = "disabled";
                        };
  
                                status = "disabled";
                        };
  
+                       trng@fc01c000 {
+                               compatible = "atmel,at91sam9g45-trng";
+                               reg = <0xfc01c000 0x100>;
+                               interrupts = <47 IRQ_TYPE_LEVEL_HIGH 0>;
+                               clocks = <&trng_clk>;
+                       };
                        aic: interrupt-controller@fc020000 {
                                #interrupt-cells = <3>;
                                compatible = "atmel,sama5d2-aic";
                                clock-names = "tdes_clk";
                                status = "okay";
                        };
+                       chipid@fc069000 {
+                               compatible = "atmel,sama5d2-chipid";
+                               reg = <0xfc069000 0x8>;
+                       };
                };
        };
  };
index fac6d43e7fdb89ca556fd21b7d089f58bc5be844,0ba3dc9963d48937fa8b9af2eaf9d6e70294c9e7..754f478110b490bc07857fe27e1c1dc1fc6f66c9
  #include "cp_intc.h"
  #include <mach/da8xx.h>
  
 -#define DA8XX_NUM_UARTS       3
 -
 -static const struct of_device_id const da8xx_irq_match[] __initconst = {
 -      { .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
 -      { }
 -};
 -
 -static void __init da8xx_init_irq(void)
 -{
 -      of_irq_init(da8xx_irq_match);
 -}
 -
  static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
+       OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),
        OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),
        OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),
        OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),
@@@ -27,6 -40,7 +28,7 @@@
        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),
        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
        OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
+       OF_DEV_AUXDATA("ti,da830-spi", 0x01c41000, "spi_davinci.0", NULL),
        OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),
        OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),
        OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),
@@@ -42,7 -56,9 +44,7 @@@
  
  static void __init da850_init_machine(void)
  {
 -      of_platform_populate(NULL, of_default_bus_match_table,
 -                           da850_auxdata_lookup, NULL);
 -
 +      of_platform_default_populate(NULL, da850_auxdata_lookup, NULL);
  }
  
  static const char *const da850_boards_compat[] __initconst = {
@@@ -54,6 -70,7 +56,6 @@@
  
  DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")
        .map_io         = da850_init,
 -      .init_irq       = da8xx_init_irq,
        .init_time      = davinci_timer_init,
        .init_machine   = da850_init_machine,
        .dt_compat      = da850_boards_compat,
index 706d2426024f7f0665c47dc37b92f566cb87a726,868c10eaea48196da824e2d3be14d9e1db05bcb8..eb0ce7b096170181bc2f65441aaf002e5de3b8cb
                clock-frequency = <0>;
        };
  
+       /* External CAN clock - to be overridden by boards that provide it */
+       can_clk: can {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <0>;
+               status = "disabled";
+       };
        /* External SCIF clock - to be overridden by boards that provide it */
        scif_clk: scif {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <0>;
 -              status = "disabled";
        };
  
        soc {
                        #size-cells = <0>;
                };
  
+               can0: can@e6c30000 {
+                       compatible = "renesas,can-r8a7795",
+                                    "renesas,rcar-gen3-can";
+                       reg = <0 0xe6c30000 0 0x1000>;
+                       interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 916>,
+                              <&cpg CPG_CORE R8A7795_CLK_CANFD>,
+                              <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
+                       assigned-clock-rates = <40000000>;
+                       power-domains = <&cpg>;
+                       status = "disabled";
+               };
+               can1: can@e6c38000 {
+                       compatible = "renesas,can-r8a7795",
+                                    "renesas,rcar-gen3-can";
+                       reg = <0 0xe6c38000 0 0x1000>;
+                       interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&cpg CPG_MOD 915>,
+                              <&cpg CPG_CORE R8A7795_CLK_CANFD>,
+                              <&can_clk>;
+                       clock-names = "clkp1", "clkp2", "can_clk";
+                       assigned-clocks = <&cpg CPG_CORE R8A7795_CLK_CANFD>;
+                       assigned-clock-rates = <40000000>;
+                       power-domains = <&cpg>;
+                       status = "disabled";
+               };
                hscif0: serial@e6540000 {
                        compatible = "renesas,hscif-r8a7795",
                                     "renesas,rcar-gen3-hscif",
                };
  
                xhci0: usb@ee000000 {
-                       compatible = "renesas,xhci-r8a7795";
+                       compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci";
                        reg = <0 0xee000000 0 0xc00>;
                        interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 328>;
                };
  
                xhci1: usb@ee0400000 {
-                       compatible = "renesas,xhci-r8a7795";
+                       compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci";
                        reg = <0 0xee040000 0 0xc00>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 327>;