提交 008604c3 编写于 作者: T Tom Rini

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.
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
/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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册