--- /dev/null
+From 0fdebe1a2f4d3a8fc03754022fabf8ba95e131a3 Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Tue, 14 Apr 2015 20:37:26 +0000
+Subject: ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
+
+From: Stefan Wahren <stefan.wahren@i2se.com>
+
+commit 0fdebe1a2f4d3a8fc03754022fabf8ba95e131a3 upstream.
+
+The dr_mode of usb0 on imx233-olinuxino is left to default "otg".
+Since the green LED (GPIO2_1) on imx233-olinuxino is connected to the
+same pin as USB_OTG_ID it's possible to disable USB host by LED toggling:
+
+echo 0 > /sys/class/leds/green/brightness
+[ 1068.890000] ci_hdrc ci_hdrc.0: remove, state 1
+[ 1068.890000] usb usb1: USB disconnect, device number 1
+[ 1068.920000] usb 1-1: USB disconnect, device number 2
+[ 1068.920000] usb 1-1.1: USB disconnect, device number 3
+[ 1069.070000] usb 1-1.2: USB disconnect, device number 4
+[ 1069.450000] ci_hdrc ci_hdrc.0: USB bus 1 deregistered
+[ 1074.460000] ci_hdrc ci_hdrc.0: timeout waiting for 00000800 in 11
+
+This patch fixes the issue by setting dr_mode to "host" in the dts file.
+
+Reported-by: Harald Geyer <harald@ccbib.org>
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
+Reviewed-by: Marek Vasut <marex@denx.de>
+Acked-by: Peter Chen <peter.chen@freescale.com>
+Fixes: b49312948285 ("ARM: dts: imx23-olinuxino: Add USB host support")
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -89,6 +89,7 @@
+
+ ahb@80080000 {
+ usb0: usb@80080000 {
++ dr_mode = "host";
+ vbus-supply = <®_usb0_vbus>;
+ status = "okay";
+ };
--- /dev/null
+From f90d3f0d0a11fa77918fd5497cb616dd2faa8431 Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mpa@pengutronix.de>
+Date: Fri, 24 Apr 2015 09:27:33 +0200
+Subject: ARM: dts: imx25: Add #pwm-cells to pwm4
+
+From: Markus Pargmann <mpa@pengutronix.de>
+
+commit f90d3f0d0a11fa77918fd5497cb616dd2faa8431 upstream.
+
+The property '#pwm-cells' is currently missing. It is not possible to
+use pwm4 without this property.
+
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+Fixes: 5658a68fb578 ("ARM i.MX25: Add devicetree")
+Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/imx25.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/imx25.dtsi
++++ b/arch/arm/boot/dts/imx25.dtsi
+@@ -393,6 +393,7 @@
+
+ pwm4: pwm@53fc8000 {
+ compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
++ #pwm-cells = <2>;
+ reg = <0x53fc8000 0x4000>;
+ clocks = <&clks 108>, <&clks 52>;
+ clock-names = "ipg", "per";
--- /dev/null
+From 4ada77e37a773168fea484899201e272ab44ba8b Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Fri, 24 Apr 2015 13:29:47 +0200
+Subject: ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
+
+From: Marek Vasut <marex@denx.de>
+
+commit 4ada77e37a773168fea484899201e272ab44ba8b upstream.
+
+Fix a typo in the TX DMA interrupt name for AUART4.
+This patch makes AUART4 operational again.
+
+Signed-off-by: Marek Vasut <marex@denx.de>
+Fixes: f30fb03d4d3a ("ARM: dts: add generic DMA device tree binding for mxs-dma")
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt | 2 +-
+ arch/arm/boot/dts/imx28.dtsi | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
++++ b/Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt
+@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
+ 80 81 68 69
+ 70 71 72 73
+ 74 75 76 77>;
+- interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",
++ interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
+ "saif0", "saif1", "i2c0", "i2c1",
+ "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
+ "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
+--- a/arch/arm/boot/dts/imx28.dtsi
++++ b/arch/arm/boot/dts/imx28.dtsi
+@@ -691,7 +691,7 @@
+ 80 81 68 69
+ 70 71 72 73
+ 74 75 76 77>;
+- interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",
++ interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
+ "saif0", "saif1", "i2c0", "i2c1",
+ "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
+ "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
--- /dev/null
+From 750e30d4076ae5e02ad13a376e96c95a2627742c Mon Sep 17 00:00:00 2001
+From: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Date: Tue, 14 Apr 2015 11:50:13 +0200
+Subject: ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
+
+From: Gregory CLEMENT <gregory.clement@free-electrons.com>
+
+commit 750e30d4076ae5e02ad13a376e96c95a2627742c upstream.
+
+There is no crystal connected to the internal RTC on the Open Block
+AX3. So let's disable it in order to prevent the kernel probing the
+driver uselessly. Eventually this patches removes the following
+warning message from the boot log:
+"rtc-mv d0010300.rtc: internal RTC not ticking"
+
+Acked-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
++++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+@@ -32,6 +32,10 @@
+ 0xf0000000 0 0xf0000000 0x8000000 /* Device Bus, NOR 128MiB */>;
+
+ internal-regs {
++ rtc@10300 {
++ /* No crystal connected to the internal RTC */
++ status = "disabled";
++ };
+ serial@12000 {
+ clock-frequency = <250000000>;
+ status = "okay";
xen-console-update-console-event-channel-on-resume.patch
gpio-unregister-gpiochip-device-before-removing-it.patch
gpio-sysfs-fix-memory-leaks-and-device-hotplug.patch
+arm-dts-imx25-add-pwm-cells-to-pwm4.patch
+arm-dts-imx28-fix-auart4-tx-dma-interrupt-name.patch
+arm-dts-imx23-olinuxino-fix-dr_mode-of-usb0.patch
+arm-mvebu-armada-xp-openblocks-ax3-4-disable-internal-rtc.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
