Skip to content

L
linux
Commit 61e810d3 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu into next/dt 

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

mvebu DT changes for v3.16

 - kirkwood
    - rework nsa3x0 board to add nsa320
    - large cleanup to facilitate use in barebox
    - guruplug phy updates
    - audio updates for t5325

 - mvebu
    - use clocks vice clock-frequency for uart nodes

    - armada 375/380/385
       - add watchdog node
       - add coherency fabric
       - add smp support
       - add sdhci
       - add ahci
       - add thermal sensor

    - armada 370/XP
       - and pmsu

* tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu: (35 commits)
  ARM: Kirkwood: t5325: Use simple card to instantiate audio
  ARM: Kirkwood: DT: Add missing #sound-dai-cells property
  ARM: Kirkwood: Add node for audio codec
  ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id
  ARM: dts: kirkwood: set Guruplug ethernet PHY compatible
  ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
  ARM: dts: kirkwood: set default pinctrl for I2C0
  ARM: dts: kirkwood: set default pinctrl for NAND
  ARM: dts: kirkwood: set default pinctrl for SPI0
  ARM: dts: kirkwood: set default pinctrl for UART0/1
  ARM: dts: kirkwood: set default pinctrl for GBE1
  ARM: dts: kirkwood: consolidate common pinctrl settings
  ARM: dts: kirkwood: add pinctrl node to common SoC include
  ARM: dts: kirkwood: rename pin-controller nodes
  ARM: dts: kirkwood: remove clock-frequency properties from UART nodes
  ARM: dts: kirkwood: add stdout-path property to all boards
  ARM: dts: kirkwood: add node labels
  ARM: mvebu: Enable the thermal sensor in Armada 380/385 SoC
  ARM: mvebu: Enable the thermal sensor in Armada 375 SoC
  ARM: mvebu: don't use clocks property in UART node for Netgear RN2120
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2bfac3a5 191825c3
Show whitespace changes
Inline Side-by-side
Showing with 627 additions and 417 deletions
arch/arm/boot/dts/armada-370-db.dts
View file @ 61e810d3
...@@ -35,7 +35,6 @@ soc { ...@@ -35,7 +35,6 @@ soc {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
sata@a0000 { sata@a0000 {
......
arch/arm/boot/dts/armada-370-mirabox.dts
View file @ 61e810d3
...@@ -47,7 +47,6 @@ pcie@2,0 { ...@@ -47,7 +47,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
timer@20300 { timer@20300 {
......
arch/arm/boot/dts/armada-370-netgear-rn102.dts
View file @ 61e810d3
...@@ -50,7 +50,6 @@ pcie@2,0 { ...@@ -50,7 +50,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-370-netgear-rn104.dts
View file @ 61e810d3
...@@ -50,7 +50,6 @@ pcie@2,0 { ...@@ -50,7 +50,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-370-rd.dts
View file @ 61e810d3
...@@ -51,7 +51,6 @@ pcie@2,0 { ...@@ -51,7 +51,6 @@ pcie@2,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
sata@a0000 { sata@a0000 {
......
arch/arm/boot/dts/armada-370-xp.dtsi
View file @ 61e810d3
...@@ -157,6 +157,7 @@ serial@12000 { ...@@ -157,6 +157,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <41>; interrupts = <41>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
serial@12100 { serial@12100 {
...@@ -165,6 +166,7 @@ serial@12100 { ...@@ -165,6 +166,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <42>; interrupts = <42>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -203,6 +205,11 @@ watchdog@20300 { ...@@ -203,6 +205,11 @@ watchdog@20300 {
reg = <0x20300 0x34>, <0x20704 0x4>; reg = <0x20300 0x34>, <0x20704 0x4>;
}; };
pmsu@22000 {
compatible = "marvell,armada-370-pmsu";
reg = <0x22000 0x1000>;
};
usb@50000 { usb@50000 {
compatible = "marvell,orion-ehci"; compatible = "marvell,orion-ehci";
reg = <0x50000 0x500>; reg = <0x50000 0x500>;
......
arch/arm/boot/dts/armada-370.dtsi
View file @ 61e810d3
...@@ -220,6 +220,11 @@ watchdog@20300 { ...@@ -220,6 +220,11 @@ watchdog@20300 {
clocks = <&coreclk 2>; clocks = <&coreclk 2>;
}; };
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x8>;
};
audio_controller: audio-controller@30000 { audio_controller: audio-controller@30000 {
compatible = "marvell,armada370-audio"; compatible = "marvell,armada370-audio";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
......
arch/arm/boot/dts/armada-375-db.dts
View file @ 61e810d3
...@@ -68,7 +68,6 @@ i2c@11100 { ...@@ -68,7 +68,6 @@ i2c@11100 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-375.dtsi
View file @ 61e810d3
...@@ -39,6 +39,8 @@ mainpll: mainpll { ...@@ -39,6 +39,8 @@ mainpll: mainpll {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-375-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
...@@ -128,6 +130,11 @@ L2: cache-controller@8000 { ...@@ -128,6 +130,11 @@ L2: cache-controller@8000 {
cache-level = <2>; cache-level = <2>;
}; };
scu@c000 {
compatible = "arm,cortex-a9-scu";
reg = <0xc000 0x58>;
};
timer@c600 { timer@c600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xc600 0x20>; reg = <0xc600 0x20>;
...@@ -194,6 +201,7 @@ serial@12000 { ...@@ -194,6 +201,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -203,6 +211,7 @@ serial@12100 { ...@@ -203,6 +211,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -320,6 +329,22 @@ timer@20300 { ...@@ -320,6 +329,22 @@ timer@20300 {
clocks = <&coreclk 0>; clocks = <&coreclk 0>;
}; };
watchdog@20300 {
compatible = "marvell,armada-375-wdt";
reg = <0x20300 0x34>, <0x20704 0x4>, <0x18254 0x4>;
clocks = <&coreclk 0>;
};
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x10>;
};
coherency-fabric@21010 {
compatible = "marvell,armada-375-coherency-fabric";
reg = <0x21010 0x1c>;
};
xor@60800 { xor@60800 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60800 0x100 reg = <0x60800 0x100
...@@ -391,6 +416,12 @@ mvsdio@d4000 { ...@@ -391,6 +416,12 @@ mvsdio@d4000 {
status = "disabled"; status = "disabled";
}; };
thermal@e8078 {
compatible = "marvell,armada375-thermal";
reg = <0xe8078 0x4>, <0xe807c 0x8>;
status = "okay";
};
coreclk: mvebu-sar@e8204 { coreclk: mvebu-sar@e8204 {
compatible = "marvell,armada-375-core-clock"; compatible = "marvell,armada-375-core-clock";
reg = <0xe8204 0x04>; reg = <0xe8204 0x04>;
......
arch/arm/boot/dts/armada-380.dtsi
View file @ 61e810d3
...@@ -21,6 +21,8 @@ / { ...@@ -21,6 +21,8 @@ / {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-380-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
......
arch/arm/boot/dts/armada-385-db.dts
View file @ 61e810d3
...@@ -55,7 +55,6 @@ i2c@11100 { ...@@ -55,7 +55,6 @@ i2c@11100 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
...@@ -81,6 +80,14 @@ phy1: ethernet-phy@1 { ...@@ -81,6 +80,14 @@ phy1: ethernet-phy@1 {
}; };
}; };
sata@a8000 {
status = "okay";
};
sata@e0000 {
status = "okay";
};
flash@d0000 { flash@d0000 {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;
...@@ -101,6 +108,14 @@ partition@1000000 { ...@@ -101,6 +108,14 @@ partition@1000000 {
reg = <0x1000000 0x3f000000>; reg = <0x1000000 0x3f000000>;
}; };
}; };
sdhci@d8000 {
clock-frequency = <200000000>;
broken-cd;
wp-inverted;
bus-width = <8>;
status = "okay";
};
}; };
pcie-controller { pcie-controller {
......
arch/arm/boot/dts/armada-385-rd.dts
View file @ 61e810d3
...@@ -51,7 +51,6 @@ i2c@11000 { ...@@ -51,7 +51,6 @@ i2c@11000 {
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-385.dtsi
View file @ 61e810d3
...@@ -21,6 +21,8 @@ / { ...@@ -21,6 +21,8 @@ / {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-380-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
......
arch/arm/boot/dts/armada-38x.dtsi
View file @ 61e810d3
...@@ -108,6 +108,11 @@ L2: cache-controller@8000 { ...@@ -108,6 +108,11 @@ L2: cache-controller@8000 {
cache-level = <2>; cache-level = <2>;
}; };
scu@c000 {
compatible = "arm,cortex-a9-scu";
reg = <0xc000 0x58>;
};
timer@c600 { timer@c600 {
compatible = "arm,cortex-a9-twd-timer"; compatible = "arm,cortex-a9-twd-timer";
reg = <0xc600 0x20>; reg = <0xc600 0x20>;
...@@ -174,6 +179,7 @@ serial@12000 { ...@@ -174,6 +179,7 @@ serial@12000 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -183,6 +189,7 @@ serial@12100 { ...@@ -183,6 +189,7 @@ serial@12100 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -267,6 +274,28 @@ timer@20300 { ...@@ -267,6 +274,28 @@ timer@20300 {
clock-names = "nbclk", "fixed"; clock-names = "nbclk", "fixed";
}; };
watchdog@20300 {
compatible = "marvell,armada-380-wdt";
reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>;
clocks = <&coreclk 2>, <&refclk>;
clock-names = "nbclk", "fixed";
};
cpurst@20800 {
compatible = "marvell,armada-370-cpu-reset";
reg = <0x20800 0x10>;
};
coherency-fabric@21010 {
compatible = "marvell,armada-380-coherency-fabric";
reg = <0x21010 0x1c>;
};
pmsu@22000 {
compatible = "marvell,armada-380-pmsu";
reg = <0x22000 0x1000>;
};
eth1: ethernet@30000 { eth1: ethernet@30000 {
compatible = "marvell,armada-370-neta"; compatible = "marvell,armada-370-neta";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
...@@ -339,6 +368,22 @@ mdio { ...@@ -339,6 +368,22 @@ mdio {
clocks = <&gateclk 4>; clocks = <&gateclk 4>;
}; };
sata@a8000 {
compatible = "marvell,armada-380-ahci";
reg = <0xa8000 0x2000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 15>;
status = "disabled";
};
sata@e0000 {
compatible = "marvell,armada-380-ahci";
reg = <0xe0000 0x2000>;
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gateclk 30>;
status = "disabled";
};
coredivclk: clock@e4250 { coredivclk: clock@e4250 {
compatible = "marvell,armada-380-corediv-clock"; compatible = "marvell,armada-380-corediv-clock";
reg = <0xe4250 0xc>; reg = <0xe4250 0xc>;
...@@ -347,6 +392,12 @@ coredivclk: clock@e4250 { ...@@ -347,6 +392,12 @@ coredivclk: clock@e4250 {
clock-output-names = "nand"; clock-output-names = "nand";
}; };
thermal@e8078 {
compatible = "marvell,armada380-thermal";
reg = <0xe4078 0x4>, <0xe4074 0x4>;
status = "okay";
};
flash@d0000 { flash@d0000 {
compatible = "marvell,armada370-nand"; compatible = "marvell,armada370-nand";
reg = <0xd0000 0x54>; reg = <0xd0000 0x54>;
...@@ -356,6 +407,15 @@ flash@d0000 { ...@@ -356,6 +407,15 @@ flash@d0000 {
clocks = <&coredivclk 0>; clocks = <&coredivclk 0>;
status = "disabled"; status = "disabled";
}; };
sdhci@d8000 {
compatible = "marvell,armada-380-sdhci";
reg = <0xd8000 0x1000>, <0xdc000 0x100>;
interrupts = <0 25 0x4>;
clocks = <&gateclk 17>;
mrvl,clk-delay-cycles = <0x1F>;
status = "disabled";
};
}; };
}; };
......
arch/arm/boot/dts/armada-xp-axpwifiap.dts
View file @ 61e810d3
...@@ -95,12 +95,10 @@ pmx_phy_int: pmx-phy-int { ...@@ -95,12 +95,10 @@ pmx_phy_int: pmx-phy-int {
}; };
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-xp-db.dts
View file @ 61e810d3
...@@ -106,19 +106,15 @@ pcie@10,0 { ...@@ -106,19 +106,15 @@ pcie@10,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-xp-gp.dts
View file @ 61e810d3
...@@ -104,19 +104,15 @@ pcie@10,0 { ...@@ -104,19 +104,15 @@ pcie@10,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-xp-matrix.dts
View file @ 61e810d3
...@@ -37,19 +37,15 @@ soc { ...@@ -37,19 +37,15 @@ soc {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12200 { serial@12200 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12300 { serial@12300 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-xp-mv78230.dtsi
View file @ 61e810d3
...@@ -27,6 +27,7 @@ aliases { ...@@ -27,6 +27,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file @ 61e810d3
...@@ -29,6 +29,7 @@ aliases { ...@@ -29,6 +29,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
arch/arm/boot/dts/armada-xp-mv78460.dtsi
View file @ 61e810d3
...@@ -30,6 +30,7 @@ aliases { ...@@ -30,6 +30,7 @@ aliases {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "marvell,armada-xp-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View file @ 61e810d3
...@@ -138,7 +138,6 @@ err_led_pin: err-led-pin { ...@@ -138,7 +138,6 @@ err_led_pin: err-led-pin {
}; };
serial@12000 { serial@12000 {
clocks = <&coreclk 0>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
View file @ 61e810d3
...@@ -72,11 +72,9 @@ pcie@1,0 { ...@@ -72,11 +72,9 @@ pcie@1,0 {
internal-regs { internal-regs {
serial@12000 { serial@12000 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
serial@12100 { serial@12100 {
clock-frequency = <250000000>;
status = "okay"; status = "okay";
}; };
pinctrl { pinctrl {
......
arch/arm/boot/dts/armada-xp.dtsi
View file @ 61e810d3
...@@ -58,6 +58,7 @@ serial@12200 { ...@@ -58,6 +58,7 @@ serial@12200 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <43>; interrupts = <43>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
serial@12300 { serial@12300 {
...@@ -66,6 +67,7 @@ serial@12300 { ...@@ -66,6 +67,7 @@ serial@12300 {
reg-shift = <2>; reg-shift = <2>;
interrupts = <44>; interrupts = <44>;
reg-io-width = <1>; reg-io-width = <1>;
clocks = <&coreclk 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -117,9 +119,9 @@ watchdog@20300 { ...@@ -117,9 +119,9 @@ watchdog@20300 {
clock-names = "nbclk", "fixed"; clock-names = "nbclk", "fixed";
}; };
armada-370-xp-pmsu@22000 { cpurst@20800 {
compatible = "marvell,armada-370-xp-pmsu"; compatible = "marvell,armada-370-cpu-reset";
reg = <0x22100 0x400>, <0x20800 0x20>; reg = <0x20800 0x20>;
}; };
eth2: ethernet@30000 { eth2: ethernet@30000 {
......
arch/arm/boot/dts/kirkwood-6192.dtsi
View file @ 61e810d3
/ { / {
mbus { mbus {
pcie-controller { pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie"; compatible = "marvell,kirkwood-pcie";
status = "disabled"; status = "disabled";
device_type = "pci"; device_type = "pci";
...@@ -15,7 +15,7 @@ pcie-controller { ...@@ -15,7 +15,7 @@ pcie-controller {
0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>; 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
pcie@1,0 { pcie0: pcie@1,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>; reg = <0x0800 0 0 0 0>;
...@@ -35,16 +35,9 @@ pcie@1,0 { ...@@ -35,16 +35,9 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
compatible = "marvell,88f6192-pinctrl"; compatible = "marvell,88f6192-pinctrl";
reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18",
"mpp19";
marvell,function = "nand";
};
pmx_sata0: pmx-sata0 { pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23"; marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0"; marvell,function = "sata0";
...@@ -53,22 +46,6 @@ pmx_sata1: pmx-sata1 { ...@@ -53,22 +46,6 @@ pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22"; marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1"; marvell,function = "sata1";
}; };
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
pmx_sdio: pmx-sdio { pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14", marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17"; "mpp15", "mpp16", "mpp17";
...@@ -76,14 +53,14 @@ pmx_sdio: pmx-sdio { ...@@ -76,14 +53,14 @@ pmx_sdio: pmx-sdio {
}; };
}; };
rtc@10300 { rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>; reg = <0x10300 0x20>;
interrupts = <53>; interrupts = <53>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
}; };
sata@80000 { sata: sata@80000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>; reg = <0x80000 0x5000>;
interrupts = <21>; interrupts = <21>;
...@@ -92,7 +69,7 @@ sata@80000 { ...@@ -92,7 +69,7 @@ sata@80000 {
status = "disabled"; status = "disabled";
}; };
mvsdio@90000 { sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio"; compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>; reg = <0x90000 0x200>;
interrupts = <28>; interrupts = <28>;
......
arch/arm/boot/dts/kirkwood-6281.dtsi
View file @ 61e810d3
/ { / {
mbus { mbus {
pcie-controller { pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie"; compatible = "marvell,kirkwood-pcie";
status = "disabled"; status = "disabled";
device_type = "pci"; device_type = "pci";
...@@ -15,7 +15,7 @@ pcie-controller { ...@@ -15,7 +15,7 @@ pcie-controller {
0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>; 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */>;
pcie@1,0 { pcie0: pcie@1,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>; reg = <0x0800 0 0 0 0>;
...@@ -35,16 +35,9 @@ pcie@1,0 { ...@@ -35,16 +35,9 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
compatible = "marvell,88f6281-pinctrl"; compatible = "marvell,88f6281-pinctrl";
reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18",
"mpp19";
marvell,function = "nand";
};
pmx_sata0: pmx-sata0 { pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23"; marvell,pins = "mpp5", "mpp21", "mpp23";
marvell,function = "sata0"; marvell,function = "sata0";
...@@ -53,22 +46,6 @@ pmx_sata1: pmx-sata1 { ...@@ -53,22 +46,6 @@ pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22"; marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1"; marvell,function = "sata1";
}; };
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
pmx_sdio: pmx-sdio { pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14", marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17"; "mpp15", "mpp16", "mpp17";
...@@ -76,14 +53,14 @@ pmx_sdio: pmx-sdio { ...@@ -76,14 +53,14 @@ pmx_sdio: pmx-sdio {
}; };
}; };
rtc@10300 { rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>; reg = <0x10300 0x20>;
interrupts = <53>; interrupts = <53>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
}; };
sata@80000 { sata: sata@80000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>; reg = <0x80000 0x5000>;
interrupts = <21>; interrupts = <21>;
...@@ -94,7 +71,7 @@ sata@80000 { ...@@ -94,7 +71,7 @@ sata@80000 {
status = "disabled"; status = "disabled";
}; };
mvsdio@90000 { sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio"; compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>; reg = <0x90000 0x200>;
interrupts = <28>; interrupts = <28>;
......
arch/arm/boot/dts/kirkwood-6282.dtsi
View file @ 61e810d3
/ { / {
mbus { mbus {
pcie-controller { pciec: pcie-controller {
compatible = "marvell,kirkwood-pcie"; compatible = "marvell,kirkwood-pcie";
status = "disabled"; status = "disabled";
device_type = "pci"; device_type = "pci";
...@@ -19,7 +19,7 @@ pcie-controller { ...@@ -19,7 +19,7 @@ pcie-controller {
0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 1.0 MEM */ 0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 1.0 MEM */
0x81000000 0x2 0 MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 1.0 IO */>; 0x81000000 0x2 0 MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 1.0 IO */>;
pcie@1,0 { pcie0: pcie@1,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>; assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
reg = <0x0800 0 0 0 0>; reg = <0x0800 0 0 0 0>;
...@@ -36,7 +36,7 @@ pcie@1,0 { ...@@ -36,7 +36,7 @@ pcie@1,0 {
status = "disabled"; status = "disabled";
}; };
pcie@2,0 { pcie1: pcie@2,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>; assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;
reg = <0x1000 0 0 0 0>; reg = <0x1000 0 0 0 0>;
...@@ -56,15 +56,8 @@ pcie@2,0 { ...@@ -56,15 +56,8 @@ pcie@2,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
compatible = "marvell,88f6282-pinctrl"; compatible = "marvell,88f6282-pinctrl";
reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18", "mpp19";
marvell,function = "nand";
};
pmx_sata0: pmx-sata0 { pmx_sata0: pmx-sata0 {
marvell,pins = "mpp5", "mpp21", "mpp23"; marvell,pins = "mpp5", "mpp21", "mpp23";
...@@ -74,29 +67,16 @@ pmx_sata1: pmx-sata1 { ...@@ -74,29 +67,16 @@ pmx_sata1: pmx-sata1 {
marvell,pins = "mpp4", "mpp20", "mpp22"; marvell,pins = "mpp4", "mpp20", "mpp22";
marvell,function = "sata1"; marvell,function = "sata1";
}; };
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
/*
* Default I2C1 pinctrl setting on mpp36/mpp37,
* overwrite marvell,pins on board level if required.
*/
pmx_twsi1: pmx-twsi1 { pmx_twsi1: pmx-twsi1 {
marvell,pins = "mpp36", "mpp37"; marvell,pins = "mpp36", "mpp37";
marvell,function = "twsi1"; marvell,function = "twsi1";
}; };
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
pmx_sdio: pmx-sdio { pmx_sdio: pmx-sdio {
marvell,pins = "mpp12", "mpp13", "mpp14", marvell,pins = "mpp12", "mpp13", "mpp14",
"mpp15", "mpp16", "mpp17"; "mpp15", "mpp16", "mpp17";
...@@ -104,20 +84,20 @@ pmx_sdio: pmx-sdio { ...@@ -104,20 +84,20 @@ pmx_sdio: pmx-sdio {
}; };
}; };
thermal@10078 { thermal: thermal@10078 {
compatible = "marvell,kirkwood-thermal"; compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>; reg = <0x10078 0x4>;
status = "okay"; status = "okay";
}; };
rtc@10300 { rtc: rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc"; compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>; reg = <0x10300 0x20>;
interrupts = <53>; interrupts = <53>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
}; };
i2c@11100 { i2c1: i2c@11100 {
compatible = "marvell,mv64xxx-i2c"; compatible = "marvell,mv64xxx-i2c";
reg = <0x11100 0x20>; reg = <0x11100 0x20>;
#address-cells = <1>; #address-cells = <1>;
...@@ -125,10 +105,12 @@ i2c@11100 { ...@@ -125,10 +105,12 @@ i2c@11100 {
interrupts = <32>; interrupts = <32>;
clock-frequency = <100000>; clock-frequency = <100000>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
sata@80000 { sata: sata@80000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>; reg = <0x80000 0x5000>;
interrupts = <21>; interrupts = <21>;
...@@ -139,7 +121,7 @@ sata@80000 { ...@@ -139,7 +121,7 @@ sata@80000 {
status = "disabled"; status = "disabled";
}; };
mvsdio@90000 { sdio: mvsdio@90000 {
compatible = "marvell,orion-sdio"; compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>; reg = <0x90000 0x200>;
interrupts = <28>; interrupts = <28>;
......
arch/arm/boot/dts/kirkwood-98dx4122.dtsi
View file @ 61e810d3
/ { / {
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
compatible = "marvell,98dx4122-pinctrl"; compatible = "marvell,98dx4122-pinctrl";
reg = <0x10000 0x20>;
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18",
"mpp19";
marvell,function = "nand";
};
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
}; };
}; };
}; };
arch/arm/boot/dts/kirkwood-b3.dts
View file @ 61e810d3
...@@ -30,6 +30,7 @@ memory { /* 512 MB */ ...@@ -30,6 +30,7 @@ memory { /* 512 MB */
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -44,7 +45,7 @@ pcie@1,0 { ...@@ -44,7 +45,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power { pmx_button_power: pmx-button-power {
marvell,pins = "mpp39"; marvell,pins = "mpp39";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -69,8 +70,6 @@ pmx_beeper: pmx-beeper { ...@@ -69,8 +70,6 @@ pmx_beeper: pmx-beeper {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p16@0 { m25p16@0 {
#address-cells = <1>; #address-cells = <1>;
...@@ -113,8 +112,6 @@ serial@12000 { ...@@ -113,8 +112,6 @@ serial@12000 {
* UART0_TX = Testpoint 66 * UART0_TX = Testpoint 66
* See the Excito Wiki for more details. * See the Excito Wiki for more details.
*/ */
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/kirkwood-cloudbox.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_cloudbox_sata0: pmx-cloudbox-sata0 { pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
marvell,pins = "mpp15"; marvell,pins = "mpp15";
marvell,function = "sata0"; marvell,function = "sata0";
...@@ -25,9 +26,6 @@ pmx_cloudbox_sata0: pmx-cloudbox-sata0 { ...@@ -25,9 +26,6 @@ pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
clock-frequency = <166666667>;
status = "okay"; status = "okay";
}; };
...@@ -39,8 +37,6 @@ sata@80000 { ...@@ -39,8 +37,6 @@ sata@80000 {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
......
arch/arm/boot/dts/kirkwood-db.dtsi
View file @ 61e810d3
...@@ -22,10 +22,11 @@ memory { ...@@ -22,10 +22,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl@10000 { pin-controller@10000 {
pmx_sdio_gpios: pmx-sdio-gpios { pmx_sdio_gpios: pmx-sdio-gpios {
marvell,pins = "mpp37", "mpp38"; marvell,pins = "mpp37", "mpp38";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -33,10 +34,7 @@ pmx_sdio_gpios: pmx-sdio-gpios { ...@@ -33,10 +34,7 @@ pmx_sdio_gpios: pmx-sdio-gpios {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>; status = "okay";
pinctrl-names = "default";
clock-frequency = <200000000>;
status = "ok";
}; };
sata@80000 { sata@80000 {
...@@ -59,8 +57,6 @@ mvsdio@90000 { ...@@ -59,8 +57,6 @@ mvsdio@90000 {
}; };
&nand { &nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
chip-delay = <25>; chip-delay = <25>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/kirkwood-dns320.dts
View file @ 61e810d3
...@@ -13,6 +13,7 @@ memory { ...@@ -13,6 +13,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
gpio-leds { gpio-leds {
...@@ -51,8 +52,6 @@ serial@12000 { ...@@ -51,8 +52,6 @@ serial@12000 {
}; };
serial@12100 { serial@12100 {
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
}; };
......
arch/arm/boot/dts/kirkwood-dns325.dts
View file @ 61e810d3
...@@ -13,6 +13,7 @@ memory { ...@@ -13,6 +13,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
gpio-leds { gpio-leds {
......
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file @ 61e810d3
...@@ -50,7 +50,7 @@ gpio_poweroff { ...@@ -50,7 +50,7 @@ gpio_poweroff {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0 pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0
&pmx_present_sata1 &pmx_fan_tacho &pmx_present_sata1 &pmx_fan_tacho
...@@ -183,8 +183,6 @@ sata1_power: regulator@2 { ...@@ -183,8 +183,6 @@ sata1_power: regulator@2 {
}; };
&nand { &nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay"; status = "okay";
chip-delay = <35>; chip-delay = <35>;
......
arch/arm/boot/dts/kirkwood-dockstar.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10"; bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable { pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29"; marvell,pins = "mpp29";
marvell,function = "gpio"; marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-dreamplug.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_led_bluetooth: pmx-led-bluetooth { pmx_led_bluetooth: pmx-led-bluetooth {
marvell,pins = "mpp47"; marvell,pins = "mpp47";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -37,8 +38,6 @@ serial@12000 { ...@@ -37,8 +38,6 @@ serial@12000 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p40@0 { m25p40@0 {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/kirkwood-ds109.dts
View file @ 61e810d3
...@@ -25,6 +25,7 @@ memory { ...@@ -25,6 +25,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-32-35 { gpio-fan-150-32-35 {
......
arch/arm/boot/dts/kirkwood-ds110jv10.dts
View file @ 61e810d3
...@@ -25,6 +25,7 @@ memory { ...@@ -25,6 +25,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-32-35 { gpio-fan-150-32-35 {
......
arch/arm/boot/dts/kirkwood-ds111.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-1 { gpio-fan-100-15-35-1 {
......
arch/arm/boot/dts/kirkwood-ds112.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-1 { gpio-fan-100-15-35-1 {
......
arch/arm/boot/dts/kirkwood-ds209.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-32-35 { gpio-fan-150-32-35 {
......
arch/arm/boot/dts/kirkwood-ds210.dts
View file @ 61e810d3
...@@ -26,6 +26,7 @@ memory { ...@@ -26,6 +26,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-32-35 { gpio-fan-150-32-35 {
......
arch/arm/boot/dts/kirkwood-ds212.dts
View file @ 61e810d3
...@@ -27,6 +27,7 @@ memory { ...@@ -27,6 +27,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-1 { gpio-fan-100-15-35-1 {
......
arch/arm/boot/dts/kirkwood-ds212j.dts
View file @ 61e810d3
...@@ -25,6 +25,7 @@ memory { ...@@ -25,6 +25,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-32-35 { gpio-fan-100-32-35 {
......
arch/arm/boot/dts/kirkwood-ds409.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-15-18 { gpio-fan-150-15-18 {
......
arch/arm/boot/dts/kirkwood-ds409slim.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-32-35 { gpio-fan-150-32-35 {
......
arch/arm/boot/dts/kirkwood-ds411.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-1 { gpio-fan-100-15-35-1 {
......
arch/arm/boot/dts/kirkwood-ds411j.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-15-18 { gpio-fan-150-15-18 {
......
arch/arm/boot/dts/kirkwood-ds411slim.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-1 { gpio-fan-100-15-35-1 {
......
arch/arm/boot/dts/kirkwood-goflexnet.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10"; bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable { pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29"; marvell,pins = "mpp29";
marvell,function = "gpio"; marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_led_health_r: pmx-led-health-r { pmx_led_health_r: pmx-led-health-r {
marvell,pins = "mpp46"; marvell,pins = "mpp46";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -36,7 +37,6 @@ pmx_led_wmode_g: pmx-led-wmode-g { ...@@ -36,7 +37,6 @@ pmx_led_wmode_g: pmx-led-wmode-g {
}; };
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "ok"; status = "ok";
}; };
...@@ -101,13 +101,19 @@ &mdio { ...@@ -101,13 +101,19 @@ &mdio {
status = "okay"; status = "okay";
ethphy0: ethernet-phy@0 { ethphy0: ethernet-phy@0 {
compatible = "marvell,88e1121"; /* Marvell 88E1121R */
compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22";
reg = <0>; reg = <0>;
phy-connection-type = "rgmii-id";
}; };
ethphy1: ethernet-phy@1 { ethphy1: ethernet-phy@1 {
compatible = "marvell,88e1121"; /* Marvell 88E1121R */
compatible = "ethernet-phy-id0141.0cb0",
"ethernet-phy-ieee802.3-c22";
reg = <1>; reg = <1>;
phy-connection-type = "rgmii-id";
}; };
}; };
......
arch/arm/boot/dts/kirkwood-ib62x0.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_led_os_red: pmx-led-os-red { pmx_led_os_red: pmx-led-os-red {
marvell,pins = "mpp22"; marvell,pins = "mpp22";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -104,8 +105,6 @@ gpio_poweroff { ...@@ -104,8 +105,6 @@ gpio_poweroff {
&nand { &nand {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
......
arch/arm/boot/dts/kirkwood-iconnect.dts
View file @ 61e810d3
...@@ -14,6 +14,7 @@ memory { ...@@ -14,6 +14,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
linux,initrd-start = <0x4500040>; linux,initrd-start = <0x4500040>;
linux,initrd-end = <0x4800000>; linux,initrd-end = <0x4800000>;
}; };
...@@ -29,7 +30,7 @@ pcie@1,0 { ...@@ -29,7 +30,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_button_reset: pmx-button-reset { pmx_button_reset: pmx-button-reset {
marvell,pins = "mpp12"; marvell,pins = "mpp12";
marvell,function = "gpio"; marvell,function = "gpio";
......
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_led_sata_brt_ctrl_1 pinctrl-0 = < &pmx_led_sata_brt_ctrl_1
&pmx_led_sata_brt_ctrl_2 &pmx_led_sata_brt_ctrl_2
&pmx_led_backup_brt_ctrl_1 &pmx_led_backup_brt_ctrl_1
......
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >; pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -45,9 +46,7 @@ i2c@0 { ...@@ -45,9 +46,7 @@ i2c@0 {
}; };
&nand { &nand {
pinctrl-0 = <&pmx_nand>; status = "okay";
pinctrl-names = "default";
status = "ok";
chip-delay = <25>; chip-delay = <25>;
}; };
......
arch/arm/boot/dts/kirkwood-laplug.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -37,14 +38,10 @@ pcie@1,0 { ...@@ -37,14 +38,10 @@ pcie@1,0 {
ocp@f1000000 { ocp@f1000000 {
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
i2c@11000 { i2c@11000 {
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
eeprom@50 { eeprom@50 {
...@@ -54,7 +51,7 @@ eeprom@50 { ...@@ -54,7 +51,7 @@ eeprom@50 {
}; };
}; };
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable { pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp14"; marvell,pins = "mpp14";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -139,7 +136,6 @@ usb_power_front: regulator@3 { ...@@ -139,7 +136,6 @@ usb_power_front: regulator@3 {
&nand { &nand {
/* Total size : 512MB */ /* Total size : 512MB */
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
......
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View file @ 61e810d3
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
/ { / {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_power_hdd: pmx-power-hdd { pmx_power_hdd: pmx-power-hdd {
marvell,pins = "mpp10"; marvell,pins = "mpp10";
marvell,function = "gpo"; marvell,function = "gpo";
......
arch/arm/boot/dts/kirkwood-mplcec4.dts
View file @ 61e810d3
...@@ -14,6 +14,7 @@ memory { ...@@ -14,6 +14,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -27,7 +28,7 @@ pcie@1,0 { ...@@ -27,7 +28,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_led_health: pmx-led-health { pmx_led_health: pmx-led-health {
marvell,pins = "mpp7"; marvell,pins = "mpp7";
marvell,function = "gpo"; marvell,function = "gpo";
...@@ -90,9 +91,7 @@ eeprom@57 { ...@@ -90,9 +91,7 @@ eeprom@57 {
}; };
serial@12000 { serial@12000 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
rtc@10300 { rtc@10300 {
...@@ -163,8 +162,6 @@ misc { ...@@ -163,8 +162,6 @@ misc {
}; };
&nand { &nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay"; status = "okay";
partition@0 { partition@0 {
......
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View file @ 61e810d3
...@@ -28,10 +28,11 @@ memory { ...@@ -28,10 +28,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl@10000 { pin-controller@10000 {
pmx_usb_led: pmx-usb-led { pmx_usb_led: pmx-usb-led {
marvell,pins = "mpp12"; marvell,pins = "mpp12";
marvell,function = "gpo"; marvell,function = "gpo";
...@@ -49,8 +50,6 @@ pmx_keys: pmx-keys { ...@@ -49,8 +50,6 @@ pmx_keys: pmx-keys {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
...@@ -64,10 +63,7 @@ flash@0 { ...@@ -64,10 +63,7 @@ flash@0 {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>; status = "okay";
pinctrl-names = "default";
clock-frequency = <200000000>;
status = "ok";
}; };
ehci@50000 { ehci@50000 {
......
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View file @ 61e810d3
...@@ -25,6 +25,7 @@ memory { /* 256 MB */ ...@@ -25,6 +25,7 @@ memory { /* 256 MB */
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -38,7 +39,7 @@ pcie@1,0 { ...@@ -38,7 +39,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power { pmx_button_power: pmx-button-power {
marvell,pins = "mpp47"; marvell,pins = "mpp47";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -112,8 +113,6 @@ g762: g762@3e { ...@@ -112,8 +113,6 @@ g762: g762@3e {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View file @ 61e810d3
...@@ -25,6 +25,7 @@ memory { /* 256 MB */ ...@@ -25,6 +25,7 @@ memory { /* 256 MB */
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -40,7 +41,7 @@ pcie@1,0 { ...@@ -40,7 +41,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power { pmx_button_power: pmx-button-power {
marvell,pins = "mpp47"; marvell,pins = "mpp47";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -119,8 +120,6 @@ g762: g762@3e { ...@@ -119,8 +120,6 @@ g762: g762@3e {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View file @ 61e810d3
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
/ { / {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_ns2_sata0: pmx-ns2-sata0 { pmx_ns2_sata0: pmx-ns2-sata0 {
marvell,pins = "mpp21"; marvell,pins = "mpp21";
marvell,function = "sata0"; marvell,function = "sata0";
...@@ -19,14 +20,10 @@ pmx_ns2_sata1: pmx-ns2-sata1 { ...@@ -19,14 +20,10 @@ pmx_ns2_sata1: pmx-ns2-sata1 {
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
...@@ -45,8 +42,6 @@ partition@0 { ...@@ -45,8 +42,6 @@ partition@0 {
}; };
i2c@11000 { i2c@11000 {
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
eeprom@50 { eeprom@50 {
......
arch/arm/boot/dts/kirkwood-nsa310.dts
View file @ 61e810d3
/dts-v1/; /dts-v1/;
#include "kirkwood-nsa310-common.dtsi" #include "kirkwood-nsa3x0-common.dtsi"
/ { / {
compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood"; compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
...@@ -12,6 +12,7 @@ memory { ...@@ -12,6 +12,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -25,7 +26,7 @@ pcie@1,0 { ...@@ -25,7 +26,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_unknown>; pinctrl-0 = <&pmx_unknown>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -59,26 +60,6 @@ pmx_led_sys_red: pmx-led-sys-red { ...@@ -59,26 +60,6 @@ pmx_led_sys_red: pmx-led-sys-red {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
pmx_led_hdd_green: pmx-led-hdd-green { pmx_led_hdd_green: pmx-led-hdd-green {
marvell,pins = "mpp41"; marvell,pins = "mpp41";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -94,10 +75,6 @@ pmx_unknown: pmx-unknown { ...@@ -94,10 +75,6 @@ pmx_unknown: pmx-unknown {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
}; };
i2c@11000 { i2c@11000 {
...@@ -110,30 +87,6 @@ adt7476: adt7476a@2e { ...@@ -110,30 +87,6 @@ adt7476: adt7476a@2e {
}; };
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
......
arch/arm/boot/dts/kirkwood-nsa310a.dts
View file @ 61e810d3
/dts-v1/; /dts-v1/;
#include "kirkwood-nsa310-common.dtsi" #include "kirkwood-nsa3x0-common.dtsi"
/* /*
* There are at least two different NSA310 designs. This variant does * There are at least two different NSA310 designs. This variant does
...@@ -17,10 +17,11 @@ memory { ...@@ -17,10 +17,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-names = "default"; pinctrl-names = "default";
pmx_led_esata_green: pmx-led-esata-green { pmx_led_esata_green: pmx-led-esata-green {
...@@ -38,11 +39,6 @@ pmx_led_usb_green: pmx-led-usb-green { ...@@ -38,11 +39,6 @@ pmx_led_usb_green: pmx-led-usb-green {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_usb_power_off: pmx-usb-power-off {
marvell,pins = "mpp21";
marvell,function = "gpio";
};
pmx_led_sys_green: pmx-led-sys-green { pmx_led_sys_green: pmx-led-sys-green {
marvell,pins = "mpp28"; marvell,pins = "mpp28";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -53,26 +49,6 @@ pmx_led_sys_red: pmx-led-sys-red { ...@@ -53,26 +49,6 @@ pmx_led_sys_red: pmx-led-sys-red {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
pmx_led_hdd_green: pmx-led-hdd-green { pmx_led_hdd_green: pmx-led-hdd-green {
marvell,pins = "mpp41"; marvell,pins = "mpp41";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -83,11 +59,6 @@ pmx_led_hdd_red: pmx-led-hdd-red { ...@@ -83,11 +59,6 @@ pmx_led_hdd_red: pmx-led-hdd-red {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
}; };
i2c@11000 { i2c@11000 {
...@@ -100,28 +71,6 @@ lm85: lm85@2e { ...@@ -100,28 +71,6 @@ lm85: lm85@2e {
}; };
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
......
arch/arm/boot/dts/kirkwood-nsa320.dts 0 → 100644
View file @ 61e810d3
/* Device tree file for the Zyxel NSA 320 NAS box.
*
* Copyright (c) 2014, Adam Baker <linux@baker-net.org.uk>
*
* 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.
*
* Based upon the board setup file created by Peter Schildmann */
/dts-v1/;
#include "kirkwood-nsa3x0-common.dtsi"
/ {
model = "Zyxel NSA320";
compatible = "zyxel,nsa320", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory {
device_type = "memory";
reg = <0x00000000 0x20000000>;
};
chosen {
bootargs = "console=ttyS0,115200";
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
/* SATA Activity and Present pins are not connected */
pmx_sata0: pmx-sata0 {
marvell,pins ;
marvell,function = "sata0";
};
pmx_sata1: pmx-sata1 {
marvell,pins ;
marvell,function = "sata1";
};
pmx_led_hdd2_green: pmx-led-hdd2-green {
marvell,pins = "mpp12";
marvell,function = "gpio";
};
pmx_led_hdd2_red: pmx-led-hdd2-red {
marvell,pins = "mpp13";
marvell,function = "gpio";
};
pmx_mcu_data: pmx-mcu-data {
marvell,pins = "mpp14";
marvell,function = "gpio";
};
pmx_led_usb_green: pmx-led-usb-green {
marvell,pins = "mpp15";
marvell,function = "gpio";
};
pmx_mcu_clk: pmx-mcu-clk {
marvell,pins = "mpp16";
marvell,function = "gpio";
};
pmx_mcu_act: pmx-mcu-act {
marvell,pins = "mpp17";
marvell,function = "gpio";
};
pmx_led_sys_green: pmx-led-sys-green {
marvell,pins = "mpp28";
marvell,function = "gpio";
};
pmx_led_sys_orange: pmx-led-sys-orange {
marvell,pins = "mpp29";
marvell,function = "gpio";
};
pmx_led_hdd1_green: pmx-led-hdd1-green {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
pmx_led_hdd1_red: pmx-led-hdd1-red {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
pmx_htp: pmx-htp {
marvell,pins = "mpp43";
marvell,function = "gpio";
};
/* Buzzer needs to be switched at around 1kHz so is
not compatible with the gpio-beeper driver. */
pmx_buzzer: pmx-buzzer {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
pmx_vid_b1: pmx-vid-b1 {
marvell,pins = "mpp45";
marvell,function = "gpio";
};
pmx_power_resume_data: pmx-power-resume-data {
marvell,pins = "mpp47";
marvell,function = "gpio";
};
pmx_power_resume_clk: pmx-power-resume-clk {
marvell,pins = "mpp49";
marvell,function = "gpio";
};
};
i2c@11000 {
status = "okay";
pcf8563: pcf8563@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
};
};
};
regulators {
usb0_power: regulator@1 {
enable-active-high;
};
};
gpio-leds {
compatible = "gpio-leds";
pinctrl-0 = <&pmx_led_hdd2_green &pmx_led_hdd2_red
&pmx_led_usb_green
&pmx_led_sys_green &pmx_led_sys_orange
&pmx_led_copy_green &pmx_led_copy_red
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
pinctrl-names = "default";
green-sys {
label = "nsa320:green:sys";
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
};
orange-sys {
label = "nsa320:orange:sys";
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
green-hdd1 {
label = "nsa320:green:hdd1";
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
};
red-hdd1 {
label = "nsa320:red:hdd1";
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
};
green-hdd2 {
label = "nsa320:green:hdd2";
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
};
red-hdd2 {
label = "nsa320:red:hdd2";
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
green-usb {
label = "nsa320:green:usb";
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
green-copy {
label = "nsa320:green:copy";
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
};
red-copy {
label = "nsa320:red:copy";
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
};
};
/* The following pins are currently not assigned to a driver,
some of them should be configured as inputs.
pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act
&pmx_htp &pmx_vid_b1
&pmx_power_resume_data &pmx_power_resume_clk>; */
};
&mdio {
status = "okay";
ethphy0: ethernet-phy@1 {
reg = <1>;
};
};
&eth0 {
status = "okay";
ethernet0-port@0 {
phy-handle = <&ethphy0>;
};
};
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi → arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
View file @ 61e810d3
...@@ -5,17 +5,42 @@ / { ...@@ -5,17 +5,42 @@ / {
model = "ZyXEL NSA310"; model = "ZyXEL NSA310";
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_usb_power_off: pmx-usb-power-off { pmx_usb_power: pmx-usb-power {
marvell,pins = "mpp21"; marvell,pins = "mpp21";
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_pwr_off: pmx-pwr-off { pmx_pwr_off: pmx-pwr-off {
marvell,pins = "mpp48"; marvell,pins = "mpp48";
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp36";
marvell,function = "gpio";
};
pmx_btn_copy: pmx-btn-copy {
marvell,pins = "mpp37";
marvell,function = "gpio";
};
pmx_btn_power: pmx-btn-power {
marvell,pins = "mpp46";
marvell,function = "gpio";
};
pmx_led_copy_green: pmx-led-copy-green {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_copy_red: pmx-led-copy-red {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
}; };
serial@12000 { serial@12000 {
...@@ -43,17 +68,42 @@ gpio_poweroff { ...@@ -43,17 +68,42 @@ gpio_poweroff {
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
}; };
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-0 = <&pmx_usb_power_off>; pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default"; pinctrl-names = "default";
usb0_power_off: regulator@1 { usb0_power: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; reg = <1>;
regulator-name = "USB Power Off"; regulator-name = "USB Power";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-always-on; regulator-always-on;
......
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View file @ 61e810d3
...@@ -14,19 +14,16 @@ memory { ...@@ -14,19 +14,16 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
serial@12000 { serial@12000 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
serial@12100 { serial@12100 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
}; };
sata@80000 { sata@80000 {
...@@ -36,8 +33,6 @@ sata@80000 { ...@@ -36,8 +33,6 @@ sata@80000 {
i2c@11100 { i2c@11100 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
s35390a: s35390a@30 { s35390a: s35390a@30 {
compatible = "sii,s35390a"; compatible = "sii,s35390a";
...@@ -45,7 +40,7 @@ s35390a: s35390a@30 { ...@@ -45,7 +40,7 @@ s35390a: s35390a@30 {
}; };
}; };
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -133,8 +128,6 @@ button@1 { ...@@ -133,8 +128,6 @@ button@1 {
&nand { &nand {
chip-delay = <25>; chip-delay = <25>;
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 { partition@0 {
label = "uboot"; label = "uboot";
......
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View file @ 61e810d3
...@@ -26,19 +26,16 @@ memory { ...@@ -26,19 +26,16 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
serial@12000 { serial@12000 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
serial@12100 { serial@12100 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
}; };
sata@80000 { sata@80000 {
...@@ -48,8 +45,6 @@ sata@80000 { ...@@ -48,8 +45,6 @@ sata@80000 {
i2c@11100 { i2c@11100 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_twsi1>;
pinctrl-names = "default";
s24c02: s24c02@50 { s24c02: s24c02@50 {
compatible = "atmel,24c02"; compatible = "atmel,24c02";
...@@ -57,7 +52,7 @@ s24c02: s24c02@50 { ...@@ -57,7 +52,7 @@ s24c02: s24c02@50 {
}; };
}; };
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -109,13 +104,6 @@ pmx_leds: pmx-leds { ...@@ -109,13 +104,6 @@ pmx_leds: pmx-leds {
marvell,pins = "mpp41", "mpp42", "mpp43"; marvell,pins = "mpp41", "mpp42", "mpp43";
marvell,function = "gpio"; marvell,function = "gpio";
}; };
pmx_ge1: pmx-ge1 {
marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
"mpp24", "mpp25", "mpp26", "mpp27",
"mpp30", "mpp31", "mpp32", "mpp33";
marvell,function = "ge1";
};
}; };
}; };
...@@ -158,8 +146,6 @@ button@1 { ...@@ -158,8 +146,6 @@ button@1 {
&nand { &nand {
chip-delay = <25>; chip-delay = <25>;
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 { partition@0 {
label = "uboot"; label = "uboot";
...@@ -213,8 +199,6 @@ ethernet0-port@0 { ...@@ -213,8 +199,6 @@ ethernet0-port@0 {
&eth1 { &eth1 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_ge1>;
pinctrl-names = "default";
ethernet1-port@0 { ethernet1-port@0 {
phy-handle = <&ethphy1>; phy-handle = <&ethphy1>;
}; };
......
arch/arm/boot/dts/kirkwood-rd88f6192.dts
View file @ 61e810d3
...@@ -26,6 +26,7 @@ memory { ...@@ -26,6 +26,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -39,7 +40,7 @@ pcie@1,0 { ...@@ -39,7 +40,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>; pinctrl-0 = <&pmx_usb_power>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -56,8 +57,6 @@ serial@12000 { ...@@ -56,8 +57,6 @@ serial@12000 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p128@0 { m25p128@0 {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View file @ 61e810d3
...@@ -22,6 +22,7 @@ memory { ...@@ -22,6 +22,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -35,7 +36,7 @@ pcie@1,0 { ...@@ -35,7 +36,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_sdio_cd>; pinctrl-0 = <&pmx_sdio_cd>;
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-rs212.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-3 { gpio-fan-100-15-35-3 {
......
arch/arm/boot/dts/kirkwood-rs409.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-150-15-18 { gpio-fan-150-15-18 {
......
arch/arm/boot/dts/kirkwood-rs411.dts
View file @ 61e810d3
...@@ -24,6 +24,7 @@ memory { ...@@ -24,6 +24,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
gpio-fan-100-15-35-3 { gpio-fan-100-15-35-3 {
......
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
View file @ 61e810d3
...@@ -17,10 +17,11 @@ memory { ...@@ -17,10 +17,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_usb_power_enable: pmx-usb-power-enable { pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29"; marvell,pins = "mpp29";
...@@ -44,8 +45,6 @@ pmx_sdio_wp: pmx-sdio-wp { ...@@ -44,8 +45,6 @@ pmx_sdio_wp: pmx-sdio-wp {
}; };
}; };
serial@12000 { serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay"; status = "okay";
}; };
}; };
...@@ -72,8 +71,6 @@ usb_power: regulator@1 { ...@@ -72,8 +71,6 @@ usb_power: regulator@1 {
}; };
&nand { &nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay"; status = "okay";
partition@0 { partition@0 {
......
arch/arm/boot/dts/kirkwood-synology.dtsi
View file @ 61e810d3
...@@ -25,7 +25,7 @@ pcie2: pcie@2,0 { ...@@ -25,7 +25,7 @@ pcie2: pcie@2,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pmx_alarmled_12: pmx-alarmled-12 { pmx_alarmled_12: pmx-alarmled-12 {
marvell,pins = "mpp12"; marvell,pins = "mpp12";
marvell,function = "gpio"; marvell,function = "gpio";
...@@ -213,8 +213,6 @@ rtc@10300 { ...@@ -213,8 +213,6 @@ rtc@10300 {
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p80@0 { m25p80@0 {
#address-cells = <1>; #address-cells = <1>;
...@@ -259,8 +257,6 @@ partition@003f0000 { ...@@ -259,8 +257,6 @@ partition@003f0000 {
i2c@11000 { i2c@11000 {
status = "okay"; status = "okay";
clock-frequency = <400000>; clock-frequency = <400000>;
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
rs5c372: rs5c372@32 { rs5c372: rs5c372@32 {
status = "disabled"; status = "disabled";
...@@ -277,14 +273,10 @@ s35390a: s35390a@30 { ...@@ -277,14 +273,10 @@ s35390a: s35390a@30 {
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
serial@12100 { serial@12100 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
}; };
poweroff@12100 { poweroff@12100 {
......
arch/arm/boot/dts/kirkwood-t5325.dts
View file @ 61e810d3
...@@ -27,6 +27,7 @@ memory { ...@@ -27,6 +27,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -40,7 +41,7 @@ pcie@1,0 { ...@@ -40,7 +41,7 @@ pcie@1,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_i2s &pmx_sysrst>; pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -64,10 +65,6 @@ pmx_usb_sata_power_enable: pmx-usb-sata-power-enable { ...@@ -64,10 +65,6 @@ pmx_usb_sata_power_enable: pmx-usb-sata-power-enable {
marvell,function = "gpio"; marvell,function = "gpio";
}; };
/*
* Redefined from kirkwood-6281.dtsi, because
* we don't use SPI CS on MPP0, but on MPP7.
*/
pmx_spi: pmx-spi { pmx_spi: pmx-spi {
marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7"; marvell,pins = "mpp1", "mpp2", "mpp3", "mpp7";
marvell,function = "spi"; marvell,function = "spi";
...@@ -86,8 +83,6 @@ pmx_i2s: pmx-i2s { ...@@ -86,8 +83,6 @@ pmx_i2s: pmx-i2s {
}; };
spi@10600 { spi@10600 {
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "okay"; status = "okay";
flash@0 { flash@0 {
...@@ -131,6 +126,9 @@ i2c@11000 { ...@@ -131,6 +126,9 @@ i2c@11000 {
alc5621: alc5621@1a { alc5621: alc5621@1a {
compatible = "realtek,alc5621"; compatible = "realtek,alc5621";
reg = <0x1a>; reg = <0x1a>;
#sound-dai-cells = <0>;
add-ctrl = <0x3700>;
jack-det-ctrl = <0x4810>;
}; };
}; };
...@@ -189,6 +187,31 @@ gpio_poweroff { ...@@ -189,6 +187,31 @@ gpio_poweroff {
gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
}; };
sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,routing =
"Headphone Jack", "HPL",
"Headphone Jack", "HPR",
"Speaker", "SPKOUT",
"Speaker", "SPKOUTN",
"MIC1", "Mic Jack",
"MIC2", "Mic Jack";
simple-audio-card,widgets =
"Headphone", "Headphone Jack",
"Speaker", "Speaker",
"Microphone", "Mic Jack";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,cpu {
sound-dai = <&audio>;
};
simple-audio-card,codec {
sound-dai = <&alc5621>;
};
};
}; };
&mdio { &mdio {
......
arch/arm/boot/dts/kirkwood-topkick.dts
View file @ 61e810d3
...@@ -14,10 +14,11 @@ memory { ...@@ -14,10 +14,11 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8 earlyprintk"; bootargs = "console=ttyS0,115200n8 earlyprintk";
stdout-path = &uart0;
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
/* /*
* Switch positions * Switch positions
* *
...@@ -85,9 +86,7 @@ pmx_led_wifi_yellow: pmx-led-wifi-yellow { ...@@ -85,9 +86,7 @@ pmx_led_wifi_yellow: pmx-led-wifi-yellow {
}; };
serial@12000 { serial@12000 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
sata@80000 { sata@80000 {
...@@ -96,9 +95,7 @@ sata@80000 { ...@@ -96,9 +95,7 @@ sata@80000 {
}; };
i2c@11000 { i2c@11000 {
status = "ok"; status = "okay";
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
}; };
mvsdio@90000 { mvsdio@90000 {
...@@ -175,8 +172,6 @@ sata0_power: regulator@1 { ...@@ -175,8 +172,6 @@ sata0_power: regulator@1 {
&nand { &nand {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
......
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View file @ 61e810d3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
/ { / {
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>; pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View file @ 61e810d3
...@@ -16,7 +16,7 @@ pcie@2,0 { ...@@ -16,7 +16,7 @@ pcie@2,0 {
}; };
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_ram_size &pmx_board_id>; pinctrl-0 = <&pmx_ram_size &pmx_board_id>;
pinctrl-names = "default"; pinctrl-names = "default";
......
arch/arm/boot/dts/kirkwood-ts219.dtsi
View file @ 61e810d3
...@@ -9,6 +9,7 @@ memory { ...@@ -9,6 +9,7 @@ memory {
chosen { chosen {
bootargs = "console=ttyS0,115200n8"; bootargs = "console=ttyS0,115200n8";
stdout-path = &uart0;
}; };
mbus { mbus {
...@@ -25,8 +26,6 @@ ocp@f1000000 { ...@@ -25,8 +26,6 @@ ocp@f1000000 {
i2c@11000 { i2c@11000 {
status = "okay"; status = "okay";
clock-frequency = <400000>; clock-frequency = <400000>;
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
s35390a: s35390a@30 { s35390a: s35390a@30 {
compatible = "s35390a"; compatible = "s35390a";
...@@ -34,16 +33,10 @@ s35390a: s35390a@30 { ...@@ -34,16 +33,10 @@ s35390a: s35390a@30 {
}; };
}; };
serial@12000 { serial@12000 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
serial@12100 { serial@12100 {
clock-frequency = <200000000>;
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
}; };
poweroff@12100 { poweroff@12100 {
compatible = "qnap,power-off"; compatible = "qnap,power-off";
...@@ -52,8 +45,6 @@ poweroff@12100 { ...@@ -52,8 +45,6 @@ poweroff@12100 {
}; };
spi@10600 { spi@10600 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
m25p128@0 { m25p128@0 {
#address-cells = <1>; #address-cells = <1>;
......
arch/arm/boot/dts/kirkwood-ts419.dtsi
View file @ 61e810d3
...@@ -14,7 +14,7 @@ / { ...@@ -14,7 +14,7 @@ / {
compatible = "qnap,ts419", "marvell,kirkwood"; compatible = "qnap,ts419", "marvell,kirkwood";
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pin-controller@10000 {
pinctrl-names = "default"; pinctrl-names = "default";
pmx_USB_copy_button: pmx-USB-copy-button { pmx_USB_copy_button: pmx-USB-copy-button {
......
arch/arm/boot/dts/kirkwood.dtsi
View file @ 61e810d3
...@@ -40,7 +40,7 @@ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */ ...@@ -40,7 +40,7 @@ MBUS_ID(0x03, 0x01) 0 0xf5000000 0x10000 /* crypto sram */
pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */ pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */ pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
crypto@0301 { cesa: crypto@0301 {
compatible = "marvell,orion-crypto"; compatible = "marvell,orion-crypto";
reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>, reg = <MBUS_ID(0xf0, 0x01) 0x30000 0x10000>,
<MBUS_ID(0x03, 0x01) 0 0x800>; <MBUS_ID(0x03, 0x01) 0 0x800>;
...@@ -61,6 +61,8 @@ nand: nand@012f { ...@@ -61,6 +61,8 @@ nand: nand@012f {
chip-delay = <25>; chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */ /* set partition map and/or chip-delay in board dts */
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -71,13 +73,59 @@ ocp@f1000000 { ...@@ -71,13 +73,59 @@ ocp@f1000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
pinctrl: pin-controller@10000 {
/* set compatible property in SoC file */
reg = <0x10000 0x20>;
pmx_ge1: pmx-ge1 {
marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
"mpp24", "mpp25", "mpp26", "mpp27",
"mpp30", "mpp31", "mpp32", "mpp33";
marvell,function = "ge1";
};
pmx_nand: pmx-nand {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
"mpp4", "mpp5", "mpp18", "mpp19";
marvell,function = "nand";
};
/*
* Default SPI0 pinctrl setting with CSn on mpp0,
* overwrite marvell,pins on board level if required.
*/
pmx_spi: pmx-spi {
marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
marvell,function = "spi";
};
pmx_twsi0: pmx-twsi0 {
marvell,pins = "mpp8", "mpp9";
marvell,function = "twsi0";
};
/*
* Default UART pinctrl setting without RTS/CTS,
* overwrite marvell,pins on board level if required.
*/
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
};
pmx_uart1: pmx-uart1 {
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
};
core_clk: core-clocks@10030 { core_clk: core-clocks@10030 {
compatible = "marvell,kirkwood-core-clock"; compatible = "marvell,kirkwood-core-clock";
reg = <0x10030 0x4>; reg = <0x10030 0x4>;
#clock-cells = <1>; #clock-cells = <1>;
}; };
spi@10600 { spi0: spi@10600 {
compatible = "marvell,orion-spi"; compatible = "marvell,orion-spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -85,6 +133,8 @@ spi@10600 { ...@@ -85,6 +133,8 @@ spi@10600 {
interrupts = <23>; interrupts = <23>;
reg = <0x10600 0x28>; reg = <0x10600 0x28>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_spi>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
...@@ -120,24 +170,30 @@ i2c0: i2c@11000 { ...@@ -120,24 +170,30 @@ i2c0: i2c@11000 {
interrupts = <29>; interrupts = <29>;
clock-frequency = <100000>; clock-frequency = <100000>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
serial@12000 { uart0: serial@12000 {
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0x12000 0x100>; reg = <0x12000 0x100>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <33>; interrupts = <33>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
serial@12100 { uart1: serial@12100 {
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0x12100 0x100>; reg = <0x12100 0x100>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <34>; interrupts = <34>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
}; };
...@@ -146,7 +202,7 @@ mbusc: mbus-controller@20000 { ...@@ -146,7 +202,7 @@ mbusc: mbus-controller@20000 {
reg = <0x20000 0x80>, <0x1500 0x20>; reg = <0x20000 0x80>, <0x1500 0x20>;
}; };
system-controller@20000 { sysc: system-controller@20000 {
compatible = "marvell,orion-system-controller"; compatible = "marvell,orion-system-controller";
reg = <0x20000 0x120>; reg = <0x20000 0x120>;
}; };
...@@ -196,7 +252,7 @@ wdt: watchdog-timer@20300 { ...@@ -196,7 +252,7 @@ wdt: watchdog-timer@20300 {
status = "okay"; status = "okay";
}; };
ehci@50000 { usb0: ehci@50000 {
compatible = "marvell,orion-ehci"; compatible = "marvell,orion-ehci";
reg = <0x50000 0x1000>; reg = <0x50000 0x1000>;
interrupts = <19>; interrupts = <19>;
...@@ -204,7 +260,7 @@ ehci@50000 { ...@@ -204,7 +260,7 @@ ehci@50000 {
status = "okay"; status = "okay";
}; };
xor@60800 { dma0: xor@60800 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60800 0x100 reg = <0x60800 0x100
0x60A00 0x100>; 0x60A00 0x100>;
...@@ -224,7 +280,7 @@ xor01 { ...@@ -224,7 +280,7 @@ xor01 {
}; };
}; };
xor@60900 { dma1: xor@60900 {
compatible = "marvell,orion-xor"; compatible = "marvell,orion-xor";
reg = <0x60900 0x100 reg = <0x60900 0x100
0x60B00 0x100>; 0x60B00 0x100>;
...@@ -282,6 +338,8 @@ eth1: ethernet-controller@76000 { ...@@ -282,6 +338,8 @@ eth1: ethernet-controller@76000 {
reg = <0x76000 0x4000>; reg = <0x76000 0x4000>;
clocks = <&gate_clk 19>; clocks = <&gate_clk 19>;
marvell,tx-checksum-limit = <1600>; marvell,tx-checksum-limit = <1600>;
pinctrl-0 = <&pmx_ge1>;
pinctrl-names = "default";
status = "disabled"; status = "disabled";
ethernet1-port@0 { ethernet1-port@0 {
...@@ -314,6 +372,7 @@ sata_phy1: sata-phy@84000 { ...@@ -314,6 +372,7 @@ sata_phy1: sata-phy@84000 {
audio0: audio-controller@a0000 { audio0: audio-controller@a0000 {
compatible = "marvell,kirkwood-audio"; compatible = "marvell,kirkwood-audio";
#sound-dai-cells = <0>;
reg = <0xa0000 0x2210>; reg = <0xa0000 0x2210>;
interrupts = <24>; interrupts = <24>;
clocks = <&gate_clk 9>; clocks = <&gate_clk 9>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7