Skip to content

Commit

Permalink
Merge tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu into…
Browse files Browse the repository at this point in the history 
… next/dt

Pull "mvebu DT changes for v3.19" from Jason Cooper:

 - mvebu
    - ReadyNAS 102 leds, esata
    - ReadyNAS 2120 esata
    - Add cache-unified for Aurora L2 node
    - Add ref clk for timer and watchdog on Armada 375
    - Cleanup Armada XP pinctrl for GigE
    - Add RGMII pinctrl, i2c eeprom, and fix 74hc595 counter on Lenovo ix4-300d

 - kirkwood
    - Add DLink DIR665 and it's DSA configuration

* tag 'mvebu-dt-3.19' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: armada-xp: Fix 74hc595 count for Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add I2C eeprom on Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add RGMII pinctrl to Lenovo ix4-300d
  ARM: mvebu: armada-xp: Add GE0 pinctrl settings for GMII
  ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
  ARM: mvebu: armada-xp: Use pinctrl node alias
  ARM: mvebu: armada-xp: Add node alias to pinctrl and add base address
  ARM: mvebu: armada-xp: Consolidate pinctrl node
  ARM: Kirkwood: DIR665: Instantiate Distributed Switch Architecture
  ARM: Kirkwood: Add support for DLink DIR665
  ARM: mvebu: Enable rear eSATA ports of NETGEAR ReadyNAS 2120
  ARM: mvebu: Enable the reference clock for timer and watchdog on Armada 375 SoC
  arm: mvebu: Clarify (e)SATA ports info in NETGEAR ReadyNAS 102 .dts file
  arm: mvebu: Fix LED color in NETGEAR ReadyNAS 102 .dts file
  ARM: mvebu: Fix the Aurora L2 cache node with the required cache-unified property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Nov 19, 2014
2 parents 2184d56 + f5ed9cc commit 7d9e89c
Show file tree
Hide file tree
Showing 13 changed files with 506 additions and 197 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
kirkwood-d2net.dtb \
kirkwood-db-88f6281.dtb \
kirkwood-db-88f6282.dtb \
kirkwood-dir665.dtb \
kirkwood-dns320.dtb \
kirkwood-dns325.dtb \
kirkwood-dockstar.dtb \
Expand Down
17 changes: 9 additions & 8 deletions arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
pcie-controller {
status = "okay";

/* Connected to Marvell SATA controller */
/* Connected to Marvell 88SE9170 SATA controller */
pcie@1,0 {
/* Port 0, Lane 0 */
status = "okay";
Expand All @@ -53,8 +53,9 @@
status = "okay";
};

/* eSATA interface */
sata@a0000 {
nr-ports = <2>;
nr-ports = <1>;
status = "okay";
};

Expand Down Expand Up @@ -204,20 +205,20 @@
default-state = "keep";
};

green-sata1-led {
label = "rn102:green:sata1";
blue-sata1-led {
label = "rn102:blue:sata1";
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
default-state = "on";
};

green-sata2-led {
label = "rn102:green:sata2";
blue-sata2-led {
label = "rn102:blue:sata2";
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
default-state = "on";
};

green-backup-led {
label = "rn102:green:backup";
blue-backup-led {
label = "rn102:blue:backup";
gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
default-state = "on";
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/armada-370.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
compatible = "marvell,aurora-outer-cache";
reg = <0x08000 0x1000>;
cache-id-part = <0x100>;
cache-unified;
wt-override;
};

Expand Down
12 changes: 10 additions & 2 deletions arch/arm/boot/dts/armada-375.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
#clock-cells = <0>;
clock-frequency = <2000000000>;
};
/* 25 MHz reference crystal */
refclk: oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <25000000>;
};
};

cpus {
Expand Down Expand Up @@ -366,13 +372,15 @@
<&gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<&mpic 5>,
<&mpic 6>;
clocks = <&coreclk 0>;
clocks = <&coreclk 0>, <&refclk>;
clock-names = "nbclk", "fixed";
};

watchdog@20300 {
compatible = "marvell,armada-375-wdt";
reg = <0x20300 0x34>, <0x20704 0x4>, <0x18254 0x4>;
clocks = <&coreclk 0>;
clocks = <&coreclk 0>, <&refclk>;
clock-names = "nbclk", "fixed";
};

cpurst@20800 {
Expand Down
58 changes: 22 additions & 36 deletions arch/arm/boot/dts/armada-xp-axpwifiap.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,40 +60,6 @@
};

internal-regs {
pinctrl {
pinctrl-0 = <&pmx_phy_int>;
pinctrl-names = "default";

pmx_ge0: pmx-ge0 {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp6", "mpp7",
"mpp8", "mpp9", "mpp10", "mpp11";
marvell,function = "ge0";
};

pmx_ge1: pmx-ge1 {
marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
"mpp16", "mpp17", "mpp18", "mpp19",
"mpp20", "mpp21", "mpp22", "mpp23";
marvell,function = "ge1";
};

pmx_keys: pmx-keys {
marvell,pins = "mpp33";
marvell,function = "gpio";
};

pmx_spi: pmx-spi {
marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
marvell,function = "spi";
};

pmx_phy_int: pmx-phy-int {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
};

serial@12000 {
status = "okay";
};
Expand All @@ -118,14 +84,14 @@
};

ethernet@70000 {
pinctrl-0 = <&pmx_ge0>;
pinctrl-0 = <&pmx_ge0_rgmii>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@74000 {
pinctrl-0 = <&pmx_ge1>;
pinctrl-0 = <&pmx_ge1_rgmii>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
Expand Down Expand Up @@ -162,3 +128,23 @@
};
};
};

&pinctrl {
pinctrl-0 = <&pmx_phy_int>;
pinctrl-names = "default";

pmx_keys: pmx-keys {
marvell,pins = "mpp33";
marvell,function = "gpio";
};

pmx_spi: pmx-spi {
marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
marvell,function = "spi";
};

pmx_phy_int: pmx-phy-int {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
};
73 changes: 41 additions & 32 deletions arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,37 +51,6 @@
};

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

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

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

scroll_button_pin: scroll-button-pin {
marvell,pins = "mpp42";
marvell,function = "gpio";
};

hdd_led_pin: hdd-led-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
};

serial@12000 {
status = "okay";
};
Expand All @@ -97,12 +66,16 @@
};

ethernet@70000 {
pinctrl-0 = <&pmx_ge0_rgmii>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};

ethernet@74000 {
pinctrl-0 = <&pmx_ge1_rgmii>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
Expand All @@ -125,6 +98,11 @@
reg = <0x2e>;
};

eeprom@50 {
compatible = "atmel,24c64";
reg = <0x50>;
};

pcf8563@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
Expand Down Expand Up @@ -226,7 +204,7 @@
gpio-controller;
#gpio-cells = <2>;
reg = <0>;
registers-number = <2>;
registers-number = <1>;
spi-max-frequency = <100000>;
};
};
Expand Down Expand Up @@ -282,3 +260,34 @@
gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
};
};

&pinctrl {
poweroff_pin: poweroff-pin {
marvell,pins = "mpp24";
marvell,function = "gpio";
};

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

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

scroll_button_pin: scroll-button-pin {
marvell,pins = "mpp42";
marvell,function = "gpio";
};

hdd_led_pin: hdd-led-pin {
marvell,pins = "mpp26";
marvell,function = "gpio";
};
};
15 changes: 4 additions & 11 deletions arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,17 +167,6 @@
};

internal-regs {
pinctrl {
compatible = "marvell,mv78230-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand All @@ -202,3 +191,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78230-pinctrl";
};
15 changes: 4 additions & 11 deletions arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,6 @@
};

internal-regs {
pinctrl {
compatible = "marvell,mv78260-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand Down Expand Up @@ -305,3 +294,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78260-pinctrl";
};
15 changes: 4 additions & 11 deletions arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,6 @@
};

internal-regs {
pinctrl {
compatible = "marvell,mv78460-pinctrl";
reg = <0x18000 0x38>;

sdio_pins: sdio-pins {
marvell,pins = "mpp30", "mpp31", "mpp32",
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};
};

gpio0: gpio@18100 {
compatible = "marvell,orion-gpio";
reg = <0x18100 0x40>;
Expand Down Expand Up @@ -343,3 +332,7 @@
};
};
};

&pinctrl {
compatible = "marvell,mv78460-pinctrl";
};
Loading

0 comments on commit 7d9e89c

Please sign in to comment.