mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
mvebu dt for 4.5 (part 3)
Add dts for the following boards: - Zyxel NSA325 - PogoPlug series 4 Add GPU support for Dove Update boolean property to wakeup source for isil -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlZ0DyIACgkQCwYYjhRyO9UXAgCcCB9oM0SblUt6+OqKVXEdwwNU 2u4AoJPIDr/m9QoIvBj+H55XeGCmXFuI =KHo9 -----END PGP SIGNATURE----- Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dt mvebu dt for 4.5 (part 3) Add dts for the following boards: - Zyxel NSA325 - PogoPlug series 4 Add GPU support for Dove Update boolean property to wakeup source for isil * tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu: ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property ARM: dts: enable GPU for SolidRun's Cubox ARM: dts: dove: add DT GPU support ARM: mvebu: kirkwood: add PogoPlug series 4 device tree ARM: mvebu: add kirkwood compatibles for cloudengine boards ARM: dts: kirkwood: Add DTS for Zyxel NSA325 Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
2ea698c635
9 changed files with 447 additions and 3 deletions
|
|
@ -24,6 +24,8 @@ board. Currently known boards are:
|
|||
"buffalo,lswxl"
|
||||
"buffalo,lsxhl"
|
||||
"buffalo,lsxl"
|
||||
"cloudengines,pogo02"
|
||||
"cloudengines,pogoplugv4"
|
||||
"dlink,dns-320"
|
||||
"dlink,dns-320-a1"
|
||||
"dlink,dns-325"
|
||||
|
|
|
|||
|
|
@ -204,12 +204,14 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
|||
kirkwood-ns2mini.dtb \
|
||||
kirkwood-nsa310.dtb \
|
||||
kirkwood-nsa310a.dtb \
|
||||
kirkwood-nsa325.dtb \
|
||||
kirkwood-openblocks_a6.dtb \
|
||||
kirkwood-openblocks_a7.dtb \
|
||||
kirkwood-openrd-base.dtb \
|
||||
kirkwood-openrd-client.dtb \
|
||||
kirkwood-openrd-ultimate.dtb \
|
||||
kirkwood-pogo_e02.dtb \
|
||||
kirkwood-pogoplug-series-4.dtb \
|
||||
kirkwood-rd88f6192.dtb \
|
||||
kirkwood-rd88f6281-z0.dtb \
|
||||
kirkwood-rd88f6281-a.dtb \
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ i2c@11000 {
|
|||
isl12057: isl12057@68 {
|
||||
compatible = "isil,isl12057";
|
||||
reg = <0x68>;
|
||||
isil,irq2-can-wakeup-machine;
|
||||
wakeup-source;
|
||||
};
|
||||
|
||||
g762: g762@3e {
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ i2c@11000 {
|
|||
isl12057: isl12057@68 {
|
||||
compatible = "isil,isl12057";
|
||||
reg = <0x68>;
|
||||
isil,irq2-can-wakeup-machine;
|
||||
wakeup-source;
|
||||
};
|
||||
|
||||
g762: g762@3e {
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ g751: g751@4c {
|
|||
isl12057: isl12057@68 {
|
||||
compatible = "isil,isl12057";
|
||||
reg = <0x68>;
|
||||
isil,irq2-can-wakeup-machine;
|
||||
wakeup-source;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ ir_recv: ir-receiver {
|
|||
pinctrl-0 = <&pmx_gpio_19>;
|
||||
pinctrl-names = "default";
|
||||
};
|
||||
|
||||
gpu-subsystem {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 { status = "okay"; };
|
||||
|
|
@ -74,6 +78,10 @@ ðphy {
|
|||
reg = <1>;
|
||||
};
|
||||
|
||||
&gpu {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
status = "okay";
|
||||
clock-frequency = <100000>;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,12 @@ l2: l2-cache {
|
|||
marvell,tauros2-cache-features = <0>;
|
||||
};
|
||||
|
||||
gpu-subsystem {
|
||||
compatible = "marvell,dove-gpu-subsystem";
|
||||
cores = <&gpu>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
i2c-mux {
|
||||
compatible = "i2c-mux-pinctrl";
|
||||
#address-cells = <1>;
|
||||
|
|
@ -782,6 +788,16 @@ crypto_sram: sa-sram@ffffe000 {
|
|||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
};
|
||||
|
||||
gpu: gpu@840000 {
|
||||
clocks = <÷r_clk 1>;
|
||||
clock-names = "core";
|
||||
compatible = "vivante,gc";
|
||||
interrupts = <48>;
|
||||
power-domains = <&gpu_domain>;
|
||||
reg = <0x840000 0x4000>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
238
arch/arm/boot/dts/kirkwood-nsa325.dts
Normal file
238
arch/arm/boot/dts/kirkwood-nsa325.dts
Normal file
|
|
@ -0,0 +1,238 @@
|
|||
/* Device tree file for the Zyxel NSA 325 NAS box.
|
||||
*
|
||||
* Copyright (c) 2015, Hans Ulli Kroll <ulli.kroll@googlemail.com>
|
||||
*
|
||||
* This program 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.
|
||||
*
|
||||
* Based upon the board setup file created by Peter Schildmann
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "kirkwood-nsa3x0-common.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ZyXEL NSA325";
|
||||
compatible = "zyxel,nsa325", "marvell,kirkwood-88f6282", "marvell,kirkwood";
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x20000000>;
|
||||
};
|
||||
|
||||
chosen {
|
||||
bootargs = "console=ttyS0,115200";
|
||||
stdout-path = &uart0;
|
||||
};
|
||||
|
||||
mbus {
|
||||
pcie-controller {
|
||||
status = "okay";
|
||||
|
||||
pcie@1,0 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
ocp@f1000000 {
|
||||
pinctrl: pin-controller@10000 {
|
||||
pinctrl-names = "default";
|
||||
|
||||
pmx_led_hdd2_green: pmx-led-hdd2-green {
|
||||
marvell,pins = "mpp12";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_hdd2_red: pmx-led-hdd2-red {
|
||||
marvell,pins = "mpp13";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_mcu_data: pmx-mcu-data {
|
||||
marvell,pins = "mpp14";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_usb_green: pmx-led-usb-green {
|
||||
marvell,pins = "mpp15";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_mcu_clk: pmx-mcu-clk {
|
||||
marvell,pins = "mpp16";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_mcu_act: pmx-mcu-act {
|
||||
marvell,pins = "mpp17";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_sys_green: pmx-led-sys-green {
|
||||
marvell,pins = "mpp28";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_sys_orange: pmx-led-sys-orange {
|
||||
marvell,pins = "mpp29";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_hdd1_green: pmx-led-hdd1-green {
|
||||
marvell,pins = "mpp41";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_hdd1_red: pmx-led-hdd1-red {
|
||||
marvell,pins = "mpp42";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_htp: pmx-htp {
|
||||
marvell,pins = "mpp43";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
/*
|
||||
* Buzzer needs to be switched at around 1kHz so is
|
||||
* not compatible with the gpio-beeper driver.
|
||||
*/
|
||||
pmx_buzzer: pmx-buzzer {
|
||||
marvell,pins = "mpp44";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_vid_b1: pmx-vid-b1 {
|
||||
marvell,pins = "mpp45";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_power_resume_data: pmx-power-resume-data {
|
||||
marvell,pins = "mpp47";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_power_resume_clk: pmx-power-resume-clk {
|
||||
marvell,pins = "mpp49";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_pwr_sata1: pmx-pwr-sata1 {
|
||||
marvell,pins = "mpp47";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
/* This board uses the pcf8563 RTC instead of the SoC RTC */
|
||||
rtc@10300 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
i2c@11000 {
|
||||
status = "okay";
|
||||
|
||||
pcf8563: pcf8563@51 {
|
||||
compatible = "nxp,pcf8563";
|
||||
reg = <0x51>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
regulators {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
pinctrl-0 = <&pmx_pwr_sata1>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
usb0_power: regulator@1 {
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
sata1_power: regulator@2 {
|
||||
compatible = "regulator-fixed";
|
||||
reg = <2>;
|
||||
regulator-name = "SATA1 Power";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 15 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-0 = <&pmx_led_hdd2_green &pmx_led_hdd2_red
|
||||
&pmx_led_usb_green
|
||||
&pmx_led_sys_green &pmx_led_sys_orange
|
||||
&pmx_led_copy_green &pmx_led_copy_red
|
||||
&pmx_led_hdd1_green &pmx_led_hdd1_red>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
green-sys {
|
||||
label = "nsa325:green:sys";
|
||||
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
orange-sys {
|
||||
label = "nsa325:orange:sys";
|
||||
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
green-hdd1 {
|
||||
label = "nsa325:green:hdd1";
|
||||
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
red-hdd1 {
|
||||
label = "nsa325:red:hdd1";
|
||||
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
green-hdd2 {
|
||||
label = "nsa325:green:hdd2";
|
||||
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
red-hdd2 {
|
||||
label = "nsa325:red:hdd2";
|
||||
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
green-usb {
|
||||
label = "nsa325:green:usb";
|
||||
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
green-copy {
|
||||
label = "nsa325:green:copy";
|
||||
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
red-copy {
|
||||
label = "nsa325:red:copy";
|
||||
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
/* 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
|
||||
&pmx_power_resume_data &pmx_power_resume_clk>; */
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
|
||||
&mdio {
|
||||
status = "okay";
|
||||
ethphy0: ethernet-phy@1 {
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
ethernet0-port@0 {
|
||||
phy-handle = <ðphy0>;
|
||||
};
|
||||
};
|
||||
|
||||
178
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
Normal file
178
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
Normal file
|
|
@ -0,0 +1,178 @@
|
|||
/*
|
||||
* kirkwood-pogoplug-series-4.dts - Device tree file for PogoPlug Series 4
|
||||
* inspired by the board files made by Kevin Mihelich for ArchLinux,
|
||||
* and their DTS file.
|
||||
*
|
||||
* Copyright (C) 2015 Linus Walleij <linus.walleij@linaro.org>
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "kirkwood.dtsi"
|
||||
#include "kirkwood-6192.dtsi"
|
||||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
|
||||
/ {
|
||||
model = "Cloud Engines PogoPlug Series 4";
|
||||
compatible = "cloudengines,pogoplugv4", "marvell,kirkwood-88f6192",
|
||||
"marvell,kirkwood";
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x08000000>;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "uart0:115200n8";
|
||||
};
|
||||
|
||||
gpio_keys {
|
||||
compatible = "gpio-keys";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
pinctrl-0 = <&pmx_button_eject>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
button@1 {
|
||||
debounce_interval = <50>;
|
||||
wakeup-source;
|
||||
linux,code = <KEY_EJECTCD>;
|
||||
label = "Eject Button";
|
||||
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-0 = <&pmx_led_green &pmx_led_red>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
health {
|
||||
label = "pogoplugv4:green:health";
|
||||
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
|
||||
default-state = "on";
|
||||
};
|
||||
fault {
|
||||
label = "pogoplugv4:red:fault";
|
||||
gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pmx_sata0: pmx-sata0 {
|
||||
marvell,pins = "mpp21";
|
||||
marvell,function = "sata0";
|
||||
};
|
||||
|
||||
pmx_sata1: pmx-sata1 {
|
||||
marvell,pins = "mpp20";
|
||||
marvell,function = "sata1";
|
||||
};
|
||||
|
||||
pmx_sdio_cd: pmx-sdio-cd {
|
||||
marvell,pins = "mpp27";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_sdio_wp: pmx-sdio-wp {
|
||||
marvell,pins = "mpp28";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_button_eject: pmx-button-eject {
|
||||
marvell,pins = "mpp29";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_green: pmx-led-green {
|
||||
marvell,pins = "mpp22";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_led_red: pmx-led-red {
|
||||
marvell,pins = "mpp24";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/*
|
||||
* This PCIE controller has a USB 3.0 XHCI controller at 1,0
|
||||
*/
|
||||
&pciec {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&sata {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
|
||||
pinctrl-names = "default";
|
||||
nr-ports = <1>;
|
||||
};
|
||||
|
||||
&sdio {
|
||||
status = "okay";
|
||||
pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>;
|
||||
pinctrl-names = "default";
|
||||
cd-gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
|
||||
wp-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
&nand {
|
||||
/* 128 MiB of NAND flash */
|
||||
chip-delay = <40>;
|
||||
status = "okay";
|
||||
partitions {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
label = "u-boot";
|
||||
reg = <0x00000000 0x200000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@200000 {
|
||||
label = "uImage";
|
||||
reg = <0x00200000 0x300000>;
|
||||
};
|
||||
|
||||
partition@500000 {
|
||||
label = "uImage2";
|
||||
reg = <0x00500000 0x300000>;
|
||||
};
|
||||
|
||||
partition@800000 {
|
||||
label = "failsafe";
|
||||
reg = <0x00800000 0x800000>;
|
||||
};
|
||||
|
||||
partition@1000000 {
|
||||
label = "root";
|
||||
reg = <0x01000000 0x7000000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&mdio {
|
||||
status = "okay";
|
||||
|
||||
ethphy0: ethernet-phy@0 {
|
||||
reg = <0>;
|
||||
};
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
ethernet0-port@0 {
|
||||
phy-handle = <ðphy0>;
|
||||
};
|
||||
};
|
||||
Loading…
Reference in a new issue