diff options
author | Tom Rini <trini@konsulko.com> | 2021-07-07 08:52:14 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-07 08:52:14 -0400 |
commit | 008604c3b8915384fc4f2905d13b53723571bde8 (patch) | |
tree | c3f1ff87f8bc512d0dc5bb0edba556786d98dbda | |
parent | 5617efd2c882562b716a61bc0dc0edda46b045df (diff) | |
parent | 89bd68a7484880900b47bcadd1b5671c52592d16 (diff) | |
download | u-boot-008604c3b8915384fc4f2905d13b53723571bde8.zip u-boot-008604c3b8915384fc4f2905d13b53723571bde8.tar.gz u-boot-008604c3b8915384fc4f2905d13b53723571bde8.tar.bz2 |
Merge tag 'u-boot-atmel-fixes-2021.10-a' of https://source.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel fixes for 2021.10 cycle:
This small fixes set is dedicated to fixing the onewire subsystem for
the at91 boards which was broken since 2020.04.
-rw-r--r-- | arch/arm/dts/at91-sama5d27_som1_ek.dts | 3 | ||||
-rw-r--r-- | arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 3 | ||||
-rw-r--r-- | arch/arm/dts/at91-sama5d2_ptc_ek.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/at91-sama5d2_xplained.dts | 3 | ||||
-rw-r--r-- | arch/arm/dts/at91-sama5d3_xplained.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/at91-sama5d4_xplained.dts | 2 | ||||
-rw-r--r-- | arch/arm/dts/sam9x60ek.dts | 2 | ||||
-rw-r--r-- | drivers/w1/w1-gpio.c | 2 |
8 files changed, 11 insertions, 8 deletions
diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts index 4cd6db6..ee851a1 100644 --- a/arch/arm/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts @@ -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"; diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts index ab23f5c..f3f6942 100644 --- a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts +++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts @@ -7,6 +7,7 @@ * Author: Nicolas Ferre <nicolas.ferre@microcihp.com> */ /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"; diff --git a/arch/arm/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/dts/at91-sama5d2_ptc_ek.dts index 068a117..cd3711a 100644 --- a/arch/arm/dts/at91-sama5d2_ptc_ek.dts +++ b/arch/arm/dts/at91-sama5d2_ptc_ek.dts @@ -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"; diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts index 7f0d169..b733c4d 100644 --- a/arch/arm/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/dts/at91-sama5d2_xplained.dts @@ -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"; diff --git a/arch/arm/dts/at91-sama5d3_xplained.dts b/arch/arm/dts/at91-sama5d3_xplained.dts index 20fba5f..fc50800 100644 --- a/arch/arm/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/dts/at91-sama5d3_xplained.dts @@ -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"; diff --git a/arch/arm/dts/at91-sama5d4_xplained.dts b/arch/arm/dts/at91-sama5d4_xplained.dts index 7da5086..7495925 100644 --- a/arch/arm/dts/at91-sama5d4_xplained.dts +++ b/arch/arm/dts/at91-sama5d4_xplained.dts @@ -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"; diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts index 96914b3..77edd59 100644 --- a/arch/arm/dts/sam9x60ek.dts +++ b/arch/arm/dts/sam9x60ek.dts @@ -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"; diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 3b0ead6..9346f81 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -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); |