UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu dt for 4.7 (part 1) 

- add hardware monitor support in the NSA320 device tree
 - update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb
 - fix GPIO config on the Linksys boards
 - various Kirkwood DT warning fixup from the newer DT compiler
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlcPztkACgkQCwYYjhRyO9WdhgCfQQ1H5LT+C5WvS1OpXTKIScTo
 of0AoJaa8PvkpVLB4e8mZVXfzBW9Ne6w
 =nKfy
 -----END PGP SIGNATURE-----

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

Merge "mvebu dt for 4.7 (part 1)" from Gregory CLEMENT:

- add hardware monitor support in the NSA320 device tree
- update makefile with kirkwood-ds112.dtb and kirkwood-nsa320.dtb
- fix GPIO config on the Linksys boards
- various Kirkwood DT warning fixup from the newer DT compiler

* tag 'mvebu-dt-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: Add DTS for Linksys EA4200v2/EA4500
  ARM: dts: orion5x: add device tree for kurobox-pro
  ARM: dts: kirkwood: Add address go regulator unit name
  ARM: dts: kirkwood: Add address to mbus unit name
  ARM: dts: kirkwood: Remove address from gpio-i2c unit name
  ARM: dts: kirkwood: Fixup pcie DT warnings
  ARM: dts: kirkwood: Add address to ethernet-phy unit name
  ARM: dts: kirkwood: Remove address from dsa unit name
  ARM: dts: kirkwood: Remove node address from leds
  ARM: dts: kirkwood: Remove button address and fixup names
  ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile
  ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile
  ARM: mvebu: fix GPIO config on the Linksys boards
  ARM: dts: kirkwood: Add the hardware monitor to the NSA320 device tree
This commit is contained in:
Arnd Bergmann 2016-04-24 23:21:34 +02:00
parent 9744426e6d c134043ed3
commit 6a6e2d6121
55 changed files with 654 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View File

@ -178,6 +178,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-ds109.dtb \
kirkwood-ds110jv10.dtb \
kirkwood-ds111.dtb \
kirkwood-ds112.dtb \
kirkwood-ds209.dtb \
kirkwood-ds210.dtb \
kirkwood-ds212.dtb \
@ -200,6 +201,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-linkstation-lswsxl.dtb \
kirkwood-linkstation-lswvl.dtb \
kirkwood-linkstation-lswxl.dtb \
kirkwood-linksys-viper.dtb \
kirkwood-lschlv2.dtb \
kirkwood-lsxhl.dtb \
kirkwood-mplcec4.dtb \
@ -215,6 +217,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-ns2mini.dtb \
kirkwood-nsa310.dtb \
kirkwood-nsa310a.dtb \
kirkwood-nsa320.dtb \
kirkwood-nsa325.dtb \
kirkwood-openblocks_a6.dtb \
kirkwood-openblocks_a7.dtb \
@ -530,6 +533,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
dra7-evm.dtb \
dra72-evm.dtb
dtb-$(CONFIG_ARCH_ORION5X) += \
orion5x-kuroboxpro.dtb \
orion5x-lacie-d2-network.dtb \
orion5x-lacie-ethernet-disk-mini-v2.dtb \
orion5x-linkstation-lsgl.dtb \

6
arch/arm/boot/dts/armada-385-linksys.dtsi
View File

