Merge tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu into next/dt (c69bb7bd) · Commits · e / devices / android_kernel_samsung_universal8895

arch/arm/boot/dts/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
		kirkwood-mplcec4.dtb \
		kirkwood-mv88f6281gtw-ge.dtb \
		kirkwood-netgear_readynas_duo_v2.dtb \
		kirkwood-netgear_readynas_nv+_v2.dtb \
		kirkwood-ns2.dtb \
		kirkwood-ns2lite.dtb \
		kirkwood-ns2max.dtb \
		@@ -114,6 +115,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
		armada-xp-axpwifiap.dtb \
		armada-xp-db.dtb \
		armada-xp-gp.dtb \
		armada-xp-netgear-rn2120.dtb \
		armada-xp-matrix.dtb \
		armada-xp-openblocks-ax3-4.dtb
		dtb-$(CONFIG_ARCH_MXC) += \

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+49 −33

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@

		/dts-v1/;

		#include <dt-bindings/input/input.h>
		#include <dt-bindings/gpio/gpio.h>
		#include "armada-370.dtsi"

		/ {
		@@ -62,6 +64,7 @@
		marvell,pins = "mpp57";
		marvell,function = "gpio";
		};

		sata1_led_pin: sata1-led-pin {
		marvell,pins = "mpp15";
		marvell,function = "gpio";
		@@ -77,6 +80,21 @@
		marvell,function = "gpio";
		};

		backup_button_pin: backup-button-pin {
		marvell,pins = "mpp58";
		marvell,function = "gpio";
		};

		power_button_pin: power-button-pin {
		marvell,pins = "mpp62";
		marvell,function = "gpio";
		};

		reset_button_pin: reset-button-pin {
		marvell,pins = "mpp6";
		marvell,function = "gpio";
		};

		poweroff: poweroff {
		marvell,pins = "mpp8";
		marvell,function = "gpio";
		@@ -84,7 +102,7 @@
		};

		mdio {
		phy0: ethernet-phy@0 {
		phy0: ethernet-phy@0 { /* Marvell 88E1318 */
		reg = <0>;
		};
		};
		@@ -117,17 +135,14 @@
		};

		clocks {
		#address-cells = <1>;
		#size-cells = <0>;

		g762_clk: fixedclk {
		g762_clk: g762-oscillator {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <8192>;
		};
		};

		gpio_leds {
		gpio-leds {
		compatible = "gpio-leds";
		pinctrl-0 = <&power_led_pin
		&sata1_led_pin
		@@ -135,60 +150,61 @@
		&backup_led_pin>;
		pinctrl-names = "default";

		blue_power_led {
		blue-power-led {
		label = "rn102:blue:pwr";
		gpios = <&gpio1 25 1>; /* GPIO 57 Active Low */
		gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
		default-state = "keep";
		};

		green_sata1_led {
		green-sata1-led {
		label = "rn102:green:sata1";
		gpios = <&gpio0 15 1>; /* GPIO 15 Active Low */
		gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
		default-state = "on";
		};

		green_sata2_led {
		green-sata2-led {
		label = "rn102:green:sata2";
		gpios = <&gpio0 14 1>; /* GPIO 14 Active Low */
		gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
		default-state = "on";
		};

		green_backup_led {
		green-backup-led {
		label = "rn102:green:backup";
		gpios = <&gpio1 24 1>; /* GPIO 56 Active Low */
		gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
		default-state = "on";
		};
		};

		gpio_keys {
		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		pinctrl-0 = <&power_button_pin
		&reset_button_pin
		&backup_button_pin>;
		pinctrl-names = "default";

		button@1 {
		power-button {
		label = "Power Button";
		linux,code = <116>; /* KEY_POWER */
		gpios = <&gpio1 30 0>;
		linux,code = <KEY_POWER>;
		gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
		};

		button@2 {
		reset-button {
		label = "Reset Button";
		linux,code = <0x198>; /* KEY_RESTART */
		gpios = <&gpio0 6 1>;
		linux,code = <KEY_RESTART>;
		gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
		};

		button@3 {
		backup-button {
		label = "Backup Button";
		linux,code = <133>; /* KEY_COPY */
		gpios = <&gpio1 26 1>;
		linux,code = <KEY_COPY>;
		gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
		};
		};

		gpio_poweroff {
		gpio-poweroff {
		compatible = "gpio-poweroff";
		pinctrl-0 = <&poweroff>;
		pinctrl-names = "default";
		gpios = <&gpio0 8 1>;
		gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
		};

		};

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+32 −36

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@

		/dts-v1/;

		#include "armada-370.dtsi"
		#include <dt-bindings/input/input.h>
		#include <dt-bindings/gpio/gpio.h>
		#include "armada-370.dtsi"

		/ {
		model = "NETGEAR ReadyNAS 104";
		@@ -59,12 +60,12 @@
		marvell,function = "gpio";
		};

		backup_key_pin: backup-key-pin {
		backup_button_pin: backup-button-pin {
		marvell,pins = "mpp52";
		marvell,function = "gpio";
		};

		power_key_pin: power-key-pin {
		power_button_pin: power-button-pin {
		marvell,pins = "mpp62";
		marvell,function = "gpio";
		};
		@@ -79,18 +80,18 @@
		marvell,function = "gpio";
		};

		reset_key_pin: reset-key-pin {
		reset_button_pin: reset-button-pin {
		marvell,pins = "mpp65";
		marvell,function = "gpio";
		};
		};

		mdio {
		phy0: ethernet-phy@0 {
		phy0: ethernet-phy@0 { /* Marvell 88E1318 */
		reg = <0>;
		};

		phy1: ethernet-phy@1 {
		phy1: ethernet-phy@1 { /* Marvell 88E1318 */
		reg = <1>;
		};
		};
		@@ -136,90 +137,85 @@
		};

		clocks {
		#address-cells = <1>;
		#size-cells = <0>;

		g762_clk: fixedclk {
		g762_clk: g762-oscillator {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <8192>;
		};
		};

		gpio_leds {
		gpio-leds {
		compatible = "gpio-leds";
		pinctrl-0 = <&backup_led_pin &power_led_pin>;
		pinctrl-names = "default";

		blue_backup_led {
		blue-backup-led {
		label = "rn104:blue:backup";
		gpios = <&gpio1 31 0>; /* GPIO 63 Active High */
		gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
		default-state = "off";
		};

		blue_power_led {
		blue-power-led {
		label = "rn104:blue:pwr";
		gpios = <&gpio2 0 1>; /* GPIO 64 Active Low */
		gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
		linux,default-trigger = "keep";
		};

		sata1_led {
		blue-sata1-led {
		label = "rn104:blue:sata1";
		gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
		default-state = "off";
		};

		sata2_led {
		blue-sata2-led {
		label = "rn104:blue:sata2";
		gpios = <&pca9554 1 GPIO_ACTIVE_LOW>;
		default-state = "off";
		};

		sata3_led {
		blue-sata3-led {
		label = "rn104:blue:sata3";
		gpios = <&pca9554 2 GPIO_ACTIVE_LOW>;
		default-state = "off";
		};

		sata4_led {
		blue-sata4-led {
		label = "rn104:blue:sata4";
		gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
		default-state = "off";
		};
		};

		gpio_keys {
		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		pinctrl-0 = <&backup_key_pin
		&power_key_pin
		&reset_key_pin>;
		pinctrl-0 = <&backup_button_pin
		&power_button_pin
		&reset_button_pin>;
		pinctrl-names = "default";

		button@1 {
		backup-button {
		label = "Backup Button";
		linux,code = <133>; /* KEY_COPY */
		gpios = <&gpio1 20 1>;
		linux,code = <KEY_COPY>;
		gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
		};

		button@2 {
		power-button {
		label = "Power Button";
		linux,code = <116>; /* KEY_POWER */
		gpios = <&gpio1 30 0>;
		linux,code = <KEY_POWER>;
		gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
		};

		button@3 {
		reset-button {
		label = "Reset Button";
		linux,code = <0x198>; /* KEY_RESTART */
		gpios = <&gpio2 1 1>;
		linux,code = <KEY_RESTART>;
		gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
		};
		};

		gpio_poweroff {
		gpio-poweroff {
		compatible = "gpio-poweroff";
		pinctrl-0 = <&poweroff>;
		pinctrl-names = "default";
		gpios = <&gpio1 28 1>;
		gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
		};
		};

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

0 → 100644

+286 −0

Original line number	Diff line number	Diff line
		/*
		* Device Tree file for NETGEAR ReadyNAS 2120
		*
		* Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version
		* 2 of the License, or (at your option) any later version.
		*/

		/dts-v1/;

		#include <dt-bindings/input/input.h>
		#include <dt-bindings/gpio/gpio.h>
		#include "armada-xp-mv78230.dtsi"

		/ {
		model = "NETGEAR ReadyNAS 2120";
		compatible = "netgear,readynas-2120", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp";

		chosen {
		bootargs = "console=ttyS0,115200 earlyprintk";
		};

		memory {
		device_type = "memory";
		reg = <0 0x00000000 0 0x80000000>; /* 2GB */
		};

		soc {
		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
		MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;

		pcie-controller {
		status = "okay";

		/* Connected to first Marvell 88SE9170 SATA controller */
		pcie@1,0 {
		/* Port 0, Lane 0 */
		status = "okay";
		};

		/* Connected to second Marvell 88SE9170 SATA controller */
		pcie@2,0 {
		/* Port 0, Lane 1 */
		status = "okay";
		};

		/* Connected to Fresco Logic FL1009 USB 3.0 controller */
		pcie@5,0 {
		/* Port 1, Lane 0 */
		status = "okay";
		};
		};

		internal-regs {
		pinctrl {
		poweroff: poweroff {
		marvell,pins = "mpp42";
		marvell,function = "gpio";
		};

		power_button_pin: power-button-pin {
		marvell,pins = "mpp27";
		marvell,function = "gpio";
		};

		reset_button_pin: reset-button-pin {
		marvell,pins = "mpp41";
		marvell,function = "gpio";
		};

		sata1_led_pin: sata1-led-pin {
		marvell,pins = "mpp31";
		marvell,function = "gpio";
		};

		sata2_led_pin: sata2-led-pin {
		marvell,pins = "mpp40";
		marvell,function = "gpio";
		};

		sata3_led_pin: sata3-led-pin {
		marvell,pins = "mpp44";
		marvell,function = "gpio";
		};

		sata4_led_pin: sata4-led-pin {
		marvell,pins = "mpp47";
		marvell,function = "gpio";
		};

		sata1_power_pin: sata1-power-pin {
		marvell,pins = "mpp24";
		marvell,function = "gpio";
		};

		sata2_power_pin: sata2-power-pin {
		marvell,pins = "mpp25";
		marvell,function = "gpio";
		};

		sata3_power_pin: sata3-power-pin {
		marvell,pins = "mpp26";
		marvell,function = "gpio";
		};

		sata4_power_pin: sata4-power-pin {
		marvell,pins = "mpp28";
		marvell,function = "gpio";
		};

		sata1_pres_pin: sata1-pres-pin {
		marvell,pins = "mpp32";
		marvell,function = "gpio";
		};

		sata2_pres_pin: sata2-pres-pin {
		marvell,pins = "mpp33";
		marvell,function = "gpio";
		};

		sata3_pres_pin: sata3-pres-pin {
		marvell,pins = "mpp34";
		marvell,function = "gpio";
		};

		sata4_pres_pin: sata4-pres-pin {
		marvell,pins = "mpp35";
		marvell,function = "gpio";
		};

		err_led_pin: err-led-pin {
		marvell,pins = "mpp45";
		marvell,function = "gpio";
		};
		};

		serial@12000 {
		clocks = <&coreclk 0>;
		status = "okay";
		};

		mdio {
		phy0: ethernet-phy@0 { /* Marvell 88E1318 */
		reg = <0>;
		};

		phy1: ethernet-phy@1 { /* Marvell 88E1318 */
		reg = <1>;
		};
		};

		ethernet@70000 {
		status = "okay";
		phy = <&phy0>;
		phy-mode = "rgmii-id";
		};

		ethernet@74000 {
		status = "okay";
		phy = <&phy1>;
		phy-mode = "rgmii-id";
		};

		/* Front USB 2.0 port */
		usb@50000 {
		status = "okay";
		};

		i2c@11000 {
		compatible = "marvell,mv64xxx-i2c";
		clock-frequency = <400000>;
		status = "okay";

		/* Controller for rear fan #1 of 3 (Protechnic
		* MGT4012XB-O20, 8000RPM) near eSATA port */
		g762_fan1: g762@3e {
		compatible = "gmt,g762";
		reg = <0x3e>;
		clocks = <&g762_clk>; /* input clock */
		fan_gear_mode = <0>;
		fan_startv = <1>;
		pwm_polarity = <0>;
		};

		/* Controller for rear (center) fan #2 of 3 */
		g762_fan2: g762@48 {
		compatible = "gmt,g762";
		reg = <0x48>;
		clocks = <&g762_clk>; /* input clock */
		fan_gear_mode = <0>;
		fan_startv = <1>;
		pwm_polarity = <0>;
		};

		/* Controller for rear fan #3 of 3 */
		g762_fan3: g762@49 {
		compatible = "gmt,g762";
		reg = <0x49>;
		clocks = <&g762_clk>; /* input clock */
		fan_gear_mode = <0>;
		fan_startv = <1>;
		pwm_polarity = <0>;
		};

		/* Temperature sensor */
		g751: g751@4c {
		compatible = "gmt,g751";
		reg = <0x4c>;
		};
		};
		};
		};

		clocks {
		g762_clk: g762-oscillator {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <32768>;
		};
		};

		gpio-leds {
		compatible = "gpio-leds";
		pinctrl-0 = <&sata1_led_pin &sata2_led_pin &err_led_pin
		&sata3_led_pin &sata4_led_pin>;
		pinctrl-names = "default";

		red-sata1-led {
		label = "rn2120:red:sata1";
		gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
		default-state = "off";
		};

		red-sata2-led {
		label = "rn2120:red:sata2";
		gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
		default-state = "off";
		};

		red-sata3-led {
		label = "rn2120:red:sata3";
		gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
		default-state = "off";
		};

		red-sata4-led {
		label = "rn2120:red:sata4";
		gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
		default-state = "off";
		};

		red-err-led {
		label = "rn2120:red:err";
		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
		default-state = "off";
		};
		};

		gpio-keys {
		compatible = "gpio-keys";
		pinctrl-0 = <&power_button_pin &reset_button_pin>;
		pinctrl-names = "default";

		power-button {
		label = "Power Button";
		linux,code = <KEY_POWER>;
		gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
		};

		reset-button {
		label = "Reset Button";
		linux,code = <KEY_RESTART>;
		gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
		};
		};

		gpio-poweroff {
		compatible = "gpio-poweroff";
		pinctrl-0 = <&poweroff>;
		pinctrl-names = "default";
		gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
		};
		};

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

+60 −39

Original line number	Diff line number	Diff line
		/*
		* Device Tree file for NETGEAR ReadyNAS Duo v2
		*
		* Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* as published by the Free Software Foundation; either version
		* 2 of the License, or (at your option) any later version.
		*/

		/dts-v1/;

		#include <dt-bindings/input/input.h>
		#include <dt-bindings/gpio/gpio.h>
		#include "kirkwood.dtsi"
		#include "kirkwood-6282.dtsi"
		@@ -33,34 +45,42 @@
		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";
		};

		pmx_poweroff: pmx-poweroff {
		marvell,pins = "mpp30";
		marvell,function = "gpio";
		@@ -68,10 +88,7 @@
		};

		clocks {
		#address-cells = <1>;
		#size-cells = <0>;

		g762_clk: fixedclk {
		g762_clk: g762-oscillator {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		clock-frequency = <8192>;
		@@ -117,49 +134,53 @@

		power_led {
		label = "status:blue:power_led";
		gpios = <&gpio0 31 1>; /* GPIO 31 Active Low */
		gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
		default-state = "keep";
		};

		activity_led {
		label = "status:blue:activity_led";
		gpios = <&gpio1 6 1>; /* GPIO 38 Active Low */
		gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
		};

		disk1_led {
		label = "status:blue:disk1_led";
		gpios = <&gpio0 23 1>; /* GPIO 23 Active Low */
		gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
		};

		disk2_led {
		label = "status:blue:disk2_led";
		gpios = <&gpio0 22 1>; /* GPIO 22 Active Low */
		gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
		};

		backup_led {
		label = "status:blue:backup_led";
		gpios = <&gpio0 29 1>; /* GPIO 29 Active Low*/
		gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
		};
		};

		gpio_keys {
		gpio-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		pinctrl-0 = <&pmx_button_power &pmx_button_backup
		&pmx_button_reset>;
		pinctrl-names = "default";

		button@1 {
		power-button {
		label = "Power Button";
		linux,code = <116>; /* KEY_POWER */
		gpios = <&gpio1 15 1>;
		linux,code = <KEY_POWER>;
		gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
		};
		button@2 {

		reset-button {
		label = "Reset Button";
		linux,code = <0x198>; /* KEY_RESTART */
		gpios = <&gpio0 13 1>;
		linux,code = <KEY_RESTART>;
		gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
		};
		button@3 {

		backup-button {
		label = "Backup Button";
		linux,code = <133>; /* KEY_COPY */
		gpios = <&gpio1 13 1>;
		linux,code = <KEY_COPY>;
		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
		};
		};

		@@ -175,7 +196,7 @@
		#address-cells = <1>;
		#size-cells = <0>;

		usb_power: regulator@1 {
		usb3_regulator: usb3-regulator {
		compatible = "regulator-fixed";
		reg = <1>;
		regulator-name = "USB 3.0 Power";
		@@ -184,7 +205,7 @@
		enable-active-high;
		regulator-always-on;
		regulator-boot-on;
		gpio = <&gpio1 14 0>;
		gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
		};
		};
		};
		@@ -222,7 +243,7 @@
		&mdio {
		status = "okay";

		ethphy0: ethernet-phy@0 {
		ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
		device_type = "ethernet-phy";
		reg = <0>;
		};