mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
61e810d364
- 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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABAgAGBQJTa6c8AAoJEP45WPkGe8ZnwB8P/0jFC/tWujz/ndmri/lx8+pi
rRzyuHg2MCG81lAsJD2dvCh1IWqSg4YM3JWGjiqTNDVn526iVnp9FuJ8SmLiursL
KG0P1CX+uFqXY181DZBi1OFy3bIz2T/brrA48r6tAVoO3IiZ9v5UnaNz/QokCM+Z
Yrx1d8sSi5i5/1IqycPOS6TpZ9WcKXAgJFPv7FnvPtKnOxWir7lMW609zCdc54yg
vx/UQiBIMqgsgNYnwHIe4CjRcjgrg6f4i1Y10XHFK++w3vo9B4lZM67FKfv/Lslq
z7zWC74v5/lA+SBW5Wb9fWqRxdMEcg8AtA1gQ4qc5phMrVSUZwFRp701goCLhf8j
t9Hmf5fcVoVLGDTpbcoCuXYCD512VwP5/rv3OtrJ8hGiCajt7JegiRd66TgM6YhQ
awf2Ss3xEWsmDjSijKN4/zJfn9zzCFwRjdsjBrpXDmi8XH73Obt2Hug/koa1rr86
wFynL2KWkAmetPXFutOkU17zeOPZ4fs/oloCxpRO2jC8gaWLImO0jiCyMFZYEI4K
bhIQjhD/rGPPnc4QyQ6Zln9f055tSlH/k5jycp2sGvqmbefTGawvLozi11wu1TXa
aUeT3dRzXiK4qFn54YkgHwRM6Kp/pZMRXeeW9N27at+/CE9TIE1ZfR4jrTiXf7XS
70CTD4ElIKbA7fI5gXnS
=qPr0
-----END PGP SIGNATURE-----
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>
115 lines
2.2 KiB
Plaintext
115 lines
2.2 KiB
Plaintext
/dts-v1/;
|
|
|
|
#include "kirkwood-nsa3x0-common.dtsi"
|
|
|
|
/*
|
|
* There are at least two different NSA310 designs. This variant does
|
|
* not have the red USB Led.
|
|
*/
|
|
|
|
/ {
|
|
compatible = "zyxel,nsa310a", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x10000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200";
|
|
stdout-path = &uart0;
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pin-controller@10000 {
|
|
pinctrl-names = "default";
|
|
|
|
pmx_led_esata_green: pmx-led-esata-green {
|
|
marvell,pins = "mpp12";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_esata_red: pmx-led-esata-red {
|
|
marvell,pins = "mpp13";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_usb_green: pmx-led-usb-green {
|
|
marvell,pins = "mpp15";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_sys_green: pmx-led-sys-green {
|
|
marvell,pins = "mpp28";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_sys_red: pmx-led-sys-red {
|
|
marvell,pins = "mpp29";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_hdd_green: pmx-led-hdd-green {
|
|
marvell,pins = "mpp41";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_hdd_red: pmx-led-hdd-red {
|
|
marvell,pins = "mpp42";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
};
|
|
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
lm85: lm85@2e {
|
|
compatible = "national,lm85";
|
|
reg = <0x2e>;
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
|
|
green-sys {
|
|
label = "nsa310:green:sys";
|
|
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
red-sys {
|
|
label = "nsa310:red:sys";
|
|
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
green-hdd {
|
|
label = "nsa310:green:hdd";
|
|
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
red-hdd {
|
|
label = "nsa310:red:hdd";
|
|
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
green-esata {
|
|
label = "nsa310:green:esata";
|
|
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
red-esata {
|
|
label = "nsa310:red:esata";
|
|
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
green-usb {
|
|
label = "nsa310:green:usb";
|
|
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
green-copy {
|
|
label = "nsa310:green:copy";
|
|
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
red-copy {
|
|
label = "nsa310:red:copy";
|
|
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
};
|