Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11040c16 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gemini-dts-arm-soc' of... 

Merge tag 'gemini-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

DTS updates for the Gemini:
- Set righ flashes on DNS-313
- Activate ATA1 on NAS4220B
- Set right harddisk triggers on the D-Link devices
- Fix all DTC warnings

* tag 'gemini-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: dts: Fix DTC warnings
  ARM: dts: Add second ATA to NAS4220B
  ARM: dts: Fix bootargs for Gemini D-Link devices
  ARM: dts: Fix the DNS-313 flash compatible
  ARM: dts: Set DNS-685 LEDs to use better triggers
  ARM: dtd: Set DNS-313 LEDs to use better triggers
  ARM: dts: gemini: Fix "debounce-interval" property misspelling

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 37eee103 e7c88159

arch/arm/boot/dts/gemini-dlink-dir-685.dts

+9 −7
Original line number Diff line number Diff line
@@ -13,22 +13,22 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	memory {

	memory@0 {

		/* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	chosen {

		stdout-path = "uart0:115200n8";

		bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";

		stdout-path = "uart0:19200n8";

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button-esc {

			debounce_interval = <50>;

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_ESC>;

			label = "reset";
@@ -36,7 +36,7 @@ 
			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;

		};

		button-eject {

			debounce_interval = <50>;

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_EJECTCD>;

			label = "unmount";
@@ -98,7 +98,7 @@ 
		/*

		 * These two LEDs are on the side of the device.

		 * For electrical reasons, both LEDs cannot be active

		 * at the same time so only blue or orange can on at

		 * at the same time so only blue or orange can be on at

		 * one time. Enabling both makes the LED go dark.

		 * The LEDs both sit inside the unmount button and the

		 * label on the case says "unmount".
@@ -108,12 +108,14 @@ 
			/* Collides with LPC_SERIRQ, UART DTR, SSP FSC pins */

			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "disk-read";

		};

		led-orange-hd {

			label = "dir685:orange:HD";

			/* Collides with LPC_LAD[2], UART DSR, SSP ECLK pins */

			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "disk-write";

		};

	};

arch/arm/boot/dts/gemini-dlink-dns-313.dts

+11 −8
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	memory {

	memory@0 {

		/* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */

		device_type = "memory";

		reg = <0x00000000 0x4000000>;
@@ -26,15 +26,15 @@ 
	};



	chosen {

		bootargs = "console=ttyS0,19200n8 root=/dev/sda4 rw rootwait";

		stdout-path = "uart0:19200n8";

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button-esc {

			debounce_interval = <50>;

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_ESC>;

			label = "reset";
@@ -59,14 +59,13 @@ 
			label = "dns313:green:disk";

			gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "ide-disk";

			/* Ideally should activate while reading */

			linux,default-trigger = "disk-read";

		};

		led-disk-red {

			label = "dns313:red:disk";

			gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			/* Ideally should activate while writing */

			linux,default-trigger = "disk-write";

		};

	};
@@ -158,8 +157,12 @@ 


	soc {

		flash@30000000 {

			/*

			 * This is a Eon EN29LV400AB 512 KiB flash with

			 * three partitions.

			 */

			compatible = "cortina,gemini-flash", "jedec-flash";

			status = "okay";

			/* 512KB of flash */

			reg = <0x30000000 0x00080000>;



			/*

arch/arm/boot/dts/gemini-nas4220b.dts

+11 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	memory { /* 128 MB */

	memory@0 { /* 128 MB */

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};
@@ -26,19 +26,17 @@ 


	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@29 {

			debounce_interval = <50>;

		button-setup {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Backup button";

			/* Conflict with TVC */

			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;

		};

		button@31 {

			debounce_interval = <50>;

		button-restart {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_RESTART>;

			label = "Softreset button";
@@ -49,13 +47,13 @@ 


	leds {

		compatible = "gpio-leds";

		led@28 {

		led-orange-hdd {

			label = "nas4220b:orange:hdd";

			/* Conflict with TVC */

			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

		led@30 {

		led-green-os {

			label = "nas4220b:green:os";

			/* Conflict with TVC */

			gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
@@ -202,5 +200,9 @@ 
		ata@63000000 {

			status = "okay";

		};



		ata@63400000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/gemini-rut1xx.dts

+5 −7
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	memory { /* 128 MB */

	memory@0 { /* 128 MB */

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};
@@ -26,11 +26,9 @@ 


	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@28 {

			debounce_interval = <50>;

		button-setup {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Reset to defaults";
@@ -41,14 +39,14 @@ 


	leds {

		compatible = "gpio-leds";

		led@7 {

		led-gsm {

			/* FIXME: add the LED color */

			label = "rut1xx::gsm";

			/* Conflict with ICE */

			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

		led@31 {

		led-power {

			/* FIXME: add the LED color */

			label = "rut1xx::power";

			/* Conflict with NAND CE0 */

arch/arm/boot/dts/gemini-sq201.dts

+5 −7
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	memory { /* 128 MB */

	memory@0 { /* 128 MB */

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};
@@ -26,11 +26,9 @@ 


	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@18 {

			debounce_interval = <50>;

		button-setup {

			debounce-interval = <50>;

			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "factory reset";
@@ -41,14 +39,14 @@ 


	leds {

		compatible = "gpio-leds";

		led@20 {

		led-green-info {

			label = "sq201:green:info";

			/* Conflict with parallel flash */

			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;

			default-state = "on";

			linux,default-trigger = "heartbeat";

		};

		led@31 {

		led-green-usb {

			label = "sq201:green:usb";

			/* Conflict with parallel and NAND flash */

			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;