tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
From Jason Cooper:
mvebu DT changes for v3.14

 - mvebu:
    - remove unneeded OS-specific properties from led nodes
    - add NAND controller to Armada boards
    - add sata leds to readynas 104
    - add gpio-poweroff to readynas duo v2

 - kirkwood:
    - comment cleanup in sheevaplug files
    - default pinctrl for sdio
    - sdio in guruplug is non-removable

 - orion5x:
    - typo fix

 - dove:
    - typo fix
    - add PMU interrupt controller and RTC interrupt via same

* tag 'mvebu-dt-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: Dove: Add RTC interrupt via PMU interrupt controller.
  ARM: Dove: Add DT node for PMU interrupt controller.
  ARM: mvebu: Add DT entry for ReadyNAS Duo v2 to use gpio-poweroff driver
  ARM: mvebu: Add RN104 SATA LEDs driven via NXP PCA9554 I2C to GPIO muxer
  ARM: kirkwood: mark guruplug sdio as non-removable
  ARM: kirkwood: provide pinctrl default to sdio nodes
  ARM: dove: Fix typo in device_type property of phy node
  ARM: orion5x: Fix typo in device_type property of phy node
  ARM: mvebu: Enable NAND controller in Armada 370 Mirabox
  ARM: mvebu: Enable NAND controller in Armada XP GP board
  ARM: mvebu: Add support for NAND controller in Armada 370/XP
  ARM: kirkwood: Cleanup comments in Sheevaplug dts files
  ARM: mvebu: dts: remove unneeded linux,default-state from led nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2013-12-03 17:07:28 -08:00
parent dab719392a bd22bb2391
commit 25e9cd462b
25 changed files with 121 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/armada-370-mirabox.dts
+23 -2
View File
@@ -74,13 +74,13 @@
green_pwr_led {
label = "mirabox:green:pwr";
gpios = <&gpio1 31 1>;
linux,default-trigger = "heartbeat";
default-state = "keep";
};
blue_stat_led {
label = "mirabox:blue:stat";
gpios = <&gpio2 0 1>;
linux,default-trigger = "cpu0";
default-state = "off";
};
green_stat_led {
@@ -139,6 +139,27 @@
reg = <0x25>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partition@0 {
label = "U-Boot";
reg = <0 0x400000>;
};
partition@400000 {
label = "Linux";
reg = <0x400000 0x400000>;
};
partition@800000 {
label = "Filesystem";
reg = <0x800000 0x3f800000>;
};
};
};
};
};
arch/arm/boot/dts/armada-370-netgear-rn102.dts
+1 -1
View File
@@ -138,7 +138,7 @@
blue_power_led {
label = "rn102:blue:pwr";
gpios = <&gpio1 25 1>; /* GPIO 57 Active Low */
linux,default-trigger = "heartbeat";
default-state = "keep";
};
green_sata1_led {
arch/arm/boot/dts/armada-370-netgear-rn104.dts
+32
View File
@@ -12,6 +12,7 @@
/dts-v1/;
#include "armada-370.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "NETGEAR ReadyNAS 104";
@@ -123,6 +124,13 @@
fan_startv = <1>;
pwm_polarity = <0>;
};
pca9554: pca9554@23 {
compatible = "nxp,pca9554";
gpio-controller;
#gpio-cells = <2>;
reg = <0x23>;
};
};
};
};
@@ -154,6 +162,30 @@
gpios = <&gpio2 0 1>; /* GPIO 64 Active Low */
linux,default-trigger = "keep";
};
sata1_led {
label = "rn104:blue:sata1";
gpios = <&pca9554 0 GPIO_ACTIVE_LOW>;
default-state = "off";
};
sata2_led {
label = "rn104:blue:sata2";
gpios = <&pca9554 1 GPIO_ACTIVE_LOW>;
default-state = "off";
};
sata3_led {
label = "rn104:blue:sata3";
gpios = <&pca9554 2 GPIO_ACTIVE_LOW>;
default-state = "off";
};
sata4_led {
label = "rn104:blue:sata4";
gpios = <&pca9554 3 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
gpio_keys {
arch/arm/boot/dts/armada-370-xp.dtsi
+9
View File
@@ -257,6 +257,15 @@
status = "disabled";
};
nand@d0000 {
compatible = "marvell,armada370-nand";
reg = <0xd0000 0x54>;
#address-cells = <1>;
#size-cells = <1>;
interrupts = <113>;
clocks = <&coredivclk 0>;
status = "disabled";
};
};
};
arch/arm/boot/dts/armada-xp-gp.dts
+8
View File
@@ -175,6 +175,14 @@
spi-max-frequency = <108000000>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
};
};
};
};
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+1 -2
View File
@@ -103,8 +103,7 @@
green_led {
label = "green_led";
gpios = <&gpio1 21 1>;
default-state = "off";
linux,default-trigger = "heartbeat";
default-state = "keep";
};
};
arch/arm/boot/dts/dove-cubox.dts
+1 -1
View File
@@ -23,7 +23,7 @@
power {
label = "Power";
gpios = <&gpio0 18 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
};
arch/arm/boot/dts/dove.dtsi
+12 -1
View File
@@ -136,6 +136,15 @@
marvell,#interrupts = <5>;
};
pmu_intc: pmu-interrupt-ctrl@d0050 {
compatible = "marvell,dove-pmu-intc";
interrupt-controller;
#interrupt-cells = <1>;
reg = <0xd0050 0x8>;
interrupts = <33>;
marvell,#interrupts = <7>;
};
core_clk: core-clocks@d0214 {
compatible = "marvell,dove-core-clock";
reg = <0xd0214 0x4>;
@@ -497,6 +506,8 @@
rtc: real-time-clock@d8500 {
compatible = "marvell,orion-rtc";
reg = <0xd8500 0x20>;
interrupt-parent = <&pmu_intc>;
interrupts = <5>;
};
crypto: crypto-engine@30000 {
@@ -559,7 +570,7 @@
status = "disabled";
ethphy: ethernet-phy {
device-type = "ethernet-phy";
device_type = "ethernet-phy";
/* set phy address in board file */
};
};
arch/arm/boot/dts/kirkwood-6281.dtsi
+2
View File
@@ -97,6 +97,8 @@
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
pinctrl-0 = <&pmx_sdio>;
pinctrl-names = "default";
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
arch/arm/boot/dts/kirkwood-6282.dtsi
+2
View File
@@ -125,6 +125,8 @@
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
pinctrl-0 = <&pmx_sdio>;
pinctrl-names = "default";
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
arch/arm/boot/dts/kirkwood-dns320.dts
+1 -1
View File
@@ -25,7 +25,7 @@
blue-power {
label = "dns320:blue:power";
gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
linux,default-trigger = "default-on";
default-state = "keep";
};
blue-usb {
label = "dns320:blue:usb";
arch/arm/boot/dts/kirkwood-dns325.dts
+1 -1
View File
@@ -25,7 +25,7 @@
white-power {
label = "dns325:white:power";
gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
linux,default-trigger = "default-on";
default-state = "keep";
};
white-usb {
label = "dns325:white:usb";
arch/arm/boot/dts/kirkwood-dockstar.dts
+1 -1
View File
@@ -43,7 +43,7 @@
health {
label = "status:green:health";
gpios = <&gpio1 14 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
fault {
label = "status:orange:fault";
arch/arm/boot/dts/kirkwood-goflexnet.dts
+1 -1
View File
@@ -86,7 +86,7 @@
health {
label = "status:green:health";
gpios = <&gpio1 14 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
fault {
label = "status:orange:fault";
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+2 -2
View File
@@ -45,10 +45,10 @@
nr-ports = <1>;
};
/* AzureWave AW-GH381 WiFi/BT */
mvsdio@90000 {
status = "okay";
/* No CD or WP GPIOs */
broken-cd;
non-removable;
};
};
arch/arm/boot/dts/kirkwood-ib62x0.dts
+1 -1
View File
@@ -82,7 +82,7 @@
green-os {
label = "ib62x0:green:os";
gpios = <&gpio0 25 0>;
linux,default-trigger = "default-on";
default-state = "keep";
};
red-os {
label = "ib62x0:red:os";
arch/arm/boot/dts/kirkwood-iconnect.dts
+2 -2
View File
@@ -95,12 +95,12 @@
led-level {
label = "led_level";
gpios = <&gpio1 9 0>;
linux,default-trigger = "default-on";
default-state = "on";
};
power-blue {
label = "power:blue";
gpios = <&gpio1 10 0>;
linux,default-trigger = "timer";
default-state = "keep";
};
power-red {
label = "power:red";
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+1 -1
View File
@@ -128,7 +128,7 @@
power_led {
label = "status:white:power_led";
gpios = <&gpio0 16 0>;
linux,default-trigger = "default-on";
default-state = "keep";
};
rebuild_led {
label = "status:white:rebuild_led";
arch/arm/boot/dts/kirkwood-lsxl.dtsi
+1 -1
View File
@@ -150,7 +150,7 @@
led@4 {
label = "lsxl:blue:power";
gpios = <&gpio1 7 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
led@5 {
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+13 -1
View File
@@ -1,5 +1,6 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "kirkwood.dtsi"
#include "kirkwood-6282.dtsi"
@@ -60,6 +61,10 @@
marvell,pins = "mpp29";
marvell,function = "gpio";
};
pmx_poweroff: pmx-poweroff {
marvell,pins = "mpp30";
marvell,function = "gpio";
};
};
clocks {
@@ -113,7 +118,7 @@
power_led {
label = "status:blue:power_led";
gpios = <&gpio0 31 1>; /* GPIO 31 Active Low */
linux,default-trigger = "default-on";
default-state = "keep";
};
activity_led {
label = "status:blue:activity_led";
@@ -158,6 +163,13 @@
};
};
gpio-poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_poweroff>;
pinctrl-names = "default";
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
arch/arm/boot/dts/kirkwood-ns2lite.dts
+1 -1
View File
@@ -26,7 +26,7 @@
blue-sata {
label = "ns2:blue:sata";
gpios = <&gpio0 30 1>;
linux,default-trigger = "default-on";
linux,default-trigger = "ide-disk";
};
};
};
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* kirkwood-sheevaplug-common.dts - Common parts for Sheevaplugs
* kirkwood-sheevaplug-common.dtsi - Common parts for Sheevaplugs
*
* Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
*
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
+1 -1
View File
@@ -37,7 +37,7 @@
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
};
};
arch/arm/boot/dts/kirkwood-sheevaplug.dts
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* kirkwood-sheevaplug-esata.dts - Device tree file for Sheevaplug
* kirkwood-sheevaplug.dts - Device tree file for Sheevaplug
*
* Copyright (C) 2013 Simon Baatz <gmbnomis@gmail.com>
*
@@ -32,7 +32,7 @@
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
linux,default-trigger = "default-on";
default-state = "keep";
};
misc {
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+1 -1
View File
@@ -58,7 +58,7 @@
status = "okay";
ethphy: ethernet-phy {
device-type = "ethernet-phy";
device_type = "ethernet-phy";
reg = <8>;
};
};