diff options
author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-11-20 12:47:46 +0100 |
---|---|---|
committer | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-11-21 15:36:10 +0100 |
commit | 6bdf3cbaa9d64496c2deced70ba9b845e79f20b1 (patch) | |
tree | e959f21051161492b274d4f779b43471bb089092 /patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch | |
parent | 09c0238f1dc3f411ee3e81d1731eea314918db49 (diff) | |
download | platform-pengutronix-beaglebone-6bdf3cbaa9d64496c2deced70ba9b845e79f20b1.tar.gz platform-pengutronix-beaglebone-6bdf3cbaa9d64496c2deced70ba9b845e79f20b1.tar.xz |
kernel: add 3.12 patches
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Diffstat (limited to 'patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch')
-rw-r--r-- | patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch b/patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch new file mode 100644 index 0000000..f75008a --- /dev/null +++ b/patches/linux-3.12/0236-ARM-dts-omap5-uevm-Use-reset-gpios-for-hsusb2-3_rese.patch @@ -0,0 +1,63 @@ +From: Roger Quadros <rogerq@ti.com> +Date: Tue, 24 Sep 2013 11:53:53 +0300 +Subject: [PATCH] ARM: dts: omap5-uevm: Use reset-gpios for hsusb2/3_reset + +We no longer need to model the RESET line as a regulator since +the USB phy-nop driver accepts "reset-gpios" property. + +Signed-off-by: Roger Quadros <rogerq@ti.com> +Signed-off-by: Benoit Cousson <bcousson@baylibre.com> +--- + arch/arm/boot/dts/omap5-uevm.dts | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts +index da25a14..748f6bf 100644 +--- a/arch/arm/boot/dts/omap5-uevm.dts ++++ b/arch/arm/boot/dts/omap5-uevm.dts +@@ -27,21 +27,10 @@ + regulator-max-microvolt = <3000000>; + }; + +- /* HS USB Port 2 RESET */ +- hsusb2_reset: hsusb2_reset_reg { +- compatible = "regulator-fixed"; +- regulator-name = "hsusb2_reset"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 HUB_NRESET */ +- startup-delay-us = <70000>; +- enable-active-high; +- }; +- + /* HS USB Host PHY on PORT 2 */ + hsusb2_phy: hsusb2_phy { + compatible = "usb-nop-xceiv"; +- reset-supply = <&hsusb2_reset>; ++ reset-gpios = <&gpio3 16 GPIO_ACTIVE_LOW>; /* gpio3_80 HUB_NRESET */ + /** + * FIXME + * Put the right clock phandle here when available +@@ -51,21 +40,10 @@ + clock-frequency = <19200000>; + }; + +- /* HS USB Port 3 RESET */ +- hsusb3_reset: hsusb3_reset_reg { +- compatible = "regulator-fixed"; +- regulator-name = "hsusb3_reset"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>; /* gpio3_79 ETH_NRESET */ +- startup-delay-us = <70000>; +- enable-active-high; +- }; +- + /* HS USB Host PHY on PORT 3 */ + hsusb3_phy: hsusb3_phy { + compatible = "usb-nop-xceiv"; +- reset-supply = <&hsusb3_reset>; ++ reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>; /* gpio3_79 ETH_NRESET */ + }; + + leds { |