eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-atmel-fixes-2021.10-a' of https://source.denx.de/u-boot/custodians/u-boot-atmel

Browse Source 
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.
This commit is contained in:
Tom Rini
2021-07-07 08:52:14 -04:00
parent 5617efd2c8 89bd68a748
commit 008604c3b8
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/dts/at91-sama5d27_som1_ek.dts
View File

@@ -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";

3
arch/arm/dts/at91-sama5d27_wlsom1_ek.dts
View File

@@ -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";

2
arch/arm/dts/at91-sama5d2_ptc_ek.dts
View File

@@ -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";

3
arch/arm/dts/at91-sama5d2_xplained.dts
View File

@@ -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";

2
arch/arm/dts/at91-sama5d3_xplained.dts
View File

@@ -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";

2
arch/arm/dts/at91-sama5d4_xplained.dts
View File

@@ -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";

2
arch/arm/dts/sam9x60ek.dts
View File

@@ -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";

2
drivers/w1/w1-gpio.c
View File

@@ -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);