3.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Greg Kroah-Hartman <gre...@linuxfoundation.org>

This reverts commit 9d8df5594467b6c73c3833b462abe5811fe7295b which was
commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream.

It requires a driver that was not merged until 4.16, so remove it from
this stable tree as it is pointless.

Reported-by: Ben Hutchings <ben.hutchi...@codethink.co.uk>
Cc: Andrew F. Davis <a...@ti.com>
Cc: Tony Lindgren <t...@atomide.com>
Cc: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 arch/arm/boot/dts/omap3-n900.dts |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -435,7 +435,7 @@
        tlv320aic3x: tlv320aic3x@18 {
                compatible = "ti,tlv320aic3x";
                reg = <0x18>;
-               reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
+               gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
                ai3x-gpio-func = <
                        0 /* AIC3X_GPIO1_FUNC_DISABLED */
                        5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
@@ -452,7 +452,7 @@
        tlv320aic3x_aux: tlv320aic3x@19 {
                compatible = "ti,tlv320aic3x";
                reg = <0x19>;
-               reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */
+               gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */
 
                AVDD-supply = <&vmmc2>;
                DRVDD-supply = <&vmmc2>;


Reply via email to