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

Commit 92a2a8cb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-dts-1' of... 

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

Pull "Gemini DTS updates for ARM SoC take one" from Linus Walleij:

* tag 'gemini-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: gemini: add pin control set-up for the SoC
  ARM: dts: Add DTS file for D-Link DIR-685
  ARM: dts: gemini: Switch to using macros
parents e3015684 f328c2ea

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ 
	exynos5440-ssdk5440.dtb \

	exynos5800-peach-pi.dtb

dtb-$(CONFIG_ARCH_GEMINI) += \

	gemini-dlink-dir-685.dtb \

	gemini-nas4220b.dtb \

	gemini-rut1xx.dtb \

	gemini-sq201.dtb \

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

0 → 100644
+246 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for D-Link DIR-685 Xtreme N Storage Router

 */



/dts-v1/;



#include "gemini.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "D-Link DIR-685 Xtreme N Storage Router";

	compatible = "dlink,dir-685", "cortina,gemini";

	#address-cells = <1>;

	#size-cells = <1>;



	memory {

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

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	chosen {

		stdout-path = "uart0:115200n8";

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button-esc {

			debounce_interval = <50>;

			wakeup-source;

			linux,code = <KEY_ESC>;

			label = "reset";

			/* Collides with LPC_LAD[0], UART DCD, SSP 97RST */

			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;

		};

		button-eject {

			debounce_interval = <50>;

			wakeup-source;

			linux,code = <KEY_EJECTCD>;

			label = "unmount";

			/* Collides with LPC LFRAME, UART RTS, SSP TXD */

			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;

		};

	};



	leds {

		compatible = "gpio-leds";

		led-wps {

			label = "dir685:blue:WPS";

			/* Collides with ICE */

			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;

			default-state = "on";

			linux,default-trigger = "heartbeat";

		};

		/*

		 * 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

		 * 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".

		 */

		led-blue-hd {

			label = "dir685:blue:HD";

			/* Collides with LPC_SERIRQ, UART DTR, SSP FSC pins */

			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		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";

		};

	};



	/*

	 * This is a Sunon Maglev GM0502PFV2-8 cooling fan @10000 RPM.

	 * Since the platform has no temperature sensor, this is controlled

	 * from userspace by using the hard disks S.M.A.R.T. temperature

	 * sensor. It is turned on when the temperature exceeds 46 degrees

	 * and turned off when the temperatures goes below 41 degrees

	 * (celsius).

	 */

	gpio-fan {

		compatible = "gpio-fan";

		/* Collides with IDE */

		gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

		gpio-fan,speed-map = <0 0>, <10000 1>;

		#cooling-cells = <2>;

	};



	/*

	 * The touchpad input is connected to a GPIO bit-banged

	 * I2C bus.

	 */

	gpio-i2c {

		compatible = "i2c-gpio";

		/* Collides with ICE */

		gpios = <&gpio0 5 0>, /* SDA */

			<&gpio0 6 0>; /* SCL */

		#address-cells = <1>;

		#size-cells = <0>;



		touchkeys@26 {

			compatible = "dlink,dir685-touchkeys";

			reg = <0x26>;

			interrupt-parent = <&gpio0>;

			/* Collides with NAND flash */

			interrupts = <17 IRQ_TYPE_EDGE_FALLING>;

		};

	};



	soc {

		flash@30000000 {

			status = "okay";

			/* 32MB of flash */

			reg = <0x30000000 0x02000000>;



			/*

			 * This "RedBoot" is the Storlink derivative.

			 */

			partition@0 {

				label = "RedBoot";

				reg = <0x00000000 0x00040000>;

				read-only;

			};

			/*

			 * Between the boot loader and the rootfs is the kernel

			 * in a custom Storlink format flashed from the boot

			 * menu. The rootfs is in squashfs format.

			 */

			partition@1800c0 {

				label = "rootfs";

				reg = <0x001800c0 0x01dbff40>;

				read-only;

			};

			partition@1f40000 {

				label = "upgrade";

				reg = <0x01f40000 0x00040000>;

				read-only;

			};

			partition@1f80000 {

				label = "rgdb";

				reg = <0x01f80000 0x00040000>;

				read-only;

			};

			/*

			 * This partition contains MAC addresses for WAN,

			 * WLAN and LAN, and the country code (for wireless

			 * I guess).

			 */

			partition@1fc0000 {

				label = "nvram";

				reg = <0x01fc0000 0x00020000>;

				read-only;

			};

			partition@1fe0000 {

				label = "LangPack";

				reg = <0x01fe0000 0x00020000>;

				read-only;

			};

		};



		syscon: syscon@40000000 {

			pinctrl {

				/*

				 * gpio0bgrp cover line 5, 6 used by TK I2C

				 * gpio0bgrp cover line 7 used by WPS LED

				 * gpio0cgrp cover line 8, 13 used by keys

				 *           and 11, 12 used by the HD LEDs

				 * gpio0egrp cover line 16 used by VDISP

				 * gpio0fgrp cover line 17 used by TK IRQ

				 * gpio0ggrp cover line 20 used by panel CS

				 * gpio0hgrp cover line 21,22 used by RTL8366RB

				 */

				gpio0_default_pins: pinctrl-gpio0 {

					mux {

						function = "gpio0";

						groups = "gpio0bgrp",

						"gpio0cgrp",

						"gpio0egrp",

						"gpio0fgrp",

						"gpio0ggrp",

						"gpio0hgrp";

					};

				};

				/*

				 * gpio1bgrp cover line 5,8,7 used by panel SPI

				 * also line 6 used by the fan

				 *

				 */

				gpio1_default_pins: pinctrl-gpio1 {

					mux {

						function = "gpio1";

						groups = "gpio1bgrp";

					};

				};

			};

		};



		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		gpio0: gpio@4d000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio0_default_pins>;

		};



		gpio1: gpio@4e000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio1_default_pins>;

		};



		pci@50000000 {

			status = "okay";

			interrupt-map-mask = <0xf800 0 0 7>;

			interrupt-map =

				<0x4800 0 0 1 &pci_intc 0>, /* Slot 9 */

				<0x4800 0 0 2 &pci_intc 1>,

				<0x4800 0 0 3 &pci_intc 2>,

				<0x4800 0 0 4 &pci_intc 3>,

				<0x5000 0 0 1 &pci_intc 1>, /* Slot 10 */

				<0x5000 0 0 2 &pci_intc 2>,

				<0x5000 0 0 3 &pci_intc 3>,

				<0x5000 0 0 4 &pci_intc 0>,

				<0x5800 0 0 1 &pci_intc 2>, /* Slot 11 */

				<0x5800 0 0 2 &pci_intc 3>,

				<0x5800 0 0 3 &pci_intc 0>,

				<0x5800 0 0 4 &pci_intc 1>,

				<0x6000 0 0 1 &pci_intc 3>, /* Slot 12 */

				<0x6000 0 0 2 &pci_intc 0>,

				<0x6000 0 0 3 &pci_intc 1>,

				<0x6000 0 0 4 &pci_intc 2>;

		};



		ata@63000000 {

			status = "okay";

		};

	};

};

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

+24 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Backup button";

			/* Conflict with TVC */

			gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;

		};

		button@31 {
@@ -40,6 +41,7 @@ 
			wakeup-source;

			linux,code = <KEY_RESTART>;

			label = "Softreset button";

			/* Conflict with TVC */

			gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

		};

	};
@@ -48,11 +50,13 @@ 
		compatible = "gpio-leds";

		led@28 {

			label = "nas4220b:orange:hdd";

			/* Conflict with TVC */

			gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

		led@30 {

			label = "nas4220b:green:os";

			/* Conflict with TVC */

			gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;

			default-state = "on";

			linux,default-trigger = "heartbeat";
@@ -99,12 +103,32 @@ 
			};

		};



		syscon: syscon@40000000 {

			pinctrl {

				/*

				 * gpio1dgrp cover line 28-31 otherwise used

				 * by TVC.

				 */

				gpio1_default_pins: pinctrl-gpio1 {

					mux {

						function = "gpio1";

						groups = "gpio1dgrp";

					};

				};

			};

		};



		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		gpio1: gpio@4e000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio1_default_pins>;

		};



		ata@63000000 {

			status = "okay";

		};

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

+39 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "Reset to defaults";

			/* Conflict with TVC */

			gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;

		};

	};
@@ -42,12 +43,14 @@ 
		led@7 {

			/* FIXME: add the LED color */

			label = "rut1xx::gsm";

			/* Conflict with ICE */

			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;

			default-state = "on";

		};

		led@31 {

			/* FIXME: add the LED color */

			label = "rut1xx::power";

			/* Conflict with NAND CE0 */

			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "heartbeat";
@@ -61,5 +64,41 @@ 
			reg = <0x30000000 0x00800000>;

			/* TODO: add flash partitions here */

		};



		syscon: syscon@40000000 {

			pinctrl {

				/*

				 * gpio0bgrp cover line 7 used by GSM LED

				 * gpio0fgrp cover line 17 used by power LED

				 */

				gpio0_default_pins: pinctrl-gpio0 {

					mux {

						function = "gpio0";

						groups = "gpio0bgrp",

						"gpio0fgrp";

					};

				};

				/*

				 * gpio1dgrp cover line 28-31 otherwise used

				 * by TVC.

				 */

				gpio1_default_pins: pinctrl-gpio1 {

					mux {

						function = "gpio1";

						groups = "gpio1dgrp";

					};

				};

			};

		};



		gpio0: gpio@4d000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio0_default_pins>;

		};



		gpio1: gpio@4e000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio1_default_pins>;

		};

	};

};

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

+35 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
			wakeup-source;

			linux,code = <KEY_SETUP>;

			label = "factory reset";

			/* Conflict with NAND flash */

			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;

		};

	};
@@ -41,12 +42,14 @@ 
		compatible = "gpio-leds";

		led@20 {

			label = "sq201:green:info";

			/* Conflict with parallel flash */

			gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;

			default-state = "on";

			linux,default-trigger = "heartbeat";

		};

		led@31 {

			label = "sq201:green:usb";

			/* Conflict with parallel and NAND flash */

			gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			linux,default-trigger = "usb-host";
@@ -55,7 +58,15 @@ 


	soc {

		flash@30000000 {

			status = "okay";

			/*

			 * Flash access can be enabled, with the side effect

			 * of disabling access to GPIO LED on GPIO0[20] which

			 * reuse one of the parallel flash chip select lines.

			 * Also the default firmware on the machine has the

			 * problem that since it uses the flash, the two LEDS

			 * on the right become numb.

			 */

			/* status = "okay"; */

			/* 16MB of flash */

			reg = <0x30000000 0x01000000>;
@@ -93,12 +104,35 @@ 
			};

		};



		syscon: syscon@40000000 {

			pinctrl {

				/*

				 * gpio0fgrp cover line 18 used by reset button

				 * gpio0ggrp cover line 20 used by info LED

				 * gpio0kgrp cover line 31 used by USB LED

				 */

				gpio0_default_pins: pinctrl-gpio0 {

					mux {

						function = "gpio0";

						groups = "gpio0fgrp",

						"gpio0ggrp",

						"gpio0kgrp";

					};

				};

			};

		};



		sata: sata@46000000 {

			cortina,gemini-ata-muxmode = <0>;

			cortina,gemini-enable-sata-bridge;

			status = "okay";

		};



		gpio0: gpio@4d000000 {

			pinctrl-names = "default";

			pinctrl-0 = <&gpio0_default_pins>;

		};



		pci@50000000 {

			status = "okay";

			interrupt-map-mask = <0xf800 0 0 7>;