Commit 7eaeb52f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT for 5.4

 - style cleanup for at91sam9x5 based boards
 - avoid colliding node and property names

* tag 'at91-5.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: at91sam9x5dm.dtsi: Style cleanup
  ARM: dts: at91: at91sam9x5_lcd.dtsi: Style cleanup
  ARM: dts: at91: at91sam9xx5ek: Style cleanup
  ARM: dts: at91: at91sam9g15: Style cleanup
  ARM: dts: at91: kizboxmini: Style cleanup
  ARM: dts: at91: cosino: Style cleanup
  ARM: dts: at91: ariettag25: style cleanup
  ARM: dts: at91: ariag25: Style cleanup
  ARM: dts: at91: Add label for sam9x5's internal RTC
  dt-bindings: add vendor prefix "acme" for "Acme Systems srl"
  ARM: dts: at91: Avoid colliding 'display' node and property names

Link: https://lore.kernel.org/r/20190825202642.GA18853@piout.net


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

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ patternProperties: 
    description: Abilis Systems

  "^abracon,.*":

    description: Abracon Corporation

  "^acme,.*":

    description: Acme Systems srl

  "^actions,.*":

    description: Actions Semiconductor Co., Ltd.

  "^active-semi,.*":

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

+124 −131
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ 
		     "atmel,at91sam9x5", "atmel,at91sam9";



	aliases {

		serial0 = &dbgu;

		serial1 = &usart0;

		serial2 = &usart1;

		serial3 = &usart2;

		serial4 = &usart3;

		serial5 = &uart0;

		serial6 = &uart1;

	};
@@ -42,22 +37,83 @@ 
		};

	};



	ahb {

		apb {

			mmc0: mmc@f0008000 {

	leds {

		compatible = "gpio-leds";



		/* little green LED in middle of Aria G25 module */

		aria_led {

			label = "aria_led";

			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */

			linux,default-trigger = "heartbeat";

		};



	};



	onewire {

		compatible = "w1-gpio";

		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_w1_0>;

	};

};



&adc0 {

	status = "okay";

	atmel,adc-channels-used = <0xf>;

};



&dbgu {

	status = "okay";

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */



&macb0 {

	phy-mode = "rmii";

	/*

	 * following can be overwritten by bootloader:

	 * for example u-boot 'ftd set' command

	 */

	local-mac-address = [00 00 00 00 00 00];

	status = "okay";

};





&mmc0 {

	/* N.B. Aria has no SD card detect (CD), assumed present */



	pinctrl-0 = <

		&pinctrl_mmc0_slot0_clk_cmd_dat0

		&pinctrl_mmc0_slot0_dat1_3>;

	status = "okay";



	slot@0 {

		reg = <0>;

		bus-width = <4>;

	};

};



			tcb0: timer@f8008000 {

&pinctrl {

	w1_0 {

		pinctrl_w1_0: w1_0-0 {

			atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */

		};

	};

};



&rtc {

	status = "okay";

};



&tcb0 {

	timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;
@@ -69,24 +125,27 @@ 
	};

};



			i2c0: i2c@f8010000 {

				status = "okay";

/*

 * UART0/1 pins are marked as GPIO on

 * Aria documentation.

 * Change to "okay" if you need additional serial ports

 */

&uart0 {

	status = "disabled";

};



			i2c1: i2c@f8014000 {

				status = "okay";

&uart1 {

	status = "disabled";

};



			/* TWD2+TCLK2 hidden behind ethernet, so no i2c2 */



			usart0: serial@f801c000 {

&usart0 {

	pinctrl-0 = <&pinctrl_usart0

		     &pinctrl_usart0_rts

		     &pinctrl_usart0_cts>;

	status = "okay";

};



			usart1: serial@f8020000 {

&usart1 {

	pinctrl-0 = <&pinctrl_usart1

		     /* &pinctrl_usart1_rts */

		     /* &pinctrl_usart1_cts */
@@ -94,14 +153,14 @@ 
	status = "okay";

};



			usart2: serial@f8024000 {

&usart2 {

	/* cannot activate RTS2+CTS2, clash with

	 * ethernet on PB0 and PB1 */

	pinctrl-0 = <&pinctrl_usart2>;

	status = "okay";

};



			usart3: serial@f8028000 {

&usart3 {

	compatible = "atmel,at91sam9260-usart";

	reg = <0xf8028000 0x200>;

	interrupts = <8 4 5>;
@@ -113,77 +172,11 @@ 
	status = "okay";

};



			macb0: ethernet@f802c000 {

				phy-mode = "rmii";

				/*

				 * following can be overwritten by bootloader:

				 * for example u-boot 'ftd set' command

				 */

				local-mac-address = [00 00 00 00 00 00];

				status = "okay";

			};



			/*

			 * UART0/1 pins are marked as GPIO on

			 * Aria documentation.

			 * Change to "okay" if you need additional serial ports

			 */

			uart0: serial@f8040000 {

				status = "disabled";

			};



			uart1: serial@f8044000 {

				status = "disabled";

			};



			adc0: adc@f804c000 {

				status = "okay";

				atmel,adc-channels-used = <0xf>;

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			pinctrl@fffff400 {

				w1_0 {

					pinctrl_w1_0: w1_0-0 {

						atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */

					};

				};

			};



			rtc@fffffeb0 {

				status = "okay";

			};

		};



		usb0: ohci@600000 {

&usb0 {

	status = "okay";

	num-ports = <3>;

};



		usb1: ehci@700000 {

&usb1 {

	status = "okay";

};
 
	};



	leds {

		compatible = "gpio-leds";



		/* little green LED in middle of Aria G25 module */

		aria_led {

			label = "aria_led";

			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */

			linux,default-trigger = "heartbeat";

		};



	};



	onewire {

		compatible = "w1-gpio";

		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_w1_0>;

	};

};

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

+47 −53
Original line number Diff line number Diff line
@@ -6,14 +6,11 @@ 
 */

/dts-v1/;

#include "at91sam9g25.dtsi"



/ {

	model = "Acme Systems Arietta G25";

	compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";



	aliases {

		serial0 = &dbgu;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};
@@ -32,9 +29,22 @@ 
		};

	};



	ahb {

		apb {

			mmc0: mmc@f0008000 {

	leds {

		compatible = "gpio-leds";



		arietta_led {

			label = "arietta_led";

			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */

			linux,default-trigger = "heartbeat";

		};

	};

};



&dbgu {

	status = "okay";

};



&mmc0 {

	pinctrl-0 = <

		&pinctrl_mmc0_slot0_clk_cmd_dat0

		&pinctrl_mmc0_slot0_dat1_3>;
@@ -46,7 +56,11 @@ 
	};

};



			tcb0: timer@f8008000 {

&rtc {

	status = "okay";

};



&tcb0 {

	timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;
@@ -58,35 +72,15 @@ 
	};

};



			usb2: gadget@f803c000 {

				status = "okay";

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			rtc@fffffeb0 {

&usb0 {

	num-ports = <3>;

	status = "okay";

};

		};



		usb0: ohci@600000 {

&usb1 {

	status = "okay";

			num-ports = <3>;

};



		usb1: ehci@700000 {

&usb2 {

	status = "okay";

};
 
	};



	leds {

		compatible = "gpio-leds";

		arietta_led {

			label = "arietta_led";

			gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */

			linux,default-trigger = "heartbeat";

		};

	};

};

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

+100 −103
Original line number Diff line number Diff line
@@ -33,78 +33,30 @@ 
			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {

			tcb0: timer@f8008000 {

				timer@0 {

					compatible = "atmel,tcb-timer";

					reg = <0>;

};



				timer@1 {

					compatible = "atmel,tcb-timer";

					reg = <1>;

				};

			};



			mmc0: mmc@f0008000 {

				pinctrl-0 = <

					&pinctrl_board_mmc0

					&pinctrl_mmc0_slot0_clk_cmd_dat0

					&pinctrl_mmc0_slot0_dat1_3>;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <4>;

					cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;

				};

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};



			usart0: serial@f801c000 {

				status = "okay";

			};



			i2c0: i2c@f8010000 {

				status = "okay";

			};



			adc0: adc@f804c000 {

&adc0 {

	atmel,adc-ts-wires = <4>;

	atmel,adc-ts-pressure-threshold = <10000>;

	status = "okay";

};



			pinctrl@fffff400 {

				mmc0 {

					pinctrl_board_mmc0: mmc0-board {

						atmel,pins =

							<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* PD15 gpio CD pin pull up and deglitch */

					};

				};

			};



			watchdog@fffffe40 {

&dbgu {

	status = "okay";

};

		};



		ebi: ebi@10000000 {

&ebi {

	pinctrl-0 = <&pinctrl_ebi_addr_nand

		     &pinctrl_ebi_data_0_7>;

	pinctrl-names = "default";

	status = "okay";



			nand_controller: nand-controller {

				status = "okay";

	nand-controller {

		pinctrl-0 = <&pinctrl_nand_oe_we

			     &pinctrl_nand_cs

			     &pinctrl_nand_rb>;

		pinctrl-names = "default";

		status = "okay";



		nand@3 {

			reg = <0x3 0x0 0x800000>;
@@ -150,5 +102,50 @@ 
		};

	};

};



&i2c0 {

	status = "okay";

};



&mmc0 {

	pinctrl-0 = <

		&pinctrl_board_mmc0

		&pinctrl_mmc0_slot0_clk_cmd_dat0

		&pinctrl_mmc0_slot0_dat1_3>;

	status = "okay";



	slot@0 {

		reg = <0>;

		bus-width = <4>;

		cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;

	};

};



&pinctrl {

	mmc0 {

		pinctrl_board_mmc0: mmc0-board {

			atmel,pins =

				<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;	/* PD15 gpio CD pin pull up and deglitch */

		};

	};

};



&tcb0 {

	timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;

	};



	timer@1 {

		compatible = "atmel,tcb-timer";

		reg = <1>;

	};

};



&usart0 {

	status = "okay";

};



&watchdog {

	status = "okay";

};

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

+45 −48
Original line number Diff line number Diff line
@@ -17,61 +17,58 @@ 
/ {

	model = "HCE Cosino Mega 2560";

	compatible = "hce,cosino_mega2560", "atmel,at91sam9x5", "atmel,at91sam9";



	ahb {

		apb {

			macb0: ethernet@f802c000 {

				phy-mode = "rmii";

				status = "okay";

};



			adc0: adc@f804c000 {

&adc0 {

	atmel,adc-ts-wires = <4>;

	atmel,adc-ts-pressure-threshold = <10000>;

	status = "okay";

};



			rtc@fffffeb0 {

				status = "okay";

			};



			usart1: serial@f8020000 {

				status = "okay";

			};



			usart2: serial@f8024000 {

				status = "okay";

			};



			usb2: gadget@f803c000 {

				atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;

&macb0 {

	phy-mode = "rmii";

	status = "okay";

};



			mmc1: mmc@f000c000 {

&mmc1 {

	pinctrl-0 = <

		&pinctrl_mmc1_slot0_clk_cmd_dat0

		&pinctrl_mmc1_slot0_dat1_3>;

	status = "okay";



	slot@0 {

		reg = <0>;

		bus-width = <4>;

		non-removable;

	};

};



&rtc {

	status = "okay";

};



		usb0: ohci@600000 {

&usart1 {

	status = "okay";

};



&usart2 {

	status = "okay";

};



&usb0 {

	num-ports = <3>;

	atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW */

			   &pioD 19 GPIO_ACTIVE_LOW

			   &pioD 20 GPIO_ACTIVE_LOW

			  >;

	status = "okay";

};



		usb1: ehci@700000 {

&usb1 {

	status = "okay";

};

	};



&usb2 {

	atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE