Skip to content

Commit

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

Merge "ARM: mvebu: DT changes for v3.18" from Jason Cooper:

mvebu DT changes for v3.18

 - Armada 375
    - Add RTC support

 - Armada 370
    - Add proper pinmuxing
    - Add SSCG
    - Add gpio-fan
    - Add LED support

 - change Intersil vendor prefix to isil
 - use improved Armada SPI compatible string

* tag 'mvebu-dt-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add user LED support of Armada 370 RD
  ARM: mvebu: add gpio fan support to Armada 370 RD
  ARM: mvebu: Change vendor prefix for Intersil Corporation to isil
  ARM: mvebu: use improved armada spi device tree compatible name
  ARM: mvebu: add SSCG to Armada 370 Device Tree
  ARM: mvebu: Add proper pin muxing on Armada 370 RD board
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 104
  ARM: mvebu: Add proper pin muxing on Netgear ReadyNAS 102
  ARM: mvebu: Add proper pin muxing on the Armada 370 DB board
  ARM: mvebu: Add proper pin muxing on Globalscale Mirabox board
  ARM: mvebu: Add network pin mux configuration for the Armada 370 SoC
  ARM: mvebu: Add RTC support for Armada 375

Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Sep 24, 2014
2 parents fa0510f + 5b1e9e8 commit 3e32adc
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 5 deletions.
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/armada-370-db.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
};

mdio {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 {
reg = <0>;
};
Expand All @@ -53,11 +55,15 @@
};

ethernet@70000 {
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@74000 {
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/armada-370-mirabox.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
};

mdio {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 {
reg = <0>;
};
Expand All @@ -100,11 +102,15 @@
};
};
ethernet@70000 {
pinctrl-0 = <&ge0_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
};
ethernet@74000 {
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
Expand Down
6 changes: 5 additions & 1 deletion arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,16 @@
};

mdio {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 { /* Marvell 88E1318 */
reg = <0>;
};
};

ethernet@74000 {
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
Expand All @@ -122,7 +126,7 @@
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
compatible = "isil,isl12057";
reg = <0x68>;
};

Expand Down
8 changes: 7 additions & 1 deletion arch/arm/boot/dts/armada-370-netgear-rn104.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
};

mdio {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 { /* Marvell 88E1318 */
reg = <0>;
};
Expand All @@ -96,12 +98,16 @@
};

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

ethernet@74000 {
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
Expand All @@ -117,7 +123,7 @@
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
compatible = "isil,isl12057";
reg = <0x68>;
};

Expand Down
36 changes: 36 additions & 0 deletions arch/arm/boot/dts/armada-370-rd.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@
};

internal-regs {
pinctrl {
fan_pins: fan-pins {
marvell,pins = "mpp8";
marvell,function = "gpio";
};

led_pins: led-pins {
marvell,pins = "mpp32";
marvell,function = "gpio";
};
};

serial@12000 {
status = "okay";
};
Expand All @@ -59,6 +71,8 @@
};

mdio {
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 {
reg = <0>;
};
Expand All @@ -74,6 +88,8 @@
phy-mode = "sgmii";
};
ethernet@74000 {
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy1>;
phy-mode = "rgmii-id";
Expand Down Expand Up @@ -106,6 +122,26 @@
};
};

gpio-fan {
compatible = "gpio-fan";
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
gpio-fan,speed-map = <0 0 3000 1>;
pinctrl-0 = <&fan_pins>;
pinctrl-names = "default";
};

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

sw_led {
label = "370rd:green:sw";
gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
};

nand@d0000 {
status = "okay";
num-cs = <1>;
Expand Down
4 changes: 2 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 @@ -110,7 +110,7 @@
};

spi0: spi@10600 {
compatible = "marvell,orion-spi";
compatible = "marvell,armada-370-spi", "marvell,orion-spi";
reg = <0x10600 0x28>;
#address-cells = <1>;
#size-cells = <0>;
Expand All @@ -121,7 +121,7 @@
};

spi1: spi@10680 {
compatible = "marvell,orion-spi";
compatible = "marvell,armada-370-spi", "marvell,orion-spi";
reg = <0x10680 0x28>;
#address-cells = <1>;
#size-cells = <0>;
Expand Down
23 changes: 23 additions & 0 deletions arch/arm/boot/dts/armada-370.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,25 @@
"mpp62", "mpp60", "mpp58";
marvell,function = "audio";
};

mdio_pins: mdio-pins {
marvell,pins = "mpp17", "mpp18";
marvell,function = "ge";
};

ge0_rgmii_pins: ge0-rgmii-pins {
marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8",
"mpp9", "mpp10", "mpp11", "mpp12",
"mpp13", "mpp14", "mpp15", "mpp16";
marvell,function = "ge0";
};

ge1_rgmii_pins: ge1-rgmii-pins {
marvell,pins = "mpp19", "mpp20", "mpp21", "mpp22",
"mpp23", "mpp24", "mpp25", "mpp26",
"mpp27", "mpp28", "mpp29", "mpp30";
marvell,function = "ge1";
};
};

gpio0: gpio@18100 {
Expand Down Expand Up @@ -206,6 +225,10 @@
status = "okay";
};

sscg@18330 {
reg = <0x18330 0x4>;
};

interrupt-controller@20000 {
reg = <0x20a00 0x1d0>, <0x21870 0x58>;
};
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/armada-375.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@
};
};

rtc@10300 {
compatible = "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
};

spi0: spi@10600 {
compatible = "marvell,orion-spi";
reg = <0x10600 0x50>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
status = "okay";

isl12057: isl12057@68 {
compatible = "isl,isl12057";
compatible = "isil,isl12057";
reg = <0x68>;
};

Expand Down

0 comments on commit 3e32adc

Please sign in to comment.