@ -245,7 +245,7 @@
button@2 {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};
@ -260,7 +260,7 @@
};
sata {
gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
@ -313,7 +313,7 @@
&pinctrl {
keys_pin: keys-pin {
marvell,pins = "mpp24", "mpp47";
marvell,pins = "mpp24", "mpp29";
marvell,function = "gpio";
};

4
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
View File

@ -304,13 +304,13 @@
button@1 {
label = "WPS";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
};
};

4
arch/arm/boot/dts/kirkwood-6192.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
mbus@f1000000 {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

4
arch/arm/boot/dts/kirkwood-6281.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
mbus@f1000000 {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

4
arch/arm/boot/dts/kirkwood-6282.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
mbus@f1000000 {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

4
arch/arm/boot/dts/kirkwood-98dx4122.dtsi
View File

@ -1,6 +1,6 @@
/ {
mbus {
pciec: pcie-controller {
mbus@f1000000 {
pciec: pcie-controller@82000000 {
compatible = "marvell,kirkwood-pcie";
status = "disabled";
device_type = "pci";

19
arch/arm/boot/dts/kirkwood-b3.dts
View File

@ -33,17 +33,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
/* Wifi model has Atheros chipset on pcie port */
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
@ -199,3 +188,11 @@
};
};
/* Wifi model has Atheros chipset on pcie port */
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

4
arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
View File

@ -36,13 +36,13 @@
gpio_keys {
compatible = "gpio-keys";
button@1{
reset {
label = "Reset";
linux,code = <KEY_POWER>;
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
button@2{
button {
label = "Power";
linux,code = <KEY_SLEEP>;
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-cloudbox.dts
View File

@ -60,7 +60,7 @@
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

18
arch/arm/boot/dts/kirkwood-db-88f6281.dts
View File

@ -17,14 +17,12 @@
/ {
model = "Marvell DB-88F6281-BP Development Board";
compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

26
arch/arm/boot/dts/kirkwood-db-88f6282.dts
View File

@ -17,18 +17,16 @@
/ {
model = "Marvell DB-88F6282-BP Development Board";
compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
pcie@2,0 {
status = "okay";
};
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};
&pcie1 {
status = "okay";
};

20
arch/arm/boot/dts/kirkwood-dir665.dts
View File

@ -25,16 +25,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 =< &pmx_led_usb
@ -203,7 +193,7 @@
};
};
dsa@0 {
dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -276,3 +266,11 @@
&rtc {
status = "disabled";
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View File

@ -13,17 +13,17 @@
&pmx_button_reset>;
pinctrl-names = "default";
button@1 {
power {
label = "Power button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
};
button@2 {
eject {
label = "USB unmount button";
linux,code = <KEY_EJECTCD>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
button@3 {
reset {
label = "Reset button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood-ds111.dts
View File

@ -40,6 +40,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-ds112.dts
View File

@ -44,6 +44,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ds212.dts
View File

@ -43,6 +43,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-ds411.dts
View File

@ -48,6 +48,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ds411slim.dts
View File

@ -44,6 +44,6 @@
status = "okay";
};
&pcie2 {
&pcie1 {
status = "okay";
};

4
arch/arm/boot/dts/kirkwood-ib62x0.dts
View File

@ -62,12 +62,12 @@
pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;

22
arch/arm/boot/dts/kirkwood-iconnect.dts
View File

@ -19,16 +19,6 @@
linux,initrd-end = <0x4800000>;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_button_reset: pmx-button-reset {
@ -136,13 +126,13 @@
pinctrl-0 = < &pmx_button_reset &pmx_button_otb >;
pinctrl-names = "default";
button@1 {
otb {
label = "OTB Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
@ -194,3 +184,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

20
arch/arm/boot/dts/kirkwood-km_common.dtsi
View File

@ -4,16 +4,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = < &pmx_i2c_gpio_sda &pmx_i2c_gpio_scl >;
@ -34,7 +24,7 @@
};
};
i2c@0 {
i2c {
compatible = "i2c-gpio";
gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */
&gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */
@ -46,3 +36,11 @@
status = "okay";
chip-delay = <25>;
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

19
arch/arm/boot/dts/kirkwood-laplug.dts
View File

@ -27,15 +27,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
serial@12000 {
status = "okay";
@ -62,7 +53,7 @@
gpio_keys {
compatible = "gpio-keys";
button@1{
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
@ -169,3 +160,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

17
arch/arm/boot/dts/kirkwood-linkstation.dtsi
View File

@ -49,15 +49,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_power_hdd0: pmx-power-hdd0 {
@ -200,3 +191,11 @@
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

240
arch/arm/boot/dts/kirkwood-linksys-viper.dts Normal file
View File

@ -0,0 +1,240 @@
/*
* kirkwood-viper.dts - Device Tree file for Linksys viper (E4200v2 / EA4500)
*
* (c) 2013 Jonas Gorski <jogo@openwrt.org>
* (c) 2013 Deutsche Telekom Innovation Laboratories
* (c) 2014 Luka Perkov <luka@openwrt.org>
* (c) 2014 Randy C. Will <randall.will@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 "kirkwood.dtsi"
#include "kirkwood-6282.dtsi"
/ {
model = "Linksys Viper (E4200v2 / EA4500)";
compatible = "linksys,viper", "marvell,kirkwood-88f6282", "marvell,kirkwood";
memory {
device_type = "memory";
reg = <0x00000000 0x8000000>;
};
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
pinctrl-names = "default";
wps {
label = "WPS Button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
};
gpio-leds {
compatible = "gpio-leds";
pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
pinctrl-names = "default";
white-health {
label = "viper:white:health";
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
};
white-pulse {
label = "viper:white:pulse";
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
};
};
dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
dsa,ethernet = <&eth0port>;
dsa,mii-bus = <&mdio>;
switch@16,0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <16 0>; /* MDIO address 16, switch 0 in tree */
port@0 {
reg = <0>;
label = "ethernet1";
};
port@1 {
reg = <1>;
label = "ethernet2";
};
port@2 {
reg = <2>;
label = "ethernet3";
};
port@3 {
reg = <3>;
label = "ethernet4";
};
port@4 {
reg = <4>;
label = "internet";
};
port@5 {
reg = <5>;
label = "cpu";
};
};
};
};
&pinctrl {
pmx_led_white_health: pmx-led-white-health {
marvell,pins = "mpp7";
marvell,function = "gpo";
};
pmx_led_white_pulse: pmx-led-white-pulse {
marvell,pins = "mpp14";
marvell,function = "gpio";
};
pmx_btn_wps: pmx-btn-wps {
marvell,pins = "mpp47";
marvell,function = "gpio";
};
pmx_btn_reset: pmx-btn-reset {
marvell,pins = "mpp48";
marvell,function = "gpio";
};
};
&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x80000>;
read-only;
};
partition@80000 {
label = "u_env";
reg = <0x80000 0x20000>;
};
partition@A0000 {
label = "s_env";
reg = <0xA0000 0x20000>;
};
partition@200000 {
label = "kernel";
reg = <0x200000 0x2A0000>;
};
partition@4A0000 {
label = "rootfs";
reg = <0x4A0000 0x1760000>;
};
partition@1C00000 {
label = "alt_kernel";
reg = <0x1C00000 0x2A0000>;
};
partition@1EA0000 {
label = "alt_rootfs";
reg = <0x1EA0000 0x1760000>;
};
partition@3600000 {
label = "syscfg";
reg = <0x3600000 0x4A00000>;
};
partition@C0000 {
label = "unused";
reg = <0xC0000 0x140000>;
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};
&pcie1 {
status = "okay";
};
&mdio {
status = "okay";
};
&uart0 {
status = "okay";
};
/* eth0 is connected to a Marvell 88E6171 switch, without a PHY. So set
* fixed speed and duplex.
*/
&eth0 {
status = "okay";
ethernet0-port@0 {
speed = <1000>;
duplex = <1>;
};
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
* single CPU port. So leave this port disabled to avoid confusion.
*/
&eth1 {
status = "disabled";
};
/* There is no battery on the board, so the RTC does not keep
* time when there is no power, making it useless.
*/
&rtc {
status = "disabled";
};

16
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View File

@ -107,18 +107,18 @@
&pmx_power_auto_switch>;
pinctrl-names = "default";
button@1 {
option {
label = "Function Button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
button@2 {
reserved {
label = "Power-on Switch";
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
button@3 {
power {
label = "Power-auto Switch";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
@ -133,28 +133,28 @@
&pmx_led_function_blue>;
pinctrl-names = "default";
led@1 {
func_blue {
label = "lsxl:blue:func";
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
led@2 {
alarm {
label = "lsxl:red:alarm";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
led@3 {
info {
label = "lsxl:amber:info";
gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
};
led@4 {
power {
label = "lsxl:blue:power";
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
led@5 {
func_red {
label = "lsxl:red:func";
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};

18
arch/arm/boot/dts/kirkwood-mplcec4.dts
View File

@ -17,16 +17,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_led_health: pmx-led-health {
@ -215,3 +205,11 @@
phy-handle = <&ethphy1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

24
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -31,16 +31,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pin-controller@10000 {
pmx_usb_led: pmx-usb-led {
@ -109,19 +99,19 @@
pinctrl-0 = <&pmx_keys>;
pinctrl-names = "default";
button@1 {
restart {
label = "SWR Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
button@2 {
wps {
label = "WPS Button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
};
dsa@0 {
dsa {
compatible = "marvell,dsa";
#address-cells = <1>;
#size-cells = <0>;
@ -179,3 +169,11 @@
duplex = <1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

18
arch/arm/boot/dts/kirkwood-nas2big.dts
View File

@ -28,16 +28,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
rtc@10300 {
/* The on-chip RTC is not powered (no supercap). */
@ -141,3 +131,11 @@
reg = <0x9100000 0x6f00000>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

20
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -28,16 +28,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
@ -193,7 +183,7 @@
#address-cells = <1>;
#size-cells = <0>;
usb3_regulator: usb3-regulator {
usb3_regulator: usb3-regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB 3.0 Power";
@ -251,3 +241,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

23
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View File

@ -28,18 +28,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
/* Connected to NEC uPD720200 USB 3.0 controller */
pcie@1,0 {
/* Port 0, Lane 0 */
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_button_power: pmx-button-power {
@ -205,7 +193,7 @@
#address-cells = <1>;
#size-cells = <0>;
usb3_regulator: usb3-regulator {
usb3_regulator: usb3-regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "USB 3.0 Power";
@ -265,3 +253,12 @@
phy-handle = <&ethphy0>;
};
};
/* Connected to NEC uPD720200 USB 3.0 controller */
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

8
arch/arm/boot/dts/kirkwood-netxbig.dtsi
View File

@ -59,22 +59,22 @@
#size-cells = <0>;
/*
* button@1 and button@2 represent a three position rocker
* esc and power represent a three position rocker
* switch. Thus the conventional KEY_POWER does not fit
*/
button@1 {
exc {
label = "Back power switch (on|auto)";
linux,code = <KEY_ESC>;
linux,input-type = <5>;
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
};
button@2 {
power {
label = "Back power switch (auto|off)";
linux,code = <KEY_1>;
linux,input-type = <5>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
button@3 {
option {
label = "Function button";
linux,code = <KEY_OPTION>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;

4
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View File

@ -57,7 +57,7 @@
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Power push button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
@ -83,7 +83,7 @@
&mdio {
status = "okay";
ethphy0: ethernet-phy {
ethphy0: ethernet-phy@X {
/* overwrite reg property in board file */
};
};

18
arch/arm/boot/dts/kirkwood-nsa310.dts
View File

@ -15,16 +15,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_unknown>;
@ -138,3 +128,11 @@
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

31
arch/arm/boot/dts/kirkwood-nsa320.dts
View File

@ -27,16 +27,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -193,10 +183,19 @@
};
};
hwmon {
compatible = "zyxel,nsa320-mcu";
pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act>;
pinctrl-names = "default";
data-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
clk-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
act-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
};
/* 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
pinctrl-0 = <&pmx_htp &pmx_vid_b1
&pmx_power_resume_data &pmx_power_resume_clk>; */
};
@ -213,3 +212,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

17
arch/arm/boot/dts/kirkwood-nsa325.dts
View File

@ -28,16 +28,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -236,3 +226,10 @@
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

24
arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
View File

@ -4,16 +4,6 @@
/ {
model = "ZyXEL NSA310";
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
@ -77,17 +67,17 @@
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
pinctrl-names = "default";
button@1 {
power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
copy {
label = "Copy Button";
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
@ -157,3 +147,11 @@
reg = <0x5040000 0x2fc0000>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@ -117,7 +117,7 @@
#address-cells = <1>;
#size-cells = <0>;
button@1 {
power {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

2
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View File

@ -135,7 +135,7 @@
#address-cells = <1>;
#size-cells = <0>;
button@1 {
button {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

14
arch/arm/boot/dts/kirkwood-openrd.dtsi
View File

@ -25,16 +25,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
@ -125,3 +115,7 @@
reg = <0x0600000 0x1FA00000>;
};
};
&pcie0 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
View File

@ -33,7 +33,7 @@
pinctrl-0 = <&pmx_button_eject>;
pinctrl-names = "default";
button@1 {
eject {
debounce_interval = <50>;
wakeup-source;
linux,code = <KEY_EJECTCD>;

20
arch/arm/boot/dts/kirkwood-rd88f6192.dts
View File

@ -29,16 +29,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_usb_power>;
@ -108,4 +98,12 @@
ethernet0-port@0 {
phy-handle = <&ethphy0>;
};
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-rd88f6281-a.dts
View File

@ -19,7 +19,7 @@
model = "Marvell RD88f6281 Reference design, with A0 or higher SoC";
compatible = "marvell,rd88f6281-a", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa@0 {
dsa {
switch@0 {
reg = <10 0>; /* MDIO address 10, switch 0 in tree */
};

2
arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts
View File

@ -19,7 +19,7 @@
model = "Marvell RD88f6281 Reference design, with Z0 SoC";
compatible = "marvell,rd88f6281-z0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
dsa@0 {
dsa {
switch@0 {
reg = <0 0>; /* MDIO address 0, switch 0 in tree */
port@4 {

20
arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
View File

@ -25,16 +25,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-names = "default";
@ -63,7 +53,7 @@
};
};
dsa@0 {
dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
@ -134,3 +124,11 @@
duplex = <1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

6
arch/arm/boot/dts/kirkwood-rs212.dts
View File

@ -44,6 +44,10 @@
status = "okay";
};
&pcie2 {
&pciec {
status = "okay";
};
&pcie1 {
status = "okay";
};

22
arch/arm/boot/dts/kirkwood-synology.dtsi
View File

@ -10,20 +10,6 @@
*/
/ {
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
pcie2: pcie@2,0 {
status = "disabled";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pmx_alarmled_12: pmx-alarmled-12 {
@ -861,3 +847,11 @@
phy-handle = <&ethphy1>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

22
arch/arm/boot/dts/kirkwood-t5325.dts
View File

@ -30,16 +30,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
pinctrl-0 = <&pmx_i2s &pmx_sysrst>;
@ -173,7 +163,7 @@
pinctrl-0 = <&pmx_button_power>;
pinctrl-names = "default";
button@1 {
power {
label = "Power Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
@ -217,7 +207,7 @@
&mdio {
status = "okay";
ethphy0: ethernet-phy {
ethphy0: ethernet-phy@8 {
device_type = "ethernet-phy";
reg = <8>;
};
@ -229,3 +219,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

4
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View File

@ -39,12 +39,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;

16
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View File

@ -5,16 +5,6 @@
#include "kirkwood-ts219.dtsi"
/ {
mbus {
pcie-controller {
status = "okay";
pcie@2,0 {
status = "okay";
};
};
};
ocp@f1000000 {
pinctrl: pin-controller@10000 {
@ -49,12 +39,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
@ -63,3 +53,5 @@
};
&ethphy0 { reg = <0>; };
&pcie1 { status = "okay"; };

20
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -12,16 +12,6 @@
stdout-path = &uart0;
};
mbus {
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
ocp@f1000000 {
i2c@11000 {
status = "okay";
@ -94,7 +84,7 @@
&mdio {
status = "okay";
ethphy0: ethernet-phy {
ethphy0: ethernet-phy@X {
/* overwrite reg property in board file */
};
};
@ -105,3 +95,11 @@
phy-handle = <&ethphy0>;
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};

15
arch/arm/boot/dts/kirkwood-ts419-6282.dts
View File

@ -16,17 +16,8 @@
#include "kirkwood-ts219.dtsi"
#include "kirkwood-ts419.dtsi"
/ {
mbus {
pcie-controller {
status = "okay";
pcie@2,0 {
status = "okay";
};
};
};
};
&ethphy0 { reg = <0>; };
&ethphy1 { reg = <1>; };
&pciec { status = "okay"; };
&pcie1 { status = "okay"; };

4
arch/arm/boot/dts/kirkwood-ts419.dtsi
View File

@ -45,12 +45,12 @@
pinctrl-0 = <&pmx_reset_button &pmx_USB_copy_button>;
pinctrl-names = "default";
button@1 {
copy {
label = "USB Copy";
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
button@2 {
reset {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;

2
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -27,7 +27,7 @@
i2c0 = &i2c0;
};
mbus {
mbus@f1000000 {
compatible = "marvell,kirkwood-mbus", "simple-bus";
#address-cells = <2>;
#size-cells = <1>;

127
arch/arm/boot/dts/orion5x-kuroboxpro.dts Normal file
View File

@ -0,0 +1,127 @@
/*
* Device Tree file for Buffalo/Revogear Kurobox Pro
*
* Copyright (C) 2016
* Roger Shimizu <rogershimizu@gmail.com>
*
* Based on the board file arch/arm/mach-orion5x/kurobox_pro-setup.c
* Copyright (C) Ronen Shitrit <rshitrit@marvell.com>
*
* This file is dual-licensed: you can use it either under the terms
* of the GPL or the X11 license, at your option. Note that this dual
* licensing only applies to this file, and not this project as a
* whole.
*
* a) This file 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.
*
* This file is distributed in the hope that it will be useful
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Or, alternatively
*
* b) Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use
* copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
#include "orion5x-linkstation.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Buffalo/Revogear Kurobox Pro";
compatible = "buffalo,kurobox-pro", "marvell,orion5x-88f5182", "marvell,orion5x";
soc {
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,
<MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>,
<MBUS_ID(0x01, 0x0f) 0 0xf4000000 0x40000>,
<MBUS_ID(0x01, 0x1e) 0 0xfc000000 0x1000000>;
};
memory { /* 128 MB */
device_type = "memory";
reg = <0x00000000 0x8000000>;
};
};
&pinctrl {
pmx_power_hdd: pmx-power-hdd {
marvell,pins = "mpp1";
marvell,function = "gpio";
};
pmx_power_usb: pmx-power-usb {
marvell,pins = "mpp9";
marvell,function = "gpio";
};
};
&devbus_cs0 {
status = "okay";
compatible = "marvell,orion-nand";
reg = <MBUS_ID(0x01, 0x1e) 0 0x400>;
cle = <0>;
ale = <1>;
bank-width = <1>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
uImage@0 { /* 4 MB */
reg = <0 0x400000>;
read-only;
};
rootfs@400000 { /* 64 MB */
reg = <0x400000 0x4000000>;
read-only;
};
extra@4400000 { /* 188 MB */
reg = <0x4400000 0xBC00000>;
read-only;
};
};
};
&hdd_power {
gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
};
&usb_power {
gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
};
&sata {
nr-ports = <2>;
};
&ehci1 {
status = "okay";
};