projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 235cb4cb GKH |
1 | From foo@baz Fri Apr 6 10:03:41 CEST 2018 |
| 2 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 3 | Date: Fri, 6 Apr 2018 08:56:07 +0200 | |
| 4 | Subject: Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" | |
| 5 | ||
| 6 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 7 | ||
| 8 | This reverts commit 2f1f60c4b903f0f5464560783655ff74c9663a92 which was | |
| 9 | commit 7be4b5dc7ffa9499ac6ef33a5ffa9ff43f9b7057 upstream. | |
| 10 | ||
| 11 | It requires a driver that was not merged until 4.16, so remove it from | |
| 12 | this stable tree as it is pointless. | |
| 13 | ||
| 14 | Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk> | |
| 15 | Cc: Andrew F. Davis <afd@ti.com> | |
| 16 | Cc: Tony Lindgren <tony@atomide.com> | |
| 17 | Cc: Sasha Levin <alexander.levin@microsoft.com> | |
| 18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 19 | --- | |
| 20 | arch/arm/boot/dts/omap3-n900.dts | 4 ++-- | |
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 22 | ||
| 23 | --- a/arch/arm/boot/dts/omap3-n900.dts | |
| 24 | +++ b/arch/arm/boot/dts/omap3-n900.dts | |
| 25 | @@ -558,7 +558,7 @@ | |
| 26 | tlv320aic3x: tlv320aic3x@18 { | |
| 27 | compatible = "ti,tlv320aic3x"; | |
| 28 | reg = <0x18>; | |
| 29 | - reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ | |
| 30 | + gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ | |
| 31 | ai3x-gpio-func = < | |
| 32 | 0 /* AIC3X_GPIO1_FUNC_DISABLED */ | |
| 33 | 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */ | |
| 34 | @@ -575,7 +575,7 @@ | |
| 35 | tlv320aic3x_aux: tlv320aic3x@19 { | |
| 36 | compatible = "ti,tlv320aic3x"; | |
| 37 | reg = <0x19>; | |
| 38 | - reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ | |
| 39 | + gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ | |
| 40 | ||
| 41 | AVDD-supply = <&vmmc2>; | |
| 42 | DRVDD-supply = <&vmmc2>; |