Merge tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / am33xx.dtsi

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 707342914a6fda6840a439bb6001e2129ba46e4c..9770e35f25361644ade6c8846ba5cb7571822f0c 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -453,7 +453,7 @@
                        ti,hwmods = "usb_otg_hs";
                        status = "disabled";
 
-                       usb_ctrl_mod: control@44e10000 {
+                       usb_ctrl_mod: control@44e10620 {
                                compatible = "ti,am335x-usb-ctrl-module";
                                reg = <0x44e10620 0x10
                                        0x44e10648 0x4>;
@@ -556,7 +556,7 @@
                                        "tx14", "tx15";
                        };
 
-                       cppi41dma: dma-controller@07402000 {
+                       cppi41dma: dma-controller@47402000 {
                                compatible = "ti,am3359-cppi41";
                                reg =  <0x47400000 0x1000
                                        0x47402000 0x1000