diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-19 21:55:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-19 21:55:03 -0700 |
| commit | 61e810d36416effcfe25bbbba4f126c4b8462f3c (patch) | |
| tree | ce8028c68b70252841bbdc5dd6a38fb75914701d /arch/arm/boot/dts/kirkwood-b3.dts | |
| parent | 2bfac3a551978c4953f659e1bd18d58c3c249f64 (diff) | |
| parent | 191825c38eafeda033a73338f5a710fa6fd5b3d6 (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-b3.dts')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-b3.dts | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/kirkwood-b3.dts b/arch/arm/boot/dts/kirkwood-b3.dts index 6becedebaa4e..c9247f8672ae 100644 --- a/arch/arm/boot/dts/kirkwood-b3.dts +++ b/arch/arm/boot/dts/kirkwood-b3.dts @@ -30,6 +30,7 @@ chosen { bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; }; mbus { @@ -44,7 +45,7 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { + pinctrl: pin-controller@10000 { pmx_button_power: pmx-button-power { marvell,pins = "mpp39"; marvell,function = "gpio"; @@ -69,8 +70,6 @@ spi@10600 { status = "okay"; - pinctrl-0 = <&pmx_spi>; - pinctrl-names = "default"; m25p16@0 { #address-cells = <1>; @@ -113,8 +112,6 @@ * UART0_TX = Testpoint 66 * See the Excito Wiki for more details. */ - pinctrl-0 = <&pmx_uart0>; - pinctrl-names = "default"; status = "okay"; }; |