Commit 8a4e89a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7c348d8d 53efdfbb

arch/arm/boot/dts/at91-kizbox3_common.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ &shutdown_controller { 


	input@0 {

		reg = <0>;

		atmel,wakeup-type = "low";

	};

};

arch/arm/boot/dts/at91-sama5d27_som1_ek.dts

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ shdwc@f8048010 { 


				input@0 {

					reg = <0>;

					atmel,wakeup-type = "low";

				};

			};

arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi

+20 −2
Original line number Diff line number Diff line
@@ -43,14 +43,20 @@ uart6: serial@200 { 


&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 @@ pinctrl_i2c0_default: i2c0_default { 
		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

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ &shutdown_controller { 


	input@0 {

		reg = <0>;

		atmel,wakeup-type = "low";

	};

};

arch/arm/boot/dts/at91-sama5d2_icp.dts

+0 −1
Original line number Diff line number Diff line
@@ -697,7 +697,6 @@ &shutdown_controller { 


	input@0 {

		reg = <0>;

		atmel,wakeup-type = "low";

	};

};