Commit 47a4e437 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT for 5.7

 - Enable watchdog on sam9x60
 - Correct sama5d4/2 RTC compatibles
 - Add i2c gpio pinctrl to allow i2c recovery

* tag 'at91-5.7-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d27_wlsom1_ek: add USB device node
  ARM: dts: at91: sama5d2: add i2c gpio pinctrl
  ARM: dts: at91: sama5d4: add i2c gpio pinctrl
  ARM: dts: at91: sama5d3: add i2c gpio pinctrl
  ARM: dts: at91: sama5d4: use correct rtc compatible
  ARM: dts: at91: sama5d2: use correct rtc compatible
  ARM: dts: at91: sam9x60ek: enable watchdog node
  ARM: dts: at91: sam9x60: add watchdog node
  ARM: dts: at91: Kill off "simple-panel" compatibles

Link: https://lore.kernel.org/r/20200322085931.GA208770@piout.net


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eec05449 b8c2c052

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
	};



	panel: panel {

		compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92", "simple-panel";

		compatible = "winstar,wf70gtiagdng0", "innolux,at070tn92";

		backlight = <&backlight>;

		power-supply = <&vcc_lcd_reg>;

		#address-cells = <1>;

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

+5 −0
Original line number Diff line number Diff line
@@ -645,3 +645,8 @@ 
&usb2 {

	status = "okay";

};



&watchdog {

	status = "okay";

};

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

+12 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ 
		pinmux = <PIN_PA10__GPIO>;

		bias-disable;

	};



	pinctrl_usba_vbus: usba_vbus {

		pinmux = <PIN_PA16__GPIO>;

		bias-disable;

	};

};



&pwm0 {
@@ -248,6 +253,13 @@ 
	status = "okay";

};



&usb0 {

	atmel,vbus-gpio = <&pioA PIN_PA16 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usba_vbus>;

	status = "okay";

};



&usb1 {

	num-ports = <3>;

	atmel,vbus-gpio = <0

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

+30 −3
Original line number Diff line number Diff line
@@ -180,8 +180,11 @@ 


			i2c0: i2c@f8028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&pinctrl_i2c0_default>;

				pinctrl-1 = <&pinctrl_i2c0_gpio>;

				sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>;

				status = "okay";

			};
@@ -198,8 +201,11 @@ 
					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;

					pinctrl-names = "default";

					pinctrl-names = "default", "gpio";

					pinctrl-0 = <&pinctrl_flx0_default>;

					pinctrl-1 = <&pinctrl_flx0_gpio>;

					sda-gpios = <&pioA PIN_PB28 GPIO_ACTIVE_HIGH>;

					scl-gpios = <&pioA PIN_PB29 GPIO_ACTIVE_HIGH>;

					atmel,fifo-size = <16>;

					status = "okay";

				};
@@ -226,8 +232,11 @@ 


			i2c1: i2c@fc028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&pinctrl_i2c1_default>;

				pinctrl-1 = <&pinctrl_i2c1_gpio>;

				sda-gpios = <&pioA PIN_PC6 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&pioA PIN_PC7 GPIO_ACTIVE_HIGH>;

				status = "okay";



				at24@50 {
@@ -244,18 +253,36 @@ 
					bias-disable;

				};



				pinctrl_flx0_gpio: flx0_gpio {

					pinmux = <PIN_PB28__GPIO>,

						 <PIN_PB29__GPIO>;

					bias-disable;

				};



				pinctrl_i2c0_default: i2c0_default {

					pinmux = <PIN_PD21__TWD0>,

						 <PIN_PD22__TWCK0>;

					bias-disable;

				};



				pinctrl_i2c0_gpio: i2c0_gpio {

					pinmux = <PIN_PD21__GPIO>,

						 <PIN_PD22__GPIO>;

					bias-disable;

				};



				pinctrl_i2c1_default: i2c1_default {

					pinmux = <PIN_PC6__TWD1>,

						 <PIN_PC7__TWCK1>;

					bias-disable;

				};



				pinctrl_i2c1_gpio: i2c1_gpio {

					pinmux = <PIN_PC6__GPIO>,

						 <PIN_PC7__GPIO>;

					bias-disable;

				};



				pinctrl_key_gpio_default: key_gpio_default {

					pinmux = <PIN_PA10__GPIO>;

					bias-pull-up;

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

+30 −3
Original line number Diff line number Diff line
@@ -129,8 +129,11 @@ 


			i2c0: i2c@f8028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&pinctrl_i2c0_default>;

				pinctrl-1 = <&pinctrl_i2c0_gpio>;

				sda-gpios = <&pioA PIN_PD21 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&pioA PIN_PD22 GPIO_ACTIVE_HIGH>;

				i2c-sda-hold-time-ns = <350>;

				status = "okay";
@@ -331,8 +334,11 @@ 
					#address-cells = <1>;

					#size-cells = <0>;

					clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

					pinctrl-names = "default";

					pinctrl-names = "default", "gpio";

					pinctrl-0 = <&pinctrl_flx4_default>;

					pinctrl-1 = <&pinctrl_flx4_gpio>;

					sda-gpios = <&pioA PIN_PD12 GPIO_ACTIVE_HIGH>;

					scl-gpios = <&pioA PIN_PD13 GPIO_ACTIVE_HIGH>;

					atmel,fifo-size = <16>;

					i2c-analog-filter;

					i2c-digital-filter;
@@ -343,11 +349,14 @@ 


			i2c1: i2c@fc028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-names = "default", "gpio";

				pinctrl-0 = <&pinctrl_i2c1_default>;

				i2c-analog-filter;

				i2c-digital-filter;

				i2c-digital-filter-width-ns = <35>;

				pinctrl-1 = <&pinctrl_i2c1_gpio>;

				sda-gpios = <&pioA PIN_PD4 GPIO_ACTIVE_HIGH>;

				scl-gpios = <&pioA PIN_PD5 GPIO_ACTIVE_HIGH>;

				status = "okay";



				at24@54 {
@@ -441,18 +450,36 @@ 
					bias-disable;

				};



				pinctrl_flx4_gpio: flx4_gpio {

					pinmux = <PIN_PD12__GPIO>,

						 <PIN_PD13__GPIO>;

					bias-disable;

				};



				pinctrl_i2c0_default: i2c0_default {

					pinmux = <PIN_PD21__TWD0>,

						 <PIN_PD22__TWCK0>;

					bias-disable;

				};



				pinctrl_i2c0_gpio: i2c0_gpio {

					pinmux = <PIN_PD21__GPIO>,

						 <PIN_PD22__GPIO>;

					bias-disable;

				};



				pinctrl_i2c1_default: i2c1_default {

					pinmux = <PIN_PD4__TWD1>,

						 <PIN_PD5__TWCK1>;

					bias-disable;

				};



				pinctrl_i2c1_gpio: i2c1_gpio {

					pinmux = <PIN_PD4__GPIO>,

						 <PIN_PD5__GPIO>;

					bias-disable;

				};



				pinctrl_i2s0_default: i2s0_default {

					pinmux = <PIN_PC1__I2SC0_CK>,

						 <PIN_PC2__I2SC0_MCK>,

CRA Git | Maintained and supported by SUSTech CRA and CCSE