Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup (b891e30e) · Commits · 戴 / test

arch/arm/boot/dts/aks-cdu.dts

+6 −6

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@

		/dts-v1/;

		/include/ "ge863-pro3.dtsi"
		#include "ge863-pro3.dtsi"

		/ {
		chosen {
		@@ -46,7 +46,7 @@
		};

		usb1: gadget@fffa4000 {
		atmel,vbus-gpio = <&pioC 15 0>;
		atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};
		};
		@@ -90,23 +90,23 @@
		compatible = "gpio-leds";

		red {
		gpios = <&pioC 10 0>;
		gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
		linux,default-trigger = "none";
		};

		green {
		gpios = <&pioA 5 1>;
		gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "none";
		default-state = "on";
		};

		yellow {
		gpios = <&pioB 20 1>;
		gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "none";
		};

		blue {
		gpios = <&pioB 21 1>;
		gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "none";
		};
		};

arch/arm/boot/dts/animeo_ip.dts

+9 −9

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		*/

		/dts-v1/;
		/include/ "at91sam9260.dtsi"
		#include "at91sam9260.dtsi"

		/ {
		model = "Somfy Animeo IP";
		@@ -123,7 +123,7 @@

		usb0: ohci@00500000 {
		num-ports = <2>;
		atmel,vbus-gpio = <&pioB 15 1>;
		atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
		status = "okay";
		};
		};
		@@ -133,23 +133,23 @@

		power_green {
		label = "power_green";
		gpios = <&pioC 17 0>;
		gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
		linux,default-trigger = "heartbeat";
		};

		power_red {
		label = "power_red";
		gpios = <&pioA 2 0>;
		gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
		};

		tx_green {
		label = "tx_green";
		gpios = <&pioC 19 0>;
		gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
		};

		tx_red {
		label = "tx_red";
		gpios = <&pioC 18 0>;
		gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
		};
		};

		@@ -160,21 +160,21 @@

		keyswitch_in {
		label = "keyswitch_in";
		gpios = <&pioB 1 0>;
		gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
		linux,code = <28>;
		gpio-key,wakeup;
		};

		error_in {
		label = "error_in";
		gpios = <&pioB 2 0>;
		gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
		linux,code = <29>;
		gpio-key,wakeup;
		};

		btn {
		label = "btn";
		gpios = <&pioC 23 0>;
		gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
		linux,code = <31>;
		gpio-key,wakeup;
		};

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* Licensed under GPLv2 or later.
		*/
		/dts-v1/;
		/include/ "at91sam9g25.dtsi"
		#include "at91sam9g25.dtsi"

		/ {
		model = "Acme Systems Aria G25";
		@@ -156,7 +156,7 @@
		/* little green LED in middle of Aria G25 module */
		aria_led {
		label = "aria_led";
		gpios = <&pioB 8 0>; /* PB8 */
		gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
		linux,default-trigger = "heartbeat";
		};

		@@ -164,7 +164,7 @@

		onewire@0 {
		compatible = "w1-gpio";
		gpios = <&pioA 21 1>;
		gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_w1_0>;
		};

arch/arm/boot/dts/at91rm9200.dtsi

+107 −100

Original line number	Diff line number	Diff line
		@@ -10,7 +10,10 @@
		* Licensed under GPLv2 or later.
		*/

		/include/ "skeleton.dtsi"
		#include "skeleton.dtsi"
		#include <dt-bindings/pinctrl/at91.h>
		#include <dt-bindings/interrupt-controller/irq.h>
		#include <dt-bindings/gpio/gpio.h>

		/ {
		model = "Atmel AT91RM9200 family SoC";
		@@ -77,25 +80,29 @@
		st: timer@fffffd00 {
		compatible = "atmel,at91rm9200-st";
		reg = <0xfffffd00 0x100>;
		interrupts = <1 4 7>;
		interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
		};

		tcb0: timer@fffa0000 {
		compatible = "atmel,at91rm9200-tcb";
		reg = <0xfffa0000 0x100>;
		interrupts = <17 4 0 18 4 0 19 4 0>;
		interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
		18 IRQ_TYPE_LEVEL_HIGH 0
		19 IRQ_TYPE_LEVEL_HIGH 0>;
		};

		tcb1: timer@fffa4000 {
		compatible = "atmel,at91rm9200-tcb";
		reg = <0xfffa4000 0x100>;
		interrupts = <20 4 0 21 4 0 22 4 0>;
		interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
		21 IRQ_TYPE_LEVEL_HIGH 0
		22 IRQ_TYPE_LEVEL_HIGH 0>;
		};

		i2c0: i2c@fffb8000 {
		compatible = "atmel,at91rm9200-i2c";
		reg = <0xfffb8000 0x4000>;
		interrupts = <12 4 6>;
		interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_twi>;
		#address-cells = <1>;
		@@ -106,7 +113,7 @@
		mmc0: mmc@fffb4000 {
		compatible = "atmel,hsmci";
		reg = <0xfffb4000 0x4000>;
		interrupts = <10 4 0>;
		interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
		#address-cells = <1>;
		#size-cells = <0>;
		status = "disabled";
		@@ -115,7 +122,7 @@
		ssc0: ssc@fffd0000 {
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfffd0000 0x4000>;
		interrupts = <14 4 5>;
		interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
		status = "disable";
		@@ -124,7 +131,7 @@
		ssc1: ssc@fffd4000 {
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfffd4000 0x4000>;
		interrupts = <15 4 5>;
		interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
		status = "disable";
		@@ -133,7 +140,7 @@
		ssc2: ssc@fffd8000 {
		compatible = "atmel,at91rm9200-ssc";
		reg = <0xfffd8000 0x4000>;
		interrupts = <16 4 5>;
		interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
		status = "disable";
		@@ -142,7 +149,7 @@
		macb0: ethernet@fffbc000 {
		compatible = "cdns,at91rm9200-emac", "cdns,emac";
		reg = <0xfffbc000 0x4000>;
		interrupts = <24 4 3>;
		interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
		phy-mode = "rmii";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_macb_rmii>;
		@@ -167,234 +174,234 @@
		dbgu {
		pinctrl_dbgu: dbgu-0 {
		atmel,pins =
		<0 30 0x1 0x0 /* PA30 periph A */
		0 31 0x1 0x1>; /* PA31 periph with pullup */
		<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A */
		AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA31 periph with pullup */
		};
		};

		uart0 {
		pinctrl_uart0: uart0-0 {
		atmel,pins =
		<0 17 0x1 0x0 /* PA17 periph A */
		0 18 0x1 0x0>; /* PA18 periph A */
		<AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
		AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA18 periph A */
		};

		pinctrl_uart0_rts: uart0_rts-0 {
		atmel,pins =
		<0 20 0x1 0x0>; /* PA20 periph A */
		<AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA20 periph A */
		};

		pinctrl_uart0_cts: uart0_cts-0 {
		atmel,pins =
		<0 21 0x1 0x0>; /* PA21 periph A */
		<AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA21 periph A */
		};
		};

		uart1 {
		pinctrl_uart1: uart1-0 {
		atmel,pins =
		<1 20 0x1 0x1 /* PB20 periph A with pullup */
		1 21 0x1 0x0>; /* PB21 periph A */
		<AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB20 periph A with pullup */
		AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
		};

		pinctrl_uart1_rts: uart1_rts-0 {
		atmel,pins =
		<1 24 0x1 0x0>; /* PB24 periph A */
		<AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB24 periph A */
		};

		pinctrl_uart1_cts: uart1_cts-0 {
		atmel,pins =
		<1 26 0x1 0x0>; /* PB26 periph A */
		<AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */
		};

		pinctrl_uart1_dtr_dsr: uart1_dtr_dsr-0 {
		atmel,pins =
		<1 19 0x1 0x0 /* PB19 periph A */
		1 25 0x1 0x0>; /* PB25 periph A */
		<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB19 periph A */
		AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB25 periph A */
		};

		pinctrl_uart1_dcd: uart1_dcd-0 {
		atmel,pins =
		<1 23 0x1 0x0>; /* PB23 periph A */
		<AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */
		};

		pinctrl_uart1_ri: uart1_ri-0 {
		atmel,pins =
		<1 18 0x1 0x0>; /* PB18 periph A */
		<AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
		};
		};

		uart2 {
		pinctrl_uart2: uart2-0 {
		atmel,pins =
		<0 22 0x1 0x0 /* PA22 periph A */
		0 23 0x1 0x1>; /* PA23 periph A with pullup */
		<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA22 periph A */
		AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA23 periph A with pullup */
		};

		pinctrl_uart2_rts: uart2_rts-0 {
		atmel,pins =
		<0 30 0x2 0x0>; /* PA30 periph B */
		<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
		};

		pinctrl_uart2_cts: uart2_cts-0 {
		atmel,pins =
		<0 31 0x2 0x0>; /* PA31 periph B */
		<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA31 periph B */
		};
		};

		uart3 {
		pinctrl_uart3: uart3-0 {
		atmel,pins =
		<0 5 0x2 0x1 /* PA5 periph B with pullup */
		0 6 0x2 0x0>; /* PA6 periph B */
		<AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
		AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA6 periph B */
		};

		pinctrl_uart3_rts: uart3_rts-0 {
		atmel,pins =
		<1 0 0x2 0x0>; /* PB0 periph B */
		<AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
		};

		pinctrl_uart3_cts: uart3_cts-0 {
		atmel,pins =
		<1 1 0x2 0x0>; /* PB1 periph B */
		<AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
		};
		};

		nand {
		pinctrl_nand: nand-0 {
		atmel,pins =
		<2 2 0x0 0x1 /* PC2 gpio RDY pin pull_up */
		1 1 0x0 0x1>; /* PB1 gpio CD pin pull_up */
		<AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC2 gpio RDY pin pull_up */
		AT91_PIOB 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PB1 gpio CD pin pull_up */
		};
		};

		macb {
		pinctrl_macb_rmii: macb_rmii-0 {
		atmel,pins =
		<0 7 0x1 0x0 /* PA7 periph A */
		0 8 0x1 0x0 /* PA8 periph A */
		0 9 0x1 0x0 /* PA9 periph A */
		0 10 0x1 0x0 /* PA10 periph A */
		0 11 0x1 0x0 /* PA11 periph A */
		0 12 0x1 0x0 /* PA12 periph A */
		0 13 0x1 0x0 /* PA13 periph A */
		0 14 0x1 0x0 /* PA14 periph A */
		0 15 0x1 0x0 /* PA15 periph A */
		0 16 0x1 0x0>; /* PA16 periph A */
		<AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA7 periph A */
		AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA8 periph A */
		AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */
		AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA10 periph A */
		AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A */
		AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A */
		AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA13 periph A */
		AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA14 periph A */
		AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA15 periph A */
		AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA16 periph A */
		};

		pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
		atmel,pins =
		<1 12 0x2 0x0 /* PB12 periph B */
		1 13 0x2 0x0 /* PB13 periph B */
		1 14 0x2 0x0 /* PB14 periph B */
		1 15 0x2 0x0 /* PB15 periph B */
		1 16 0x2 0x0 /* PB16 periph B */
		1 17 0x2 0x0 /* PB17 periph B */
		1 18 0x2 0x0 /* PB18 periph B */
		1 19 0x2 0x0>; /* PB19 periph B */
		<AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB12 periph B */
		AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB13 periph B */
		AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB14 periph B */
		AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB15 periph B */
		AT91_PIOB 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB16 periph B */
		AT91_PIOB 17 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB17 periph B */
		AT91_PIOB 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB18 periph B */
		AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB19 periph B */
		};
		};

		mmc0 {
		pinctrl_mmc0_clk: mmc0_clk-0 {
		atmel,pins =
		<0 27 0x1 0x0>; /* PA27 periph A */
		<AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
		};

		pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
		atmel,pins =
		<0 28 0x1 0x1 /* PA28 periph A with pullup */
		0 29 0x1 0x1>; /* PA29 periph A with pullup */
		<AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA28 periph A with pullup */
		AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA29 periph A with pullup */
		};

		pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
		atmel,pins =
		<1 3 0x2 0x1 /* PB3 periph B with pullup */
		1 4 0x2 0x1 /* PB4 periph B with pullup */
		1 5 0x2 0x1>; /* PB5 periph B with pullup */
		<AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB3 periph B with pullup */
		AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB4 periph B with pullup */
		AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PB5 periph B with pullup */
		};

		pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
		atmel,pins =
		<0 8 0x2 0x1 /* PA8 periph B with pullup */
		0 9 0x2 0x1>; /* PA9 periph B with pullup */
		<AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA8 periph B with pullup */
		AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA9 periph B with pullup */
		};

		pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
		atmel,pins =
		<0 10 0x2 0x1 /* PA10 periph B with pullup */
		0 11 0x2 0x1 /* PA11 periph B with pullup */
		0 12 0x2 0x1>; /* PA12 periph B with pullup */
		<AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA10 periph B with pullup */
		AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA11 periph B with pullup */
		AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA12 periph B with pullup */
		};
		};

		ssc0 {
		pinctrl_ssc0_tx: ssc0_tx-0 {
		atmel,pins =
		<1 0 0x1 0x0 /* PB0 periph A */
		1 1 0x1 0x0 /* PB1 periph A */
		1 2 0x1 0x0>; /* PB2 periph A */
		<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A */
		AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A */
		AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB2 periph A */
		};

		pinctrl_ssc0_rx: ssc0_rx-0 {
		atmel,pins =
		<1 3 0x1 0x0 /* PB3 periph A */
		1 4 0x1 0x0 /* PB4 periph A */
		1 5 0x1 0x0>; /* PB5 periph A */
		<AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A */
		AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */
		AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */
		};
		};

		ssc1 {
		pinctrl_ssc1_tx: ssc1_tx-0 {
		atmel,pins =
		<1 6 0x1 0x0 /* PB6 periph A */
		1 7 0x1 0x0 /* PB7 periph A */
		1 8 0x1 0x0>; /* PB8 periph A */
		<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
		AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
		AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */
		};

		pinctrl_ssc1_rx: ssc1_rx-0 {
		atmel,pins =
		<1 9 0x1 0x0 /* PB9 periph A */
		1 10 0x1 0x0 /* PB10 periph A */
		1 11 0x1 0x0>; /* PB11 periph A */
		<AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
		AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB10 periph A */
		AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
		};
		};

		ssc2 {
		pinctrl_ssc2_tx: ssc2_tx-0 {
		atmel,pins =
		<1 12 0x1 0x0 /* PB12 periph A */
		1 13 0x1 0x0 /* PB13 periph A */
		1 14 0x1 0x0>; /* PB14 periph A */
		<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */
		AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A */
		AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB14 periph A */
		};

		pinctrl_ssc2_rx: ssc2_rx-0 {
		atmel,pins =
		<1 15 0x1 0x0 /* PB15 periph A */
		1 16 0x1 0x0 /* PB16 periph A */
		1 17 0x1 0x0>; /* PB17 periph A */
		<AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A */
		AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */
		AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */
		};
		};

		twi {
		pinctrl_twi: twi-0 {
		atmel,pins =
		<0 25 0x1 0x2 /* PA25 periph A with multi drive */
		0 26 0x1 0x2>; /* PA26 periph A with multi drive */
		<AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE /* PA25 periph A with multi drive */
		AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE>; /* PA26 periph A with multi drive */
		};

		pinctrl_twi_gpio: twi_gpio-0 {
		atmel,pins =
		<0 25 0x0 0x2 /* PA25 GPIO with multi drive */
		0 26 0x0 0x2>; /* PA26 GPIO with multi drive */
		<AT91_PIOA 25 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PA25 GPIO with multi drive */
		AT91_PIOA 26 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PA26 GPIO with multi drive */
		};
		};

		pioA: gpio@fffff400 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffff400 0x200>;
		interrupts = <2 4 1>;
		interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
		#gpio-cells = <2>;
		gpio-controller;
		interrupt-controller;
		@@ -404,7 +411,7 @@
		pioB: gpio@fffff600 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffff600 0x200>;
		interrupts = <3 4 1>;
		interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
		#gpio-cells = <2>;
		gpio-controller;
		interrupt-controller;
		@@ -414,7 +421,7 @@
		pioC: gpio@fffff800 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffff800 0x200>;
		interrupts = <4 4 1>;
		interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
		#gpio-cells = <2>;
		gpio-controller;
		interrupt-controller;
		@@ -424,7 +431,7 @@
		pioD: gpio@fffffa00 {
		compatible = "atmel,at91rm9200-gpio";
		reg = <0xfffffa00 0x200>;
		interrupts = <5 4 1>;
		interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
		#gpio-cells = <2>;
		gpio-controller;
		interrupt-controller;
		@@ -435,7 +442,7 @@
		dbgu: serial@fffff200 {
		compatible = "atmel,at91rm9200-usart";
		reg = <0xfffff200 0x200>;
		interrupts = <1 4 7>;
		interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_dbgu>;
		status = "disabled";
		@@ -444,7 +451,7 @@
		usart0: serial@fffc0000 {
		compatible = "atmel,at91rm9200-usart";
		reg = <0xfffc0000 0x200>;
		interrupts = <6 4 5>;
		interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
		atmel,use-dma-rx;
		atmel,use-dma-tx;
		pinctrl-names = "default";
		@@ -455,7 +462,7 @@
		usart1: serial@fffc4000 {
		compatible = "atmel,at91rm9200-usart";
		reg = <0xfffc4000 0x200>;
		interrupts = <7 4 5>;
		interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
		atmel,use-dma-rx;
		atmel,use-dma-tx;
		pinctrl-names = "default";
		@@ -466,7 +473,7 @@
		usart2: serial@fffc8000 {
		compatible = "atmel,at91rm9200-usart";
		reg = <0xfffc8000 0x200>;
		interrupts = <8 4 5>;
		interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
		atmel,use-dma-rx;
		atmel,use-dma-tx;
		pinctrl-names = "default";
		@@ -477,7 +484,7 @@
		usart3: serial@fffcc000 {
		compatible = "atmel,at91rm9200-usart";
		reg = <0xfffcc000 0x200>;
		interrupts = <23 4 5>;
		interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
		atmel,use-dma-rx;
		atmel,use-dma-tx;
		pinctrl-names = "default";
		@@ -488,7 +495,7 @@
		usb1: gadget@fffb0000 {
		compatible = "atmel,at91rm9200-udc";
		reg = <0xfffb0000 0x4000>;
		interrupts = <11 4 2>;
		interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
		status = "disabled";
		};
		};
		@@ -503,9 +510,9 @@
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_nand>;
		nand-ecc-mode = "soft";
		gpios = <&pioC 2 0
		gpios = <&pioC 2 GPIO_ACTIVE_HIGH
		0
		&pioB 1 0
		&pioB 1 GPIO_ACTIVE_HIGH
		>;
		status = "disabled";
		};
		@@ -513,15 +520,15 @@
		usb0: ohci@00300000 {
		compatible = "atmel,at91rm9200-ohci", "usb-ohci";
		reg = <0x00300000 0x100000>;
		interrupts = <23 4 2>;
		interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
		status = "disabled";
		};
		};

		i2c@0 {
		compatible = "i2c-gpio";
		gpios = <&pioA 25 0 /* sda */
		&pioA 26 0 /* scl */
		gpios = <&pioA 25 GPIO_ACTIVE_HIGH /* sda */
		&pioA 26 GPIO_ACTIVE_HIGH /* scl */
		>;
		i2c-gpio,sda-open-drain;
		i2c-gpio,scl-open-drain;

arch/arm/boot/dts/at91rm9200ek.dts

+5 −5

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		* Licensed under GPLv2 only
		*/
		/dts-v1/;
		/include/ "at91rm9200.dtsi"
		#include "at91rm9200.dtsi"

		/ {
		model = "Atmel AT91RM9200 evaluation kit";
		@@ -50,7 +50,7 @@
		};

		usb1: gadget@fffb0000 {
		atmel,vbus-gpio = <&pioD 4 0>;
		atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};
		};
		@@ -66,19 +66,19 @@

		ds2 {
		label = "green";
		gpios = <&pioB 0 0x1>;
		gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "mmc0";
		};

		ds4 {
		label = "yellow";
		gpios = <&pioB 1 0x1>;
		gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "heartbeat";
		};

		ds6 {
		label = "red";
		gpios = <&pioB 2 0x1>;
		gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
		};
		};
		};

Admin message