diff --git a/patch.sh b/patch.sh
index 8ce405571604fc8c5eb3fc1b9b01688bb134b7d0..034a21e6e5a2cf642473fa2a45b09ae34b8bf9de 100644
--- a/patch.sh
+++ b/patch.sh
@@ -292,15 +292,6 @@ imx () {
# ${git} "${DIR}/patches/imx/0003-ahci-imx-Add-i.MX53-support.patch"
}
-omap_usb () {
- echo "dir: omap_usb"
- #${git} "${DIR}/patches/omap_usb/0001-ARM-dts-omap3-beagle-Fix-USB-host-on-beagle-boards-f.patch"
-# ${git} "${DIR}/patches/omap_usb/0002-gpio-twl4030-Fix-regression-for-twl-gpio-LED-output.patch"
-# ${git} "${DIR}/patches/omap_usb/0003-ARM-OMAP4-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch"
-# ${git} "${DIR}/patches/omap_usb/0004-ARM-OMAP2-hwmod-Fix-RESET-logic.patch"
-# ${git} "${DIR}/patches/omap_usb/0005-ARM-OMAP3-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch"
-}
-
omap_video () {
echo "dir: omap_video"
${git} "${DIR}/patches/omap_video/0001-dts-omap3-beagle-add-i2c2-i2c3.patch"
@@ -411,7 +402,6 @@ omap_next
omap_dt_dss_v3
imx
-omap_usb
omap_video
clock
omap_clock
diff --git a/patches/omap_usb/0001-ARM-dts-omap3-beagle-Fix-USB-host-on-beagle-boards-f.patch b/patches/omap_usb/0001-ARM-dts-omap3-beagle-Fix-USB-host-on-beagle-boards-f.patch
deleted file mode 100644
index 3017dcf6bda7e8e61a938b2071c454bff3476741..0000000000000000000000000000000000000000
--- a/patches/omap_usb/0001-ARM-dts-omap3-beagle-Fix-USB-host-on-beagle-boards-f.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 90d77faf88e7a5f4afcf61284b725603ba0461f5 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Mon, 25 Nov 2013 15:55:45 +0200
-Subject: [PATCH] ARM: dts: omap3-beagle: Fix USB host on beagle boards (for
- 3.13)
-
-Beagle (rev. C4) and Beagle-XM (all revs) need VAUX2 1.8V supply
-for the USB PHY.
-
-As the generic PHY driver can't handle more than one supply
-at the moment, we configure this supply to be always on.
-This will cause a very small power impact if the USB host subsystem
-is not in use, about 76.86 micro-W + LDO power.
-
-Older Beagle boards (prior to C4) don't have VAUX2 connected anywhere,
-so there won't be any functional impact on those boards other than
-some additional LDO power consumption.
-
-Reported-by: Nishanth Menon <nm@ti.com>
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/boot/dts/omap3-beagle-xm.dts | 7 +++++++
- arch/arm/boot/dts/omap3-beagle.dts | 7 +++++++
- 2 files changed, 14 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
-index 8a735e5..ad58e49 100644
---- a/arch/arm/boot/dts/omap3-beagle-xm.dts
-+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
-@@ -244,3 +244,10 @@
- video-source = <&venc>;
- };
- };
-+
-+&vaux2 {
-+ regulator-name = "usb_1v8";
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+};
-diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
-index 323ceaf..fb0b9f4 100644
---- a/arch/arm/boot/dts/omap3-beagle.dts
-+++ b/arch/arm/boot/dts/omap3-beagle.dts
-@@ -207,3 +207,10 @@
- video-source = <&venc>;
- };
- };
-+
-+&vaux2 {
-+ regulator-name = "vdd_ehci";
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ regulator-always-on;
-+};
---
-1.8.4.3
-
diff --git a/patches/omap_usb/0002-gpio-twl4030-Fix-regression-for-twl-gpio-LED-output.patch b/patches/omap_usb/0002-gpio-twl4030-Fix-regression-for-twl-gpio-LED-output.patch
deleted file mode 100644
index 72aea4db625a4b089244e64a4acfeb2724197176..0000000000000000000000000000000000000000
--- a/patches/omap_usb/0002-gpio-twl4030-Fix-regression-for-twl-gpio-LED-output.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From bb31b0b105311536db5e5e7d4bb936c02550c6d4 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Thu, 5 Dec 2013 11:23:35 +0200
-Subject: [PATCH 2/2] gpio: twl4030: Fix regression for twl gpio LED output
-
-Commit 0b2aa8be introduced a regression that causes failure
-in setting LED GPO direction to OUT.
-
-This causes USB host probe failures for Beagleboard C4.
-
-[ 2.075469] platform usb_phy_gen_xceiv.2: Driver usb_phy_gen_xceiv requests probe deferral
-[ 2.090454] hsusb2_vcc: Failed to request enable GPIO510: -22
-[ 2.100982] reg-fixed-voltage reg-fixed-voltage.0.auto: Failed to register regulator: -22
-[ 2.109954] reg-fixed-voltage: probe of reg-fixed-voltage.0.auto failed with error -22
-
-direction_out/direction_in must return 0 if the operation succeeded.
-
-Also, don't update direction flag and output data if twl4030_set_gpio_direction()
-failed inside twl_direction_out();
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- drivers/gpio/gpio-twl4030.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
-index b97d6a6..f999689 100644
---- a/drivers/gpio/gpio-twl4030.c
-+++ b/drivers/gpio/gpio-twl4030.c
-@@ -300,7 +300,7 @@ static int twl_direction_in(struct gpio_chip *chip, unsigned offset)
- if (offset < TWL4030_GPIO_MAX)
- ret = twl4030_set_gpio_direction(offset, 1);
- else
-- ret = -EINVAL;
-+ ret = -EINVAL; /* LED outputs can't be set as input */
-
- if (!ret)
- priv->direction &= ~BIT(offset);
-@@ -354,11 +354,20 @@ static void twl_set(struct gpio_chip *chip, unsigned offset, int value)
- static int twl_direction_out(struct gpio_chip *chip, unsigned offset, int value)
- {
- struct gpio_twl4030_priv *priv = to_gpio_twl4030(chip);
-- int ret = -EINVAL;
-+ int ret = 0;
-
- mutex_lock(&priv->mutex);
-- if (offset < TWL4030_GPIO_MAX)
-+ if (offset < TWL4030_GPIO_MAX) {
- ret = twl4030_set_gpio_direction(offset, 0);
-+ if (ret) {
-+ mutex_unlock(&priv->mutex);
-+ return ret;
-+ }
-+ }
-+
-+ /*
-+ * LED gpios i.e. offset >= TWL4030_GPIO_MAX are always output
-+ */
-
- priv->direction |= BIT(offset);
- mutex_unlock(&priv->mutex);
---
-1.8.4.3
-
diff --git a/patches/omap_usb/0003-ARM-OMAP4-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch b/patches/omap_usb/0003-ARM-OMAP4-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch
deleted file mode 100644
index b1cf972b9bf182532e0de69e573bda37b59894f8..0000000000000000000000000000000000000000
--- a/patches/omap_usb/0003-ARM-OMAP4-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 9cdc8c73e928c3a79f9f951f2f00eb81e8b9a939 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Tue, 3 Dec 2013 16:25:46 +0200
-Subject: [PATCH 3/5] ARM: OMAP4+: hwmod data: Don't prevent RESET of USB Host
- module
-
-Without this, the USB devices are sometimes not detected on OMAP4 Panda
-with u-boot v2013.10.
-
-Unlike what the comment states, errata i660 does not state that we
-can't RESET the USB host module. Instead it states that RESET is the
-only way to recover from a deadlock situation.
-
-RESET ensures that the module is in a known good state irrespective
-of what bootloader does with the module, so it must be done at boot.
-
-Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 12 ++----------
- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 13 +++----------
- 2 files changed, 5 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-index 1e5b12c..3318cae9 100644
---- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-@@ -2937,7 +2937,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_usb_host_hs_sysc = {
- .sysc_offs = 0x0010,
- .syss_offs = 0x0014,
- .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE |
-- SYSC_HAS_SOFTRESET),
-+ SYSC_HAS_SOFTRESET | SYSC_HAS_RESET_STATUS),
- .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
- SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
- MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
-@@ -3001,15 +3001,7 @@ static struct omap_hwmod omap44xx_usb_host_hs_hwmod = {
- * hence HWMOD_SWSUP_MSTANDBY
- */
-
-- /*
-- * During system boot; If the hwmod framework resets the module
-- * the module will have smart idle settings; which can lead to deadlock
-- * (above Errata Id:i660); so, dont reset the module during boot;
-- * Use HWMOD_INIT_NO_RESET.
-- */
--
-- .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
-- HWMOD_INIT_NO_RESET,
-+ .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
- };
-
- /*
-diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-index 9e08d69..e297d62 100644
---- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-@@ -1544,7 +1544,8 @@ static struct omap_hwmod_class_sysconfig omap54xx_usb_host_hs_sysc = {
- .rev_offs = 0x0000,
- .sysc_offs = 0x0010,
- .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_RESET_STATUS |
-- SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
-+ SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-+ SYSC_HAS_RESET_STATUS),
- .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
- SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
- MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
-@@ -1598,15 +1599,7 @@ static struct omap_hwmod omap54xx_usb_host_hs_hwmod = {
- * hence HWMOD_SWSUP_MSTANDBY
- */
-
-- /*
-- * During system boot; If the hwmod framework resets the module
-- * the module will have smart idle settings; which can lead to deadlock
-- * (above Errata Id:i660); so, dont reset the module during boot;
-- * Use HWMOD_INIT_NO_RESET.
-- */
--
-- .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
-- HWMOD_INIT_NO_RESET,
-+ .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
- .main_clk = "l3init_60m_fclk",
- .prcm = {
- .omap4 = {
---
-1.8.4.3
-
diff --git a/patches/omap_usb/0004-ARM-OMAP2-hwmod-Fix-RESET-logic.patch b/patches/omap_usb/0004-ARM-OMAP2-hwmod-Fix-RESET-logic.patch
deleted file mode 100644
index b4860e0231119c63e7e2075654c882e6d62efc1c..0000000000000000000000000000000000000000
--- a/patches/omap_usb/0004-ARM-OMAP2-hwmod-Fix-RESET-logic.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 7d839ba03bed45903567405fea0418c8664a6d71 Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Tue, 3 Dec 2013 16:25:47 +0200
-Subject: [PATCH 4/5] ARM: OMAP2+: hwmod: Fix RESET logic
-
-In _ocp_softreset(), after _set_softreset() + write_sysconfig(),
-the hwmod's sysc_cache will always contain SOFTRESET bit set
-so all further writes to sysconfig using this cache will initiate
-a repeated SOFTRESET e.g. enable_sysc(). This is true for OMAP3 like
-platforms that have RESET_DONE status in the SYSSTATUS register and
-so the the SOFTRESET bit in SYSCONFIG is not automatically cleared.
-It is not a problem for OMAP4 like platforms that indicate RESET
-completion by clearing the SOFTRESET bit in the SYSCONFIG register.
-
-This repeated SOFTRESET is undesired and was the root cause of
-USB host issues on OMAP3 platforms when hwmod was allowed to do the
-SOFTRESET for the USB Host module.
-
-To fix this we clear the SOFTRESET bit and update the sysconfig
-register + sysc_cache using write_sysconfig().
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/mach-omap2/omap_hwmod.c | 43 +++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 42 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index e3f0eca..615acec 100644
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -399,7 +399,7 @@ static int _set_clockactivity(struct omap_hwmod *oh, u8 clockact, u32 *v)
- }
-
- /**
-- * _set_softreset: set OCP_SYSCONFIG.CLOCKACTIVITY bits in @v
-+ * _set_softreset: set OCP_SYSCONFIG.SOFTRESET bit in @v
- * @oh: struct omap_hwmod *
- * @v: pointer to register contents to modify
- *
-@@ -427,6 +427,36 @@ static int _set_softreset(struct omap_hwmod *oh, u32 *v)
- }
-
- /**
-+ * _clr_softreset: clear OCP_SYSCONFIG.SOFTRESET bit in @v
-+ * @oh: struct omap_hwmod *
-+ * @v: pointer to register contents to modify
-+ *
-+ * Clear the SOFTRESET bit in @v for hwmod @oh. Returns -EINVAL upon
-+ * error or 0 upon success.
-+ */
-+static int _clr_softreset(struct omap_hwmod *oh, u32 *v)
-+{
-+ u32 softrst_mask;
-+
-+ if (!oh->class->sysc ||
-+ !(oh->class->sysc->sysc_flags & SYSC_HAS_SOFTRESET))
-+ return -EINVAL;
-+
-+ if (!oh->class->sysc->sysc_fields) {
-+ WARN(1,
-+ "omap_hwmod: %s: sysc_fields absent for sysconfig class\n",
-+ oh->name);
-+ return -EINVAL;
-+ }
-+
-+ softrst_mask = (0x1 << oh->class->sysc->sysc_fields->srst_shift);
-+
-+ *v &= ~softrst_mask;
-+
-+ return 0;
-+}
-+
-+/**
- * _wait_softreset_complete - wait for an OCP softreset to complete
- * @oh: struct omap_hwmod * to wait on
- *
-@@ -1911,6 +1941,12 @@ static int _ocp_softreset(struct omap_hwmod *oh)
- ret = _set_softreset(oh, &v);
- if (ret)
- goto dis_opt_clks;
-+
-+ _write_sysconfig(v, oh);
-+ ret = _clr_softreset(oh, &v);
-+ if (ret)
-+ goto dis_opt_clks;
-+
- _write_sysconfig(v, oh);
-
- if (oh->class->sysc->srst_udelay)
-@@ -3169,6 +3205,11 @@ int omap_hwmod_softreset(struct omap_hwmod *oh)
- goto error;
- _write_sysconfig(v, oh);
-
-+ ret = _clr_softreset(oh, &v);
-+ if (ret)
-+ goto error;
-+ _write_sysconfig(v, oh);
-+
- error:
- return ret;
- }
---
-1.8.4.3
-
diff --git a/patches/omap_usb/0005-ARM-OMAP3-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch b/patches/omap_usb/0005-ARM-OMAP3-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch
deleted file mode 100644
index 8e12ecefe903c98dfc7d1c9286bc6c9e6fa3b340..0000000000000000000000000000000000000000
--- a/patches/omap_usb/0005-ARM-OMAP3-hwmod-data-Don-t-prevent-RESET-of-USB-Host.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 09028dd4df3832ddfee60ead912b64dd75518f2f Mon Sep 17 00:00:00 2001
-From: Roger Quadros <rogerq@ti.com>
-Date: Tue, 3 Dec 2013 16:25:48 +0200
-Subject: [PATCH 5/5] ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host
- module
-
-Unlike what the comment states, errata i660 does not state that we
-can't RESET the USB host module. Instead it states that RESET is the
-only way to recover from a deadlock situation.
-
-RESET ensures that the module is in a known good state irrespective
-of what bootloader does with the module, so it must be done at boot.
-
-Signed-off-by: Roger Quadros <rogerq@ti.com>
----
- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
-index 9e56fab..d337429 100644
---- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
-+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
-@@ -1943,7 +1943,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = {
- .syss_offs = 0x0014,
- .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
- SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |
-- SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
-+ SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
-+ SYSS_HAS_RESET_STATUS),
- .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
- MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
- .sysc_fields = &omap_hwmod_sysc_type1,
-@@ -2021,15 +2022,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
- * hence HWMOD_SWSUP_MSTANDBY
- */
-
-- /*
-- * During system boot; If the hwmod framework resets the module
-- * the module will have smart idle settings; which can lead to deadlock
-- * (above Errata Id:i660); so, dont reset the module during boot;
-- * Use HWMOD_INIT_NO_RESET.
-- */
--
-- .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
-- HWMOD_INIT_NO_RESET,
-+ .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
- };
-
- /*
---
-1.8.4.3
-