Commit 392f9195 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Jason Cooper:
mvebu boards for v3.10

 - kirkwood
    - Netgear ReadyNAS Duo v2
    - add guruplug dt to defconfig
    - Lacie Cloudbox

* tag 'boards-3.10' of git://git.infradead.org/users/jcooper/linux

:
  ARM: Kirkwood: update Network Space Mini v2 description
  ARM: Kirkwood: DT board setup for CloudBox
  ARM: Kirkwood: sort board entries by ASCII-code order
  ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig
  ARM: kirkwood: Add support for NETGEAR ReadyNAS Duo v2 using DT

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e1b1655a d3dde4df

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ 
dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \

	integratorcp.dtb

dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \

dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \

	kirkwood-dns320.dtb \

	kirkwood-dns325.dtb \

	kirkwood-dockstar.dtb \

	kirkwood-dreamplug.dtb \
@@ -65,6 +66,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-lschlv2.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

	kirkwood-ns2.dtb \

	kirkwood-ns2lite.dtb \

	kirkwood-ns2max.dtb \

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

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



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "LaCie CloudBox";

	compatible = "lacie,cloudbox", "marvell,kirkwood-88f6702", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8";

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {

			pinctrl-0 = < &pmx_spi &pmx_uart0

					&pmx_cloudbox_sata0 >;

			pinctrl-names = "default";



			pmx_cloudbox_sata0: pmx-cloudbox-sata0 {

				marvell,pins = "mpp15";

				marvell,function = "sata0";

			};

		};



		serial@12000 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		sata@80000 {

			status = "okay";

			nr-ports = <1>;

		};



		spi@10600 {

			status = "okay";



			flash@0 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "mx25l4005a";

				reg = <0>;

				spi-max-frequency = <20000000>;

				mode = <0>;



				partition@0 {

					reg = <0x0 0x80000>;

					label = "u-boot";

				};

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;



		button@1 {

			label = "Power push button";

			linux,code = <116>;

			gpios = <&gpio0 16 1>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		red-fail {

			label = "cloudbox:red:fail";

			gpios = <&gpio0 14 0>;

		};

		blue-sata {

			label = "cloudbox:blue:sata";

			gpios = <&gpio0 15 0>;

		};

	};



	gpio_poweroff {

		compatible = "gpio-poweroff";

		gpios = <&gpio0 17 0>;

	};

};

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

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



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6282.dtsi"



/ {

	model = "NETGEAR ReadyNAS Duo v2";

	compatible = "netgear,readynas-duo-v2", "netgear,readynas", "marvell,kirkwood-88f6282", "marvell,kirkwood";



	memory { /* 256 MB */

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

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

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {



			pinctrl-0 = < &pmx_uart0

				      &pmx_button_power

				      &pmx_button_backup

				      &pmx_button_reset

				      &pmx_led_blue_power

				      &pmx_led_blue_activity

				      &pmx_led_blue_disk1

				      &pmx_led_blue_disk2

				      &pmx_led_blue_backup >;

			pinctrl-names = "default";



			pmx_button_power: pmx-button-power {

				marvell,pins = "mpp47";

				marvell,function = "gpio";

			};

			pmx_button_backup: pmx-button-backup {

				marvell,pins = "mpp45";

				marvell,function = "gpio";

			};

			pmx_button_reset: pmx-button-reset {

				marvell,pins = "mpp13";

				marvell,function = "gpio";

			};

			pmx_led_blue_power: pmx-led-blue-power {

				marvell,pins = "mpp31";

				marvell,function = "gpio";

			};

			pmx_led_blue_activity: pmx-led-blue-activity {

				marvell,pins = "mpp38";

				marvell,function = "gpio";

			};

			pmx_led_blue_disk1: pmx-led-blue-disk1 {

				marvell,pins = "mpp23";

				marvell,function = "gpio";

			};

			pmx_led_blue_disk2: pmx-led-blue-disk2 {

				marvell,pins = "mpp22";

				marvell,function = "gpio";

			};

			pmx_led_blue_backup: pmx-led-blue-backup {

				marvell,pins = "mpp29";

				marvell,function = "gpio";

			};

		};



		i2c@11000 {

			status = "okay";



			rs5c372a: rs5c372a@32 {

				compatible = "ricoh,rs5c372a";

				reg = <0x32>;

			};

		};



		serial@12000 {

			status = "okay";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x180000>;

				read-only;

			};



			partition@180000 {

				label = "u-boot-env";

				reg = <0x180000 0x20000>;

			};



			partition@200000 {

				label = "uImage";

				reg = <0x0200000 0x600000>;

			};



			partition@800000 {

				label = "minirootfs";

				reg = <0x0800000 0x1000000>;

			};



			partition@1800000 {

				label = "jffs2";

				reg = <0x1800000 0x6800000>;

			};

		};



		sata@80000 {

			status = "okay";

			nr-ports = <2>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		power_led {

			label = "status:blue:power_led";

			gpios = <&gpio0 31 1>;   /* GPIO 31 Active Low */

			linux,default-trigger = "default-on";

		};

		activity_led {

			label = "status:blue:activity_led";

			gpios = <&gpio1 6 1>;    /* GPIO 38 Active Low */

		};

		disk1_led {

			label = "status:blue:disk1_led";

			gpios = <&gpio0 23 1>;   /* GPIO 23 Active Low */

		};

		disk2_led {

			label = "status:blue:disk2_led";

			gpios = <&gpio0 22 1>;   /* GPIO 22 Active Low */

		};

		backup_led {

			label = "status:blue:backup_led";

			gpios = <&gpio0 29 1>;   /* GPIO 29 Active Low*/

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "Power Button";

			linux,code = <116>;     /* KEY_POWER */

			gpios = <&gpio1 15 1>;

		};

		button@2 {

			label = "Reset Button";

			linux,code = <0x198>;   /* KEY_RESTART */

			gpios = <&gpio0 13 1>;

		};

		button@3 {

			label = "Backup Button";

			linux,code = <133>;     /* KEY_COPY */

			gpios = <&gpio1 13 1>;

		};

	};



        regulators {

                compatible = "simple-bus";

                #address-cells = <1>;

                #size-cells = <0>;



                usb_power: regulator@1 {

                        compatible = "regulator-fixed";

                        reg = <1>;

                        regulator-name = "USB 3.0 Power";

                        regulator-min-microvolt = <5000000>;

                        regulator-max-microvolt = <5000000>;

                        enable-active-high;

                        regulator-always-on;

                        regulator-boot-on;

                        gpio = <&gpio1 14 0>;

                };

        };

};

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

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
/include/ "kirkwood-ns2-common.dtsi"



/ {

	/* This machine is embedded in the first LaCie CloudBox product. */

	model = "LaCie Network Space Mini v2";

	compatible = "lacie,netspace_mini_v2", "marvell,kirkwood-88f6192", "marvell,kirkwood";

arch/arm/configs/kirkwood_defconfig

+28 −25
Original line number Diff line number Diff line
@@ -10,45 +10,48 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_KIRKWOOD=y

CONFIG_MACH_D2NET_V2=y

CONFIG_MACH_DB88F6281_BP=y

CONFIG_MACH_DOCKSTAR=y

CONFIG_MACH_ESATA_SHEEVAPLUG=y

CONFIG_MACH_GURUPLUG=y

CONFIG_MACH_INETSPACE_V2=y

CONFIG_MACH_MV88F6281GTW_GE=y

CONFIG_MACH_NET2BIG_V2=y

CONFIG_MACH_NET5BIG_V2=y

CONFIG_MACH_NETSPACE_MAX_V2=y

CONFIG_MACH_NETSPACE_V2=y

CONFIG_MACH_OPENRD_BASE=y

CONFIG_MACH_OPENRD_CLIENT=y

CONFIG_MACH_OPENRD_ULTIMATE=y

CONFIG_MACH_RD88F6192_NAS=y

CONFIG_MACH_RD88F6281=y

CONFIG_MACH_MV88F6281GTW_GE=y

CONFIG_MACH_SHEEVAPLUG=y

CONFIG_MACH_ESATA_SHEEVAPLUG=y

CONFIG_MACH_GURUPLUG=y

CONFIG_MACH_DREAMPLUG_DT=y

CONFIG_MACH_ICONNECT_DT=y

CONFIG_MACH_T5325=y

CONFIG_MACH_TS219=y

CONFIG_MACH_TS41X=y

CONFIG_MACH_CLOUDBOX_DT=y

CONFIG_MACH_DLINK_KIRKWOOD_DT=y

CONFIG_MACH_IB62X0_DT=y

CONFIG_MACH_TS219_DT=y

CONFIG_MACH_DOCKSTAR_DT=y

CONFIG_MACH_DREAMPLUG_DT=y

CONFIG_MACH_GOFLEXNET_DT=y

CONFIG_MACH_LSXL_DT=y

CONFIG_MACH_GURUPLUG_DT=y

CONFIG_MACH_IB62X0_DT=y

CONFIG_MACH_ICONNECT_DT=y

CONFIG_MACH_INETSPACE_V2_DT=y

CONFIG_MACH_IOMEGA_IX2_200_DT=y

CONFIG_MACH_KM_KIRKWOOD_DT=y

CONFIG_MACH_INETSPACE_V2_DT=y

CONFIG_MACH_LSXL_DT=y

CONFIG_MACH_MPLCEC4_DT=y

CONFIG_MACH_NETSPACE_V2_DT=y

CONFIG_MACH_NETSPACE_MAX_V2_DT=y

CONFIG_MACH_NETSPACE_LITE_V2_DT=y

CONFIG_MACH_NETSPACE_MAX_V2_DT=y

CONFIG_MACH_NETSPACE_MINI_V2_DT=y

CONFIG_MACH_NETSPACE_V2_DT=y

CONFIG_MACH_NSA310_DT=y

CONFIG_MACH_OPENBLOCKS_A6_DT=y

CONFIG_MACH_READYNAS_DT=y

CONFIG_MACH_TOPKICK_DT=y

CONFIG_MACH_TS219=y

CONFIG_MACH_TS41X=y

CONFIG_MACH_DOCKSTAR=y

CONFIG_MACH_OPENRD_BASE=y

CONFIG_MACH_OPENRD_CLIENT=y

CONFIG_MACH_OPENRD_ULTIMATE=y

CONFIG_MACH_NETSPACE_V2=y

CONFIG_MACH_INETSPACE_V2=y

CONFIG_MACH_NETSPACE_MAX_V2=y

CONFIG_MACH_D2NET_V2=y

CONFIG_MACH_NET2BIG_V2=y

CONFIG_MACH_NET5BIG_V2=y

CONFIG_MACH_T5325=y

CONFIG_MACH_NSA310_DT=y

CONFIG_MACH_TS219_DT=y

# CONFIG_CPU_FEROCEON_OLD_ID is not set

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE