Commit 0d5c2e21 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/boards 

From Jason Cooper:
orion boards for v3.8

 - mach-orion5x/ joins the dark side! (devicetree)
 - Lacie Network Space family
 - Lacie Ethernet Disk mini v2
 - USI TopKick
 - ZyXEL NSA310
 - MPL CEC4
 - Plat'Home OpenBlocks A6 (kirkwood, AX3-4 is armada xp)

* tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
  ARM: Dove: update defconfig
  ARM: Kirkwood: update defconfig for new boards
  arm: orion5x: add DT related options in defconfig
  arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
  arm: orion5x: basic Device Tree support
  arm: orion5x: mechanical defconfig update
  ARM: kirkwood: Add support for the MPL CEC4
  arm: kirkwood: add support for ZyXEL NSA310
  ARM: Kirkwood: new board USI Topkick
  ARM: kirkwood: use gpio-fan DT binding on lsxl
  ARM: Kirkwood: add Netspace boards to defconfig
  ARM: kirkwood: DT board setup for Network Space Mini v2
  ARM: kirkwood: DT board setup for Network Space Lite v2
  ARM: kirkwood: DT board setup for Network Space v2 and parents
  leds: leds-ns2: add device tree binding
  ARM: Kirkwood: Enable the second I2C bus
parents 48b71e3a f17073a3

Documentation/devicetree/bindings/gpio/leds-ns2.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Binding for dual-GPIO LED found on Network Space v2 (and parents).



Required properties:

- compatible: "lacie,ns2-leds".



Each LED is represented as a sub-node of the ns2-leds device.



Required sub-node properties:

- cmd-gpio: Command LED GPIO. See OF device-tree GPIO specification.

- slow-gpio: Slow LED GPIO. See OF device-tree GPIO specification.



Optional sub-node properties:

- label: Name for this LED. If omitted, the label is taken from the node name.

- linux,default-trigger: Trigger assigned to the LED.



Example:



ns2-leds {

	compatible = "lacie,ns2-leds";



	blue-sata {

		label = "ns2:blue:sata";

		slow-gpio = <&gpio0 29 0>;

		cmd-gpio = <&gpio0 30 0>;

	};

};

arch/arm/boot/dts/Makefile

+11 −1
Original line number Diff line number Diff line
@@ -36,11 +36,20 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-ib62x0.dtb \

	kirkwood-iconnect.dtb \

	kirkwood-iomega_ix2_200.dtb \

	kirkwood-is2.dtb \

	kirkwood-km_kirkwood.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2lite.dtb \

	kirkwood-ns2max.dtb \

	kirkwood-ns2mini.dtb \

	kirkwood-nsa310.dtb \

	kirkwood-topkick.dtb \

	kirkwood-ts219-6281.dtb \

	kirkwood-ts219-6282.dtb

	kirkwood-ts219-6282.dtb \

	kirkwood-openblocks_a6.dtb

dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

	msm8960-cdp.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
@@ -73,6 +82,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap5-evm.dtb \

	am335x-evm.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

arch/arm/boot/dts/kirkwood-is2.dts

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood-ns2-common.dtsi"



/ {

	model = "LaCie Internet Space v2";

	compatible = "lacie,inetspace_v2", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	ocp@f1000000 {

		sata@80000 {

			status = "okay";

			nr-ports = <1>;

		};

	};



	ns2-leds {

		compatible = "lacie,ns2-leds";



		blue-sata {

			label = "ns2:blue:sata";

			slow-gpio = <&gpio0 29 0>;

			cmd-gpio = <&gpio0 30 0>;

		};

	};

};

arch/arm/boot/dts/kirkwood-lsxl.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -94,4 +94,15 @@ 
			gpios = <&gpio1 16 1>;

		};

	};



	gpio_fan {

		compatible = "gpio-fan";

		gpios = <&gpio0 19 1

		         &gpio0 18 1>;

		gpio-fan,speed-map = <0    3

		                      1500 2

		                      3250 1

		                      5000 0>;

		alarm-gpios = <&gpio1 8 0>;

	};

};

arch/arm/boot/dts/kirkwood-mplcec4.dts

0 → 100644
+119 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"



/ {

	model = "MPL CEC4";

	compatible = "mpl,cec4-10", "mpl,cec4", "marvell,kirkwood-88f6281", "marvell,kirkwood";



        memory {

                device_type = "memory";

                reg = <0x00000000 0x20000000>;

        };



        chosen {

                bootargs = "console=ttyS0,115200n8 earlyprintk";

        };



	ocp@f1000000 {

                i2c@11000 {

                        status = "okay";



			rtc@51 {

				compatible = "nxp,pcf8563";

				reg = <0x51>;

			};



			eeprom@57 {

				compatible = "atmel,24c02";

				reg = <0x57>;

			};



                };



                serial@12000 {

                        clock-frequency = <200000000>;

                        status = "ok";

                };



                nand@3000000 {

                        status = "okay";



                        partition@0 {

                                label = "uboot";

                                reg = <0x0000000 0x100000>;

                        };



                        partition@100000 {

                                label = "env";

                                reg = <0x100000 0x80000>;

                        };



                        partition@180000 {

                                label = "fdt";

                                reg = <0x180000 0x80000>;

                        };



                        partition@200000 {

                                label = "kernel";

                                reg = <0x200000 0x400000>;

                        };



                        partition@600000 {

                                label = "rootfs";

                                reg = <0x600000 0x1fa00000>;

                        };

                };



		rtc@10300 {

			status = "disabled";

		};



		sata@80000 {

			nr-ports = <2>;

			status = "okay";



		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		health {

			label = "status:green:health";

			gpios = <&gpio0 7 1>;

		};



		user1o {

			label = "user1:orange";

			gpios = <&gpio1 8 1>;

			default-state = "on";

		};



		user1g {

			label = "user1:green";

			gpios = <&gpio1 9 1>;

			default-state = "on";

		};



		user0o {

			label = "user0:orange";

			gpios = <&gpio1 12 1>;

			default-state = "on";

		};



		user0g {

			label = "user0:green";

			gpios = <&gpio1 13 1>;

			default-state = "on";

		};



		misc {

			label = "status:orange:misc";

			gpios = <&gpio1 14 1>;

			default-state = "on";

		};



	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE