Skip to content

Commit

Permalink
Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc
Browse files Browse the repository at this point in the history 
From Jason Cooper:
mvebu dt changes for v3.12
 - kirkwood
    - add ZyXEL NSA310 board, fan for ReadyNAS Duo v2
 - mvebu
    - add ReadyNAS 102 board
 - misc dts updates and changes.

v2:
 - dropped mv64xxx-i2c change

* tag 'dt-3.12' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Fix the Armada 370/XP timer compatible strings
  ARM: mvebu: use dts pre-processor for readynas 102
  ARM: kirkwood: use dts pre-processor for nsa310 boards
  ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells
  ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
  ARM: mvebu: Add Netgear ReadyNAS 102 board
  arm: kirkwood: readynas duo v2: Add GMT G762 Fan Controller

Signed-off-by: Olof Johansson <[email protected]>

Conflicts:
	arch/arm/boot/dts/kirkwood-nsa310.dts
  • Loading branch information
@olofj
olofj committed Aug 29, 2013
2 parents d519049 + 5d3b883 commit 6cbe0e1
Show file tree
Hide file tree
Showing 12 changed files with 491 additions and 105 deletions.
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
kirkwood-ns2max.dtb \
kirkwood-ns2mini.dtb \
kirkwood-nsa310.dtb \
kirkwood-nsa310a.dtb \
kirkwood-sheevaplug.dtb \
kirkwood-sheevaplug-esata.dtb \
kirkwood-topkick.dtb \
Expand All @@ -100,6 +101,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
msm8960-cdp.dtb
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
armada-370-mirabox.dtb \
armada-370-netgear-rn102.dtb \
armada-370-rd.dtb \
armada-xp-axpwifiap.dtb \
armada-xp-db.dtb \
Expand Down
179 changes: 179 additions & 0 deletions arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
/*
* Device Tree file for NETGEAR ReadyNAS 102
*
* Copyright (C) 2013, Arnaud EBALARD <[email protected]>
*
* 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 "armada-370.dtsi"

/ {
model = "NETGEAR ReadyNAS 102";
compatible = "netgear,readynas-102", "marvell,armada370", "marvell,armada-370-xp";

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

memory {
device_type = "memory";
reg = <0x00000000 0x20000000>; /* 512 MB */
};

soc {
internal-regs {
serial@12000 {
clock-frequency = <200000000>;
status = "okay";
};

sata@a0000 {
nr-ports = <2>;
status = "okay";
};

pinctrl {
power_led_pin: power-led-pin {
marvell,pins = "mpp57";
marvell,function = "gpio";
};
sata1_led_pin: sata1-led-pin {
marvell,pins = "mpp15";
marvell,function = "gpio";
};

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

backup_led_pin: backup-led-pin {
marvell,pins = "mpp56";
marvell,function = "gpio";
};
};

mdio {
phy0: ethernet-phy@0 {
reg = <0>;
};
};

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

usb@50000 {
status = "okay";
};

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

g762: g762@3e {
compatible = "gmt,g762";
reg = <0x3e>;
clocks = <&g762_clk>; /* input clock */
fan_gear_mode = <0>;
fan_startv = <1>;
pwm_polarity = <0>;
};
};

pcie-controller {
status = "okay";

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

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

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

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

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

blue_power_led {
label = "rn102:blue:pwr";
gpios = <&gpio1 25 1>; /* GPIO 57 Active Low */
linux,default-trigger = "heartbeat";
};

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

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

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

gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;

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

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

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

};
2 changes: 0 additions & 2 deletions arch/arm/boot/dts/armada-370-xp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,8 @@
};

timer@20300 {
compatible = "marvell,armada-370-xp-timer";
reg = <0x20300 0x30>, <0x21040 0x30>;
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
clocks = <&coreclk 2>;
};

sata@a0000 {
Expand Down
11 changes: 8 additions & 3 deletions arch/arm/boot/dts/armada-370.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <82>, <83>, <84>, <85>;
};

Expand All @@ -147,7 +147,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <87>, <88>, <89>, <90>;
};

Expand All @@ -158,10 +158,15 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <91>;
};

timer@20300 {
compatible = "marvell,armada-370-timer";
clocks = <&coreclk 2>;
};

coreclk: mvebu-sar@18230 {
compatible = "marvell,armada-370-core-clock";
reg = <0x18230 0x08>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <82>, <83>, <84>, <85>;
};

Expand All @@ -192,7 +192,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <87>, <88>, <89>;
};
};
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <82>, <83>, <84>, <85>;
};

Expand All @@ -214,7 +214,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <87>, <88>, <89>, <90>;
};

Expand All @@ -225,7 +225,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <91>;
};

Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <82>, <83>, <84>, <85>;
};

Expand All @@ -312,7 +312,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <87>, <88>, <89>, <90>;
};

Expand All @@ -323,7 +323,7 @@
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupts-cells = <2>;
#interrupt-cells = <2>;
interrupts = <91>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
};

timer@20300 {
marvell,timer-25Mhz;
compatible = "marvell,armada-xp-timer";
};

coreclk: mvebu-sar@18230 {
Expand Down
20 changes: 20 additions & 0 deletions arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,33 @@
};
};

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

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

i2c@11000 {
status = "okay";

rs5c372a: rs5c372a@32 {
compatible = "ricoh,rs5c372a";
reg = <0x32>;
};

g762: g762@3e {
compatible = "gmt,g762";
reg = <0x3e>;
clocks = <&g762_clk>; /* input clock */
fan_gear_mode = <0>;
fan_startv = <1>;
pwm_polarity = <0>;
};
};

serial@12000 {
Expand Down
Loading

0 comments on commit 6cbe0e1

Please sign in to comment.