From 9dfda10f887220e0becb0bc47b86ae1af9cce548 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 May 2014 13:47:46 -0700 Subject: [PATCH] 3.14-stable patches added patches: arm-dts-am335x-update-usb-dt-references.patch --- ...-dts-am335x-update-usb-dt-references.patch | 99 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 100 insertions(+) create mode 100644 queue-3.14/arm-dts-am335x-update-usb-dt-references.patch diff --git a/queue-3.14/arm-dts-am335x-update-usb-dt-references.patch b/queue-3.14/arm-dts-am335x-update-usb-dt-references.patch new file mode 100644 index 00000000000..f8af6c76657 --- /dev/null +++ b/queue-3.14/arm-dts-am335x-update-usb-dt-references.patch @@ -0,0 +1,99 @@ +From a2f8d6b303213a98436455aece7e14cdd1240629 Mon Sep 17 00:00:00 2001 +From: Leigh Brown +Date: Wed, 16 Apr 2014 12:26:35 +0100 +Subject: ARM: dts: am335x: update USB DT references + +From: Leigh Brown + +commit a2f8d6b303213a98436455aece7e14cdd1240629 upstream. + +In "ARM: dts: am33xx: correcting dt node unit address for usb", the +usb_ctrl_mod and cppi41dma nodes were updated with the correct register +addresses. However, the dts files that reference these nodes were not +updated, and those devices are no longer being enabled. + +This patch corrects the references for the affected dts files. + +Signed-off-by: Leigh Brown +Signed-off-by: Tony Lindgren +Cc: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/am335x-bone-common.dtsi | 4 ++-- + arch/arm/boot/dts/am335x-evm.dts | 4 ++-- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +--- a/arch/arm/boot/dts/am335x-bone-common.dtsi ++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi +@@ -183,7 +183,7 @@ + &usb { + status = "okay"; + +- control@44e10000 { ++ control@44e10620 { + status = "okay"; + }; + +@@ -204,7 +204,7 @@ + dr_mode = "host"; + }; + +- dma-controller@07402000 { ++ dma-controller@47402000 { + status = "okay"; + }; + }; +--- a/arch/arm/boot/dts/am335x-evm.dts ++++ b/arch/arm/boot/dts/am335x-evm.dts +@@ -325,7 +325,7 @@ + &usb { + status = "okay"; + +- control@44e10000 { ++ control@44e10620 { + status = "okay"; + }; + +@@ -346,7 +346,7 @@ + dr_mode = "host"; + }; + +- dma-controller@07402000 { ++ dma-controller@47402000 { + status = "okay"; + }; + }; +--- a/arch/arm/boot/dts/am335x-evmsk.dts ++++ b/arch/arm/boot/dts/am335x-evmsk.dts +@@ -334,7 +334,7 @@ + &usb { + status = "okay"; + +- control@44e10000 { ++ control@44e10620 { + status = "okay"; + }; + +--- a/arch/arm/boot/dts/am335x-igep0033.dtsi ++++ b/arch/arm/boot/dts/am335x-igep0033.dtsi +@@ -202,7 +202,7 @@ + &usb { + status = "okay"; + +- control@44e10000 { ++ control@44e10620 { + status = "okay"; + }; + +@@ -223,7 +223,7 @@ + dr_mode = "host"; + }; + +- dma-controller@07402000 { ++ dma-controller@47402000 { + status = "okay"; + }; + }; diff --git a/queue-3.14/series b/queue-3.14/series index e04c2b112d0..b217abe520a 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -156,3 +156,4 @@ clk-tegra-remove-non-existent-clocks.patch dt-tegra-remove-non-existent-clock-ids.patch usb-ehci-tegra-set-txfill_tuning.patch usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch +arm-dts-am335x-update-usb-dt-references.patch -- 2.47.3