ARM: at91: dt: switch to standard GPIO flag defines. (92f8629b) · Commits · e / devices / android_kernel_fairphone_FP5

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@
	};		};

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

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

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

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

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

+8 −8

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

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

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

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

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

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

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

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

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

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

+2 −2

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

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

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

+5 −4

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

	#include "skeleton.dtsi"		#include "skeleton.dtsi"
			#include <dt-bindings/gpio/gpio.h>

	/ {		/ {
	model = "Atmel AT91RM9200 family SoC";		model = "Atmel AT91RM9200 family SoC";
	@@ -503,9 +504,9 @@
	pinctrl-names = "default";		pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_nand>;		pinctrl-0 = <&pinctrl_nand>;
	nand-ecc-mode = "soft";		nand-ecc-mode = "soft";
	gpios = <&pioC 2 0		gpios = <&pioC 2 GPIO_ACTIVE_HIGH
	0		0
	&pioB 1 0		&pioB 1 GPIO_ACTIVE_HIGH
	>;		>;
	status = "disabled";		status = "disabled";
	};		};
	@@ -520,8 +521,8 @@

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@
	};		};

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

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

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

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