--- /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
+@@ -93,6 +93,7 @@
+
+ ahb@80080000 {
+ usb0: usb@80080000 {
++ dr_mode = "host";
+ vbus-supply = <®_usb0_vbus>;
+ status = "okay";
+ };
--- /dev/null
+From cfe8c59762244251fd9a5e281d48808095ff4090 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fabio.estevam@freescale.com>
+Date: Tue, 14 Apr 2015 11:05:04 -0300
+Subject: ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
+
+From: Fabio Estevam <fabio.estevam@freescale.com>
+
+commit cfe8c59762244251fd9a5e281d48808095ff4090 upstream.
+
+On imx23-olinuxino the LED turns on when level logic high is aplied to
+GPIO2_1.
+
+Fix the gpios property accordingly.
+
+Fixes: b34aa1850244 ("ARM: dts: imx23-olinuxino: Remove unneeded "default-on"")
+Reported-by: Stefan Wahren <stefan.wahren@i2se.com>
+Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
+Tested-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>
+
+---
+ arch/arm/boot/dts/imx23-olinuxino.dts | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -12,6 +12,7 @@
+ */
+
+ /dts-v1/;
++#include <dt-bindings/gpio/gpio.h>
+ #include "imx23.dtsi"
+
+ / {
+@@ -120,7 +121,7 @@
+
+ user {
+ label = "green";
+- gpios = <&gpio2 1 1>;
++ gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+ };
+ };
+ };
--- /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
+@@ -411,6 +411,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
+@@ -803,7 +803,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
+@@ -69,6 +69,10 @@
+ };
+
+ internal-regs {
++ rtc@10300 {
++ /* No crystal connected to the internal RTC */
++ status = "disabled";
++ };
+ serial@12000 {
+ clock-frequency = <250000000>;
+ status = "okay";
--- /dev/null
+From 19fc99d0c6ba7d9b65456496b5bb2169d5f74cd0 Mon Sep 17 00:00:00 2001
+From: Nicolas Schichan <nschichan@freebox.fr>
+Date: Wed, 6 May 2015 18:31:56 +0200
+Subject: ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
+
+From: Nicolas Schichan <nschichan@freebox.fr>
+
+commit 19fc99d0c6ba7d9b65456496b5bb2169d5f74cd0 upstream.
+
+In that case, emit_udiv() will be called with rn == ARM_R0 (r_scratch)
+and loading rm first into ARM_R0 will result in jit_udiv() function
+being called the same dividend and divisor. Fix that by loading rn
+first into ARM_R1 and then rm into ARM_R0.
+
+Signed-off-by: Nicolas Schichan <nschichan@freebox.fr>
+Fixes: aee636c4809f (bpf: do not use reciprocal divide)
+Acked-by: Mircea Gherzan <mgherzan@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/net/bpf_jit_32.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/net/bpf_jit_32.c
++++ b/arch/arm/net/bpf_jit_32.c
+@@ -449,10 +449,21 @@ static inline void emit_udiv(u8 rd, u8 r
+ return;
+ }
+ #endif
+- if (rm != ARM_R0)
+- emit(ARM_MOV_R(ARM_R0, rm), ctx);
++
++ /*
++ * For BPF_ALU | BPF_DIV | BPF_K instructions, rm is ARM_R4
++ * (r_A) and rn is ARM_R0 (r_scratch) so load rn first into
++ * ARM_R1 to avoid accidentally overwriting ARM_R0 with rm
++ * before using it as a source for ARM_R1.
++ *
++ * For BPF_ALU | BPF_DIV | BPF_X rm is ARM_R4 (r_A) and rn is
++ * ARM_R5 (r_X) so there is no particular register overlap
++ * issues.
++ */
+ if (rn != ARM_R1)
+ emit(ARM_MOV_R(ARM_R1, rn), ctx);
++ if (rm != ARM_R0)
++ emit(ARM_MOV_R(ARM_R0, rm), ctx);
+
+ ctx->seen |= SEEN_CALL;
+ emit_mov_i(ARM_R3, (u32)jit_udiv, ctx);
--- /dev/null
+From f9a8c3914ba85f19c3360b19612d77c47adb8942 Mon Sep 17 00:00:00 2001
+From: Ulf Hansson <ulf.hansson@linaro.org>
+Date: Mon, 20 Apr 2015 16:02:32 +0200
+Subject: ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
+
+From: Ulf Hansson <ulf.hansson@linaro.org>
+
+commit f9a8c3914ba85f19c3360b19612d77c47adb8942 upstream.
+
+Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default")
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/ste-href.dtsi | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/arm/boot/dts/ste-href.dtsi
++++ b/arch/arm/boot/dts/ste-href.dtsi
+@@ -124,8 +124,6 @@
+
+ states = <1800000 0x1
+ 2900000 0x0>;
+-
+- status = "disabled";
+ };
+
+ // External Micro SD slot
--- /dev/null
+From 11133db7a836b0cb411faa048f07a38e994d1382 Mon Sep 17 00:00:00 2001
+From: Ulf Hansson <ulf.hansson@linaro.org>
+Date: Mon, 20 Apr 2015 16:02:33 +0200
+Subject: ARM: ux500: Enable GPIO regulator for SD-card for snowball
+
+From: Ulf Hansson <ulf.hansson@linaro.org>
+
+commit 11133db7a836b0cb411faa048f07a38e994d1382 upstream.
+
+Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default")
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/ste-snowball.dts | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/arm/boot/dts/ste-snowball.dts
++++ b/arch/arm/boot/dts/ste-snowball.dts
+@@ -161,8 +161,6 @@
+
+ states = <1800000 0x1
+ 2900000 0x0>;
+-
+- status = "disabled";
+ };
+
+ // External Micro SD slot
--- /dev/null
+From 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e Mon Sep 17 00:00:00 2001
+From: Ulf Hansson <ulf.hansson@linaro.org>
+Date: Mon, 20 Apr 2015 16:02:31 +0200
+Subject: ARM: ux500: Move GPIO regulator for SD-card into board DTSs
+
+From: Ulf Hansson <ulf.hansson@linaro.org>
+
+commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e upstream.
+
+The GPIO regulator for the SD-card isn't a ux500 SOC configuration, but
+instead it's specific to the board. Move the definition of it, into the
+board DTSs.
+
+Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default")
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 -----------------
+ arch/arm/boot/dts/ste-href.dtsi | 17 +++++++++++++++++
+ arch/arm/boot/dts/ste-snowball.dts | 15 +++++++++++++++
+ 3 files changed, 32 insertions(+), 17 deletions(-)
+
+--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
++++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
+@@ -985,23 +985,6 @@
+ status = "disabled";
+ };
+
+- vmmci: regulator-gpio {
+- compatible = "regulator-gpio";
+-
+- regulator-min-microvolt = <1800000>;
+- regulator-max-microvolt = <2900000>;
+- regulator-name = "mmci-reg";
+- regulator-type = "voltage";
+-
+- startup-delay-us = <100>;
+- enable-active-high;
+-
+- states = <1800000 0x1
+- 2900000 0x0>;
+-
+- status = "disabled";
+- };
+-
+ mcde@a0350000 {
+ compatible = "stericsson,mcde";
+ reg = <0xa0350000 0x1000>, /* MCDE */
+--- a/arch/arm/boot/dts/ste-href.dtsi
++++ b/arch/arm/boot/dts/ste-href.dtsi
+@@ -111,6 +111,23 @@
+ pinctrl-1 = <&i2c3_sleep_mode>;
+ };
+
++ vmmci: regulator-gpio {
++ compatible = "regulator-gpio";
++
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <2900000>;
++ regulator-name = "mmci-reg";
++ regulator-type = "voltage";
++
++ startup-delay-us = <100>;
++ enable-active-high;
++
++ states = <1800000 0x1
++ 2900000 0x0>;
++
++ status = "disabled";
++ };
++
+ // External Micro SD slot
+ sdi0_per1@80126000 {
+ arm,primecell-periphid = <0x10480180>;
+--- a/arch/arm/boot/dts/ste-snowball.dts
++++ b/arch/arm/boot/dts/ste-snowball.dts
+@@ -146,8 +146,23 @@
+ };
+
+ vmmci: regulator-gpio {
++ compatible = "regulator-gpio";
++
+ gpios = <&gpio7 4 0x4>;
+ enable-gpio = <&gpio6 25 0x4>;
++
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <2900000>;
++ regulator-name = "mmci-reg";
++ regulator-type = "voltage";
++
++ startup-delay-us = <100>;
++ enable-active-high;
++
++ states = <1800000 0x1
++ 2900000 0x0>;
++
++ status = "disabled";
+ };
+
+ // External Micro SD slot
xen-console-update-console-event-channel-on-resume.patch
xen-events-set-irq_info-evtchn-before-binding-the-channel-to-cpu-in-__startup_pirq.patch
revert-dm-crypt-fix-deadlock-when-async-crypto-algorithm-returns-ebusy.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-dts-imx23-olinuxino-fix-polarity-of-led-gpio.patch
+arm-mvebu-armada-xp-openblocks-ax3-4-disable-internal-rtc.patch
+arm-net-fix-emit_udiv-for-bpf_alu-bpf_div-bpf_k-intruction.patch
+arm-ux500-move-gpio-regulator-for-sd-card-into-board-dtss.patch
+arm-ux500-enable-gpio-regulator-for-sd-card-for-href-boards.patch
+arm-ux500-enable-gpio-regulator-for-sd-card-for-snowball.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
