mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +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>
172 lines
3.2 KiB
Plaintext
172 lines
3.2 KiB
Plaintext
/*
|
|
* Copyright (C) 2013 Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
/dts-v1/;
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
#include <dt-bindings/input/input.h>
|
|
#include "kirkwood.dtsi"
|
|
#include "kirkwood-6192.dtsi"
|
|
|
|
/ {
|
|
model = "LaCie LaPlug";
|
|
compatible = "lacie,laplug", "marvell,kirkwood-88f6192", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x8000000>; /* 128 MB */
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
stdout-path = &uart0;
|
|
};
|
|
|
|
mbus {
|
|
pcie-controller {
|
|
status = "okay";
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
serial@12000 {
|
|
status = "okay";
|
|
};
|
|
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
eeprom@50 {
|
|
compatible = "atmel,24c04";
|
|
pagesize = <16>;
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
|
|
pinctrl: pin-controller@10000 {
|
|
pmx_usb_power_enable: pmx-usb-power-enable {
|
|
marvell,pins = "mpp14";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
|
|
button@1{
|
|
label = "Power push button";
|
|
linux,code = <KEY_POWER>;
|
|
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
|
|
red-fail {
|
|
label = "laplug_v2:red:power";
|
|
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
blue-power {
|
|
label = "laplug_v2:blue:power";
|
|
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
|
|
linux,default-trigger = "default-on";
|
|
};
|
|
};
|
|
|
|
gpio_poweroff {
|
|
compatible = "gpio-poweroff";
|
|
gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
regulators {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_usb_power_enable>;
|
|
pinctrl-names = "default";
|
|
|
|
usb_power_back1: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
reg = <1>;
|
|
regulator-name = "USB Power Back 1";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 15 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
usb_power_back2: regulator@2 {
|
|
compatible = "regulator-fixed";
|
|
reg = <2>;
|
|
regulator-name = "USB Power Back 2";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 28 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
usb_power_front: regulator@3 {
|
|
compatible = "regulator-fixed";
|
|
reg = <3>;
|
|
regulator-name = "USB Power Front";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio1 3 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&nand {
|
|
/* Total size : 512MB */
|
|
status = "okay";
|
|
|
|
partition@0 {
|
|
label = "u-boot";
|
|
reg = <0x0 0x100000>; /* 1MB */
|
|
read-only;
|
|
};
|
|
|
|
partition@100000 {
|
|
label = "uImage";
|
|
reg = <0x100000 0x1000000>; /* 16MB */
|
|
};
|
|
|
|
partition@1100000 {
|
|
label = "rootfs";
|
|
reg = <0x1100000 0x1EF00000>; /* 495MB */
|
|
};
|
|
};
|
|
|
|
&mdio {
|
|
status = "okay";
|
|
|
|
ethphy0: ethernet-phy@0 {
|
|
device_type = "ethernet-phy";
|
|
reg = <0>;
|
|
};
|
|
};
|
|
|
|
ð0 {
|
|
status = "okay";
|
|
ethernet0-port@0 {
|
|
phy-handle = <ðphy0>;
|
|
};
|
|
};
|