Remove use of "gpio-reset" from DT
Subsystems (5)
v2 cover Remove use of "gpio-reset" from DT
Hello all,
I was working on fixing up the tlv320aic31xx driver when I noticed its gpio reset was not working, it was due to this driver looking for "gpio-reset" instead of the usual "reset-gpio". A quick check shows this mistake is rare and only copied by one other audio CODECs:
$ git grep "reset-gpio" | wc -l 630 $ git grep "gpio-reset" | wc -l 6
Luckliy the two effected drivers only use this reset line when power has been cut to the device, so not only were these optional properties but they had no real functional effect anyway. Lets just fix this before is spreads to drivers were it matters.
I've also added fixes tags to each patch so it can be individually back-ported to where this bug was introduced if one wanted to. I'm hoping this can sit on next for a while to get the most testing, just in case I'm wrong about this not breaking anything.
Thanks,
Andrew
Changes from v1:
- Move old property to "Deprecated properties" section in binding
- Keep backwards compatibility for now in driver with warning
- Re-order patches to keep series bisectable
- Use "reset-gpios" over "reset-gpio"
- Drop taken patch
- Rebased on v4.15-rc1
Andrew F. Davis (8):
ASoC: tlv320aic31xx: Fix typo in DT binding documentation
ASoC: tlv320aic3x: Fix typo in DT binding documentation
ASoC: tlv320aic31xx: Fix the reset GPIO OF name
ASoC: tlv320aic3x: Fix the reset GPIO OF name
ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
ARM: dts: imx6: RDU2: Fix the audio CODEC's reset pin
ARM: dts: imx: Fix the audio CODEC's reset pin
ARM: dts: omap3-n900: Fix the audio CODEC's reset pin
Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 9 ++++++++- Documentation/devicetree/bindings/sound/tlv320aic3x.txt | 10 +++++++++- arch/arm/boot/dts/am335x-pepper.dts | 2 +- arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 4 ++-- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++-- sound/soc/codecs/tlv320aic3x.c | 15 +++++++++++---- 8 files changed, 43 insertions(+), 14 deletions(-)
Signature · 1 line
2.15.0
PATCH v2 1/8 ASoC: tlv320aic31xx: Fix typo in DT binding documentation
The property used to specify a GPIO intended for reset is "reset-gpios", this binding uses "gpio-reset", as almost all other bindings use the former name this use of the latter was certainly not intended. It is not compatible with newer methods used to fetch GPIO pins and to prevent the spread of this error to other bindings lets fix this here.
We also standardize the pin as active-low, different device trees have marked the GPIO different ways, luckily the driver currently uses the low-level GPIO set function which does not respect the active-low flag, but future changes may change this. This is an active-low reset, mark it as such.
Lastly, add an example of use for this property.
--- Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +8 -1
@@ -22,7 +22,7 @@ Required properties: Optional properties: -- gpio-reset - gpio pin number used for codec reset +- reset-gpios - GPIO specification for the active low RESET input. - ai31xx-micbias-vg - MicBias Voltage setting 1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V 2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V
@@ -30,6 +30,10 @@ Optional properties: If this node is not mentioned or if the value is unknown, then micbias is set to 2.0V. +Deprecated properties: + +- gpio-reset - gpio pin number used for codec reset + CODEC output pins: * HPL * HPR
@@ -48,6 +52,7 @@ CODEC input pins: The pins can be used in referring sound node's audio-routing property. Example: +#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/sound/tlv320aic31xx-micbias.h> tlv320aic31xx: tlv320aic31xx@18 {
@@ -56,6 +61,8 @@ tlv320aic31xx: tlv320aic31xx@18 { ai31xx-micbias-vg = <MICBIAS_OFF>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + HPVDD-supply = <®ulator>; SPRVDD-supply = <®ulator>; SPLVDD-supply = <®ulator>;
Signature · 6 lines
2.15.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
maintainerRe: [PATCH v2 1/8] ASoC: tlv320aic31xx: Fix typo in DT binding documentation
Quoted 5 lines · Andrew F. Davis
The property used to specify a GPIO intended for reset is "reset-gpios", this binding uses "gpio-reset", as almost all other bindings use the former name this use of the latter was certainly not intended. It is not compatible with newer methods used to fetch GPIO pins and to prevent the spread of this error to other bindings lets fix this here.
When you say you're fixing a typo I'm looking for a fix for something like two letters being transposed. This isn't that, it's a completely different property name.
Mark Brown
maintainerApplied "ASoC: tlv320aic31xx: Rename property for reset GPIO" to the asoc tree
In reply to Andrew F. DavisThe patch
ASoC: tlv320aic31xx: Rename property for reset GPIO
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f00e0030bcbf49936d265330f6e0b8c739ad90c3Mon Sep 17 00:00:00 2001
From: "Andrew F. Davis" <[email protected]>
Date: Wed, 29 Nov 2017 11:13:52 -0600
Subject: [PATCH] ASoC: tlv320aic31xx: Rename property for reset GPIO
The property used to specify a GPIO intended for reset is "reset-gpios", but this binding uses "gpio-reset". It is not compatible with newer methods used to fetch GPIO pins and to prevent the spread of this error to other bindings let's rename to be more standard.
We also standardize the pin as active-low, different device trees have marked the GPIO different ways, luckily the driver currently uses the low-level GPIO set function which does not respect the active-low flag, but future changes may change this. This is an active-low reset, mark it as such.
Lastly, add an example of use for this property.
[Rewrote the title & first paragraph of the commit message for clarity -- broonie]
--- Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +8 -1
@@ -22,7 +22,7 @@ Required properties: Optional properties: -- gpio-reset - gpio pin number used for codec reset +- reset-gpios - GPIO specification for the active low RESET input. - ai31xx-micbias-vg - MicBias Voltage setting 1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V 2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V
@@ -30,6 +30,10 @@ Optional properties: If this node is not mentioned or if the value is unknown, then micbias is set to 2.0V. +Deprecated properties: + +- gpio-reset - gpio pin number used for codec reset + CODEC output pins: * HPL * HPR
@@ -48,6 +52,7 @@ CODEC input pins: The pins can be used in referring sound node's audio-routing property. Example: +#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/sound/tlv320aic31xx-micbias.h> tlv320aic31xx: tlv320aic31xx@18 {
@@ -56,6 +61,8 @@ tlv320aic31xx: tlv320aic31xx@18 { ai31xx-micbias-vg = <MICBIAS_OFF>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + HPVDD-supply = <®ulator>; SPRVDD-supply = <®ulator>; SPLVDD-supply = <®ulator>;
Signature · 1 line
2.15.0
PATCH v2 2/8 ASoC: tlv320aic3x: Fix typo in DT binding documentation
In reply to Andrew F. DavisThe property used to specify a GPIO intended for reset is "reset-gpios", this binding uses "gpio-reset", as almost all other bindings use the former name this use of the latter was certainly not intended. It is not compatible with newer methods used to fetch GPIO pins and to prevent the spread of this error to other bindings lets fix this here.
We also standardize the pin as active-low, different device trees have marked the GPIO different ways, luckily the driver currently uses the low-level GPIO set function which does not respect the active-low flag, but future changes may change this. This is an active-low reset, mark it as such.
Lastly, add an example of use for this property.
--- Documentation/devicetree/bindings/sound/tlv320aic3x.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/tlv320aic3x.txt +9 -1
@@ -17,7 +17,7 @@ Required properties: Optional properties: -- gpio-reset - gpio pin number used for codec reset +- reset-gpios - GPIO specification for the active low RESET input. - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality - Not supported on tlv320aic3104 - ai3x-micbias-vg - MicBias Voltage required.
@@ -34,6 +34,10 @@ Optional properties: - AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the device as covered in Documentation/devicetree/bindings/regulator/regulator.txt +Deprecated properties: + +- gpio-reset - gpio pin number used for codec reset + CODEC output pins: * LLOUT * RLOUT
@@ -61,10 +65,14 @@ The pins can be used in referring sound node's audio-routing property. Example: +#include <dt-bindings/gpio/gpio.h> + tlv320aic3x: tlv320aic3x@1b { compatible = "ti,tlv320aic3x"; reg = <0x1b>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + AVDD-supply = <®ulator>; IOVDD-supply = <®ulator>; DRVDD-supply = <®ulator>;
Signature · 6 lines
2.15.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
maintainerApplied "ASoC: tlv320aic3x: Rename property for reset GPIO" to the asoc tree
The patch
ASoC: tlv320aic3x: Rename property for reset GPIO
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
943293232ca45988ba0aa693b51025c58e1189caMon Sep 17 00:00:00 2001
From: "Andrew F. Davis" <[email protected]>
Date: Wed, 29 Nov 2017 11:13:53 -0600
Subject: [PATCH] ASoC: tlv320aic3x: Rename property for reset GPIO
The property used to specify a GPIO intended for reset is "reset-gpios", but this binding uses "gpio-reset". It is not compatible with newer methods used to fetch GPIO pins and to prevent the spread of this error to other bindings let's rename to be more standard.
We also standardize the pin as active-low, different device trees have marked the GPIO different ways, luckily the driver currently uses the low-level GPIO set function which does not respect the active-low flag, but future changes may change this. This is an active-low reset, mark it as such.
Lastly, add an example of use for this property.
[Rewrote title & first paragraph for clarity & accuracy -- broonie]
--- Documentation/devicetree/bindings/sound/tlv320aic3x.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/sound/tlv320aic3x.txt +9 -1
@@ -17,7 +17,7 @@ Required properties: Optional properties: -- gpio-reset - gpio pin number used for codec reset +- reset-gpios - GPIO specification for the active low RESET input. - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality - Not supported on tlv320aic3104 - ai3x-micbias-vg - MicBias Voltage required.
@@ -34,6 +34,10 @@ Optional properties: - AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the device as covered in Documentation/devicetree/bindings/regulator/regulator.txt +Deprecated properties: + +- gpio-reset - gpio pin number used for codec reset + CODEC output pins: * LLOUT * RLOUT
@@ -61,10 +65,14 @@ The pins can be used in referring sound node's audio-routing property. Example: +#include <dt-bindings/gpio/gpio.h> + tlv320aic3x: tlv320aic3x@1b { compatible = "ti,tlv320aic3x"; reg = <0x1b>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + AVDD-supply = <®ulator>; IOVDD-supply = <®ulator>; DRVDD-supply = <®ulator>;
Signature · 1 line
2.15.0
PATCH v2 3/8 ASoC: tlv320aic31xx: Fix the reset GPIO OF name
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/codecs/tlv320aic31xx.c +9 -2
@@ -1279,9 +1279,16 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) aic31xx->pdata.micbias_vg = MICBIAS_2_0V; } - ret =of_get_named_gpio (np,"gpio-reset" ,0 ); -if (ret >0 ) + ret =of_get_named_gpio (np,"reset-gpios" ,0 ); +if (ret >0 ) { aic31xx->pdata.gpio_reset = ret; + }else { + ret =of_get_named_gpio (np,"gpio-reset" ,0 ); +if (ret >0 ) { +dev_warn (aic31xx->dev,"Using deprecated property \"gpio-reset\", please update your DT" ); + aic31xx->pdata.gpio_reset = ret; + } + } }#else /* CONFIG_OF */ static void aic31xx_pdata_from_of (struct aic31xx_priv *aic31xx)
Signature · 1 line
2.15.0
Mark Brown
maintainerApplied "ASoC: tlv320aic31xx: Use standard reset GPIO OF name" to the asoc tree
The patch
ASoC: tlv320aic31xx: Use standard reset GPIO OF name
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
a825f31f93281bbe7126b25801deb476d07aaf82Mon Sep 17 00:00:00 2001
From: "Andrew F. Davis" <[email protected]>
Date: Wed, 29 Nov 2017 11:13:54 -0600
Subject: [PATCH] ASoC: tlv320aic31xx: Use standard reset GPIO OF name
The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
[Retitled for accuracy -- broonie]
--- sound/soc/codecs/tlv320aic31xx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
sound/soc/codecs/tlv320aic31xx.c +9 -2
@@ -1279,9 +1279,16 @@ static void aic31xx_pdata_from_of(struct aic31xx_priv *aic31xx) aic31xx->pdata.micbias_vg = MICBIAS_2_0V; } - ret =of_get_named_gpio (np,"gpio-reset" ,0 ); -if (ret >0 ) + ret =of_get_named_gpio (np,"reset-gpios" ,0 ); +if (ret >0 ) { aic31xx->pdata.gpio_reset = ret; + }else { + ret =of_get_named_gpio (np,"gpio-reset" ,0 ); +if (ret >0 ) { +dev_warn (aic31xx->dev,"Using deprecated property \"gpio-reset\", please update your DT" ); + aic31xx->pdata.gpio_reset = ret; + } + } }#else /* CONFIG_OF */ static void aic31xx_pdata_from_of (struct aic31xx_priv *aic31xx)
Signature · 1 line
2.15.0
PATCH v2 4/8 ASoC: tlv320aic3x: Fix the reset GPIO OF name
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- sound/soc/codecs/tlv320aic3x.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
sound/soc/codecs/tlv320aic3x.c +11 -4
@@ -1804,11 +1804,18 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,if (!ai3x_setup)return -ENOMEM ; - ret =of_get_named_gpio (np,"gpio-reset" ,0 ); -if (ret >=0 ) + ret =of_get_named_gpio (np,"reset-gpios" ,0 ); +if (ret >=0 ) { aic3x->gpio_reset = ret; -else - aic3x->gpio_reset =-1 ; + }else { + ret =of_get_named_gpio (np,"gpio-reset" ,0 ); +if (ret >0 ) { +dev_warn (&i2c->dev,"Using deprecated property \"gpio-reset\", please update your DT" ); + aic3x->gpio_reset = ret; + }else { + aic3x->gpio_reset =-1 ; + } + }if (of_property_read_u32_array (np,"ai3x-gpio-func" , ai3x_setup->gpio_func,2 ) >=0 ) {
Signature · 1 line
2.15.0
Mark Brown
maintainerApplied "ASoC: tlv320aic3x: Use standard reset GPIO OF name" to the asoc tree
The patch
ASoC: tlv320aic3x: Use standard reset GPIO OF name
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
025f8449818c46770f5652a0263f8cfb89d01455Mon Sep 17 00:00:00 2001
From: "Andrew F. Davis" <[email protected]>
Date: Wed, 29 Nov 2017 11:13:55 -0600
Subject: [PATCH] ASoC: tlv320aic3x: Use standard reset GPIO OF name
The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- sound/soc/codecs/tlv320aic3x.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
sound/soc/codecs/tlv320aic3x.c +11 -4
@@ -1804,11 +1804,18 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,if (!ai3x_setup)return -ENOMEM ; - ret =of_get_named_gpio (np,"gpio-reset" ,0 ); -if (ret >=0 ) + ret =of_get_named_gpio (np,"reset-gpios" ,0 ); +if (ret >=0 ) { aic3x->gpio_reset = ret; -else - aic3x->gpio_reset =-1 ; + }else { + ret =of_get_named_gpio (np,"gpio-reset" ,0 ); +if (ret >0 ) { +dev_warn (&i2c->dev,"Using deprecated property \"gpio-reset\", please update your DT" ); + aic3x->gpio_reset = ret; + }else { + aic3x->gpio_reset =-1 ; + } + }if (of_property_read_u32_array (np,"ai3x-gpio-func" , ai3x_setup->gpio_func,2 ) >=0 ) {
Signature · 1 line
2.15.0
PATCH v2 5/8 ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- arch/arm/boot/dts/am335x-pepper.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am335x-pepper.dts +1 -1
@@ -139,7 +139,7 @@ &audio_codec { status = "okay"; - gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; AVDD-supply = <&ldo3_reg>; IOVDD-supply = <&ldo3_reg>; DRVDD-supply = <&ldo3_reg>;
Signature · 1 line
2.15.0
Re: [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
Quoted 4 lines · Andrew F. Davis
The correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
Fixes 4341881d0562 ("ARM: dts: Add devicetree for Gumstix Pepper board")
So it seems this and patch 8/8 are safe for me to pick separately?
Regards,
Tony
Quoted 21 lines
Signed-off-by Andrew F. Davis <[email protected]>--- arch/arm/boot/dts/am335x-pepper.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/boot/dts/am335x-pepper.dts +1
-1@@ -139,7 +139,7 @@ &audio_codec { status = "okay"; - gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; AVDD-supply = <&ldo3_reg>; IOVDD-supply = <&ldo3_reg>; DRVDD-supply = <&ldo3_reg>;Signature · 1 line
2.15.0
Mark Brown
maintainerRe: [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
Quoted 1 line · Tony Lindgren
So it seems this and patch 8/8 are safe for me to pick separately?
It might make sense to pull in the relevant branches from ASoC first however IIRC the reset GPIO code currently does nothing useful anyway so it won't have any impact on bisection. Andrew?
Re: [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
Quoted 8 lines · Mark Brown
Quoted 1 line · Tony Lindgren
So it seems this and patch 8/8 are safe for me to pick separately?
It might make sense to pull in the relevant branches from ASoC first however IIRC the reset GPIO code currently does nothing useful anyway so it won't have any impact on bisection. Andrew?
Yeah, that's right, for safety it would be nice to take these after the ASoC code, but it shouldn't matter in practice as the reset wasn't used right anyway.
Mark Brown
maintainerRe: [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
Quoted 9 lines · Andrew F. Davis
Quoted 3 lines · Mark Brown
It might make sense to pull in the relevant branches from ASoC first however IIRC the reset GPIO code currently does nothing useful anyway so it won't have any impact on bisection. Andrew?
Yeah, that's right, for safety it would be nice to take these after the ASoC code, but it shouldn't matter in practice as the reset wasn't used right anyway.
I'd just go for it.
Re: [PATCH v2 5/8] ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
Quoted 7 lines · Mark Brown
Quoted 5 lines · Andrew F. Davis
Quoted 3 lines · Mark Brown
It might make sense to pull in the relevant branches from ASoC first however IIRC the reset GPIO code currently does nothing useful anyway so it won't have any impact on bisection. Andrew?
Quoted 5 lines
Quoted 3 lines
Yeah, that's right, for safety it would be nice to take these after the ASoC code, but it shouldn't matter in practice as the reset wasn't used right anyway.
I'd just go for it.
OK will apply the two omap dts changes for v4.16.
Thanks,
Tony
PATCH v2 6/8 ARM: dts: imx6: RDU2: Fix the audio CODEC's reset pin
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +2 -2
@@ -337,7 +337,7 @@ AVDD-supply = <®_3p3v>; IOVDD-supply = <®_3p3v>; DVDD-supply = <&vgen4_reg>; - gpio-reset = <&gpio1 2 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; accel@1c {
@@ -525,7 +525,7 @@ AVDD-supply = <®_3p3v>; IOVDD-supply = <®_3p3v>; DVDD-supply = <&vgen4_reg>; - gpio-reset = <&gpio1 0 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; touchscreen@20 {
Signature · 1 line
2.15.0
PATCH v2 7/8 ARM: dts: imx: Fix the audio CODEC's reset pin
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-gw5903.dtsi +1 -1
@@ -310,7 +310,7 @@ tlv320aic3105: codec@18 { compatible = "ti,tlv320aic3x"; reg = <0x18>; - gpio-reset = <&gpio5 17 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio5 17 GPIO_ACTIVE_LOW>; clocks = <&clks IMX6QDL_CLK_CKO>; ai3x-micbias-vg = <2>; /* MICBIAS_2_5V */ /* Regulators */
Signature · 1 line
2.15.0
PATCH v2 8/8 ARM: dts: omap3-n900: Fix the audio CODEC's reset pin
In reply to Andrew F. DavisThe correct DT property for specifying a GPIO used for reset is "reset-gpios", fix this here.
--- arch/arm/boot/dts/omap3-n900.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-n900.dts +2 -2
@@ -558,7 +558,7 @@ tlv320aic3x: tlv320aic3x@18 { compatible = "ti,tlv320aic3x"; reg = <0x18>; - gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ + reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ ai3x-gpio-func = < 0 /* AIC3X_GPIO1_FUNC_DISABLED */ 5 /* AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT */
@@ -575,7 +575,7 @@ tlv320aic3x_aux: tlv320aic3x@19 { compatible = "ti,tlv320aic3x"; reg = <0x19>; - gpio-reset = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* 60 */ + reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>; /* 60 */ AVDD-supply = <&vmmc2>; DRVDD-supply = <&vmmc2>;
Signature · 6 lines
2.15.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html