dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'at91-dt-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

Browse Source 
AT91 DT for 5.12:

- removing a property never documented nor used
- adding i2c recovery GPI for one more board

* tag 'at91-dt-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d2: remove atmel,wakeup-type references
  ARM: dts: at91-sama5d27_wlsom1: add i2c recovery

Link: https://lore.kernel.org/r/20210122145056.171283-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2021-01-22 16:03:21 +01:00
parent 7c348d8de8 53efdfbb3b
commit 8a4e89a16a
7 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/at91-kizbox3_common.dtsi
-1
View File
@@ -341,7 +341,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
-1
View File
@@ -142,7 +142,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
+20 -2
View File
@@ -43,14 +43,20 @@
&i2c0 {
pinctrl-0 = <&pinctrl_i2c0_default>;
pinctrl-names = "default";
pinctrl-1 = <&pinctrl_i2c0_gpio>;
pinctrl-names = "default", "gpio";
sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD22 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
status = "okay";
};
&i2c1 {
dmas = <0>, <0>;
pinctrl-names = "default";
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1_default>;
pinctrl-1 = <&pinctrl_i2c1_gpio>;
sda-gpios = <&pioA PIN_PD19 GPIO_ACTIVE_HIGH>;
scl-gpios = <&pioA PIN_PD20 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
status = "okay";
mcp16502@5b {
@@ -258,12 +264,24 @@
bias-disable;
};
pinctrl_i2c0_gpio: i2c0_gpio {
pinmux = <PIN_PD21__GPIO>,
<PIN_PD22__GPIO>;
bias-disable;
};
pinctrl_i2c1_default: i2c1_default {
pinmux = <PIN_PD19__TWD1>,
<PIN_PD20__TWCK1>;
bias-disable;
};
pinctrl_i2c1_gpio: i2c1_gpio {
pinmux = <PIN_PD19__GPIO>,
<PIN_PD20__GPIO>;
bias-disable;
};
pinctrl_macb0_default: macb0_default {
pinmux = <PIN_PB14__GTXCK>,
<PIN_PB15__GTXEN>,
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
-1
View File
@@ -209,7 +209,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};
arch/arm/boot/dts/at91-sama5d2_icp.dts
-1
View File
@@ -697,7 +697,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
-1
View File
@@ -206,7 +206,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};
arch/arm/boot/dts/at91-sama5d2_xplained.dts
-1
View File
@@ -351,7 +351,6 @@
input@0 {
reg = <0>;
atmel,wakeup-type = "low";
};
};