w1: w1-gpio: claim the gpio with correct initial flag
PATCH 2/2 ARM: dts: at91: fix the GPIO polarity for onewire
In reply to Eugen HristevThe GPIO polarity for onewire must be GPIO_ACTIVE_HIGH.
On previous versions this used to work as it looks like the right flag values are being passed since :
https://lists.denx.de/pipermail/u-boot/2020-April/407195.html
And that series broke the old functionality for onewire nodes. Some boards had the correct value for the polarity, but it wasn't clear so I replaced it with the right macro for the flag, instead of an empty value.
--- arch/arm/dts/at91-sama5d27_som1_ek.dts | 3 ++- arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 3 ++- arch/arm/dts/at91-sama5d2_ptc_ek.dts | 2 +- arch/arm/dts/at91-sama5d2_xplained.dts | 3 ++- arch/arm/dts/at91-sama5d3_xplained.dts | 2 +- arch/arm/dts/at91-sama5d4_xplained.dts | 2 +- arch/arm/dts/sam9x60ek.dts | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-)
arch/arm/dts/at91-sama5d27_som1_ek.dts +2 -1
@@ -43,6 +43,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "sama5d27_som1.dtsi" / {
@@ -55,7 +56,7 @@ }; onewire_tm: onewire { - gpios = <&pioA 17 0>; + gpios = <&pioA 17 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/at91-sama5d27_wlsom1_ek.dts +2 -1
@@ -7,6 +7,7 @@ * Author: Nicolas Ferre <[email protected]> */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "sama5d27_wlsom1.dtsi" / {
@@ -18,7 +19,7 @@ }; onewire_tm: onewire { - gpios = <&pioA PIN_PC9 0>; + gpios = <&pioA PIN_PC9 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/at91-sama5d2_ptc_ek.dts +1 -1
@@ -57,7 +57,7 @@ }; onewire_tm: onewire { - gpios = <&pioA PIN_PB31 0>; + gpios = <&pioA PIN_PB31 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/at91-sama5d2_xplained.dts +2 -1
@@ -1,4 +1,5 @@ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "sama5d2.dtsi" #include "sama5d2-pinfunc.h"
@@ -12,7 +13,7 @@ }; onewire_tm: onewire { - gpios = <&pioA PIN_PB0 0>; + gpios = <&pioA PIN_PB0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/at91-sama5d3_xplained.dts +1 -1
@@ -37,7 +37,7 @@ }; onewire_tm: onewire { - gpios = <&pioE 23 GPIO_ACTIVE_LOW>; + gpios = <&pioE 23 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/at91-sama5d4_xplained.dts +1 -1
@@ -59,7 +59,7 @@ }; onewire_tm: onewire { - gpios = <&pioE 15 GPIO_ACTIVE_LOW>; + gpios = <&pioE 15 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
arch/arm/dts/sam9x60ek.dts +1 -1
@@ -29,7 +29,7 @@ }; onewire_tm: onewire { - gpios = <&pioD 14 0>; + gpios = <&pioD 14 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_onewire_tm_default>; status = "okay";
Signature · 1 line
2.25.1
PATCH 1/2 w1: w1-gpio: claim the gpio with correct initial flag
gpio_request_by_name should be called with proper flags.
The 0 value flag is invalid, and causes bad initialization of the gpio.
--- drivers/w1/w1-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/w1/w1-gpio.c +1 -1
@@ -156,7 +156,7 @@ static int w1_gpio_of_to_plat(struct udevice *dev)struct w1_gpio_pdata *pdata =dev_get_plat (dev);int ret; - ret =gpio_request_by_name (dev,"gpios" ,0 , &pdata->gpio,0 ); + ret =gpio_request_by_name (dev,"gpios" ,0 , &pdata->gpio,GPIOD_IS_IN );if (ret <0 )printf ("Error claiming GPIO %d\n" , ret);
Signature · 1 line
2.25.1
Quoted 14 lines · Eugen Hristev
gpio_request_by_nameshould be called with proper flags.
The 0 value flag is invalid, and causes bad initialization of the gpio.Signed-off-by Eugen Hristev <[email protected]>--- drivers/w1/w1-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/w1/w1-gpio.c +0
-0
drivers/w1/w1-gpio.c static int w1_gpio_of_to_plat(struct udevice *dev) · line 162
Quoted 8 lines
drivers/w1/w1-gpio.c +1
-1@@ -156,7 +156,7 @@ static int w1_gpio_of_to_plat(struct udevice *dev)struct w1_gpio_pdata *pdata =dev_get_plat (dev);int ret; - ret =gpio_request_by_name (dev,"gpios" ,0 , &pdata->gpio,0 ); + ret =gpio_request_by_name (dev,"gpios" ,0 , &pdata->gpio,GPIOD_IS_IN );if (ret <0 )printf ("Error claiming GPIO %d\n" , ret);
Applied both to u-boot-atmel/master