Browse Source
This branch contains a set of device-tree conversions for Marvell Orion platforms that were staged early but took a few tries to get the branch into a format where it was suitable for us to pick up. Given that most people working on these platforms are hobbyists with limited time, we were a bit more flexible with merging it even though it came in late. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQGrp8AAoJEIwa5zzehBx3Ou8P/3HA53sS2WotNsBjpGTPuJim TppOmfFU6e7TLaY2oOWjIb5tPxK96u4vvCnQFAv+9TF+ewW0yCQlkBIJga3uVE7+ tlz5TbKBo+vQYrFgFCpEwwTHYuLgjpIK4wDs+09EkIM4cMqe6RnLK1KGo6vCAqO9 CKE0rqEfUFjdUq2jed7HA39iwNqJrz8VGLviozvTjW2R42x9iGuy5m2DpThYrLzr 7IYwKGMaJIatG1C/pai7KLEjdJgQl9PeDsgG0oyYY2HHeNy3o8m7tLOL3tnWXeyj XaniNs/YZBp4nADf2sCzXxEVjqRBPVyiw8qCHEOW5L1cfUTq//1QDI3I4kcQzffg VsfLPNvzFsPEMlLI1Xo5UX/8w3xQhBeoI8PtlX7coBMBLn5rJXGnjGpEnH+5SsSA 8KXxm4hP2aOGF+injoEv5HCEiUngH4YPN4hgXwyYdJKcln2YHy8xoIVabsmx27+v bSfododiEvHsBNxfz0Nn5Vo5O3trubU3qe4FEBAhS3pU3GksBocokAqtxeR+BBbH RfBVJ09QEYx1N+c6bhGQXt7F+8sUYO0s9tA7BEkeJtiXp8OX6M8eE4mFoMpIJbsC SmyxsVEE9pna9x3TSy42jiGO3yxbuKEoAy2HfyU1R8yq84XBFXbkgwV02tQcgClz vH4VgGdQoGULqa83GImG =xb8w -----END PGP SIGNATURE----- Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull arm-soc Marvell Orion device-tree updates from Olof Johansson: "This contains a set of device-tree conversions for Marvell Orion platforms that were staged early but took a few tries to get the branch into a format where it was suitable for us to pick up. Given that most people working on these platforms are hobbyists with limited time, we were a bit more flexible with merging it even though it came in late." * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits) ARM: Kirkwood: Replace mrvl with marvell ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT. ARM: Kirkwood: Describe Dreamplug LEDs in DT. ARM: Kirkwood: Describe iConnects LEDs in DT. ARM: Kirkwood: Describe iConnects temperature sensor in DT. ARM: Kirkwood: Describe IB62x0 LEDs in DT. ARM: Kirkwood: Describe IB62x0 gpio-keys in DT. ARM: Kirkwood: Describe DNS32? gpio-keys in DT. ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings ARM: Kirkwood: Describe DNS325 temperature sensor in DT. ARM: Kirkwood: Use DT to configure SATA device. ARM: kirkwood: use devicetree for SPI on dreamplug ARM: kirkwood: Add LS-XHL and LS-CHLv2 support ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net ARM: Kirkwood: Add basic device tree support for QNAP TS219. ATA: sata_mv: Add device tree support ARM: Orion: DTify the watchdog timer. ARM: Orion: Add arch support needed for I2C via DT. ARM: kirkwood: use devicetree for orion-spi ... Conflicts: drivers/watchdog/orion_wdt.cmaster
Linus Torvalds
9 years ago
43 changed files with 1387 additions and 569 deletions
@ -0,0 +1,16 @@ |
|||
* Marvell Orion SATA |
|||
|
|||
Required Properties: |
|||
- compatibility : "marvell,orion-sata" |
|||
- reg : Address range of controller |
|||
- interrupts : Interrupt controller is using |
|||
- nr-ports : Number of SATA ports in use. |
|||
|
|||
Example: |
|||
|
|||
sata@80000 { |
|||
compatible = "marvell,orion-sata"; |
|||
reg = <0x80000 0x5000>; |
|||
interrupts = <21>; |
|||
nr-ports = <2>; |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
* Marvell Orion Watchdog Time |
|||
|
|||
Required Properties: |
|||
|
|||
- Compatibility : "marvell,orion-wdt" |
|||
- reg : Address of the timer registers |
|||
|
|||
Example: |
|||
|
|||
wdt@20300 { |
|||
compatible = "marvell,orion-wdt"; |
|||
reg = <0x20300 0x28>; |
|||
status = "okay"; |
|||
}; |
|||
@ -0,0 +1,69 @@ |
|||
/include/ "kirkwood.dtsi" |
|||
|
|||
/ { |
|||
model = "D-Link DNS NASes (kirkwood-based)"; |
|||
compatible = "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
|||
|
|||
gpio_keys { |
|||
compatible = "gpio-keys"; |
|||
#address-cells = <1>; |
|||
#size-cells = <0>; |
|||
button@1 { |
|||
label = "Power button"; |
|||
linux,code = <116>; |
|||
gpios = <&gpio1 2 1>; |
|||
}; |
|||
button@2 { |
|||
label = "USB unmount button"; |
|||
linux,code = <161>; |
|||
gpios = <&gpio1 15 1>; |
|||
}; |
|||
button@3 { |
|||
label = "Reset button"; |
|||
linux,code = <0x198>; |
|||
gpios = <&gpio1 16 1>; |
|||
}; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
sata@80000 { |
|||
status = "okay"; |
|||
nr-ports = <2>; |
|||
}; |
|||
|
|||
nand@3000000 { |
|||
status = "okay"; |
|||
|
|||
partition@0 { |
|||
label = "u-boot"; |
|||
reg = <0x0000000 0x100000>; |
|||
read-only; |
|||
}; |
|||
|
|||
partition@100000 { |
|||
label = "uImage"; |
|||
reg = <0x0100000 0x500000>; |
|||
}; |
|||
|
|||
partition@600000 { |
|||
label = "ramdisk"; |
|||
reg = <0x0600000 0x500000>; |
|||
}; |
|||
|
|||
partition@b00000 { |
|||
label = "image"; |
|||
reg = <0x0b00000 0x6600000>; |
|||
}; |
|||
|
|||
partition@7100000 { |
|||
label = "mini firmware"; |
|||
reg = <0x7100000 0xa00000>; |
|||
}; |
|||
|
|||
partition@7b00000 { |
|||
label = "config"; |
|||
reg = <0x7b00000 0x500000>; |
|||
}; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,99 @@ |
|||
/dts-v1/; |
|||
|
|||
/include/ "kirkwood.dtsi" |
|||
|
|||
/ { |
|||
model = "Seagate GoFlex Net"; |
|||
compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
|||
|
|||
memory { |
|||
device_type = "memory"; |
|||
reg = <0x00000000 0x8000000>; |
|||
}; |
|||
|
|||
chosen { |
|||
bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10"; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
serial@12000 { |
|||
clock-frequency = <200000000>; |
|||
status = "ok"; |
|||
}; |
|||
|
|||
nand@3000000 { |
|||
status = "okay"; |
|||
|
|||
partition@0 { |
|||
label = "u-boot"; |
|||
reg = <0x0000000 0x100000>; |
|||
read-only; |
|||
}; |
|||
|
|||
partition@100000 { |
|||
label = "uImage"; |
|||
reg = <0x0100000 0x400000>; |
|||
}; |
|||
|
|||
partition@500000 { |
|||
label = "pogoplug"; |
|||
reg = <0x0500000 0x2000000>; |
|||
}; |
|||
|
|||
partition@2500000 { |
|||
label = "root"; |
|||
reg = <0x02500000 0xd800000>; |
|||
}; |
|||
}; |
|||
sata@80000 { |
|||
status = "okay"; |
|||
nr-ports = <2>; |
|||
}; |
|||
|
|||
}; |
|||
gpio-leds { |
|||
compatible = "gpio-leds"; |
|||
|
|||
health { |
|||
label = "status:green:health"; |
|||
gpios = <&gpio1 14 1>; |
|||
linux,default-trigger = "default-on"; |
|||
}; |
|||
fault { |
|||
label = "status:orange:fault"; |
|||
gpios = <&gpio1 15 1>; |
|||
}; |
|||
left0 { |
|||
label = "status:white:left0"; |
|||
gpios = <&gpio1 10 0>; |
|||
}; |
|||
left1 { |
|||
label = "status:white:left1"; |
|||
gpios = <&gpio1 11 0>; |
|||
}; |
|||
left2 { |
|||
label = "status:white:left2"; |
|||
gpios = <&gpio1 12 0>; |
|||
}; |
|||
left3 { |
|||
label = "status:white:left3"; |
|||
gpios = <&gpio1 13 0>; |
|||
}; |
|||
right0 { |
|||
label = "status:white:right0"; |
|||
gpios = <&gpio1 6 0>; |
|||
}; |
|||
right1 { |
|||
label = "status:white:right1"; |
|||
gpios = <&gpio1 7 0>; |
|||
}; |
|||
right2 { |
|||
label = "status:white:right2"; |
|||
gpios = <&gpio1 8 0>; |
|||
}; |
|||
right3 { |
|||
label = "status:white:right3"; |
|||
gpios = <&gpio1 9 0>; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,20 @@ |
|||
/dts-v1/; |
|||
|
|||
/include/ "kirkwood-lsxl.dtsi" |
|||
|
|||
/ { |
|||
model = "Buffalo Linkstation LS-CHLv2"; |
|||
compatible = "buffalo,lschlv2", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
|||
|
|||
memory { |
|||
device_type = "memory"; |
|||
reg = <0x00000000 0x4000000>; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
serial@12000 { |
|||
clock-frequency = <166666667>; |
|||
status = "okay"; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,20 @@ |
|||
/dts-v1/; |
|||
|
|||
/include/ "kirkwood-lsxl.dtsi" |
|||
|
|||
/ { |
|||
model = "Buffalo Linkstation LS-XHL"; |
|||
compatible = "buffalo,lsxhl", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood"; |
|||
|
|||
memory { |
|||
device_type = "memory"; |
|||
reg = <0x00000000 0x10000000>; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
serial@12000 { |
|||
clock-frequency = <200000000>; |
|||
status = "okay"; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,95 @@ |
|||
/include/ "kirkwood.dtsi" |
|||
|
|||
/ { |
|||
chosen { |
|||
bootargs = "console=ttyS0,115200n8 earlyprintk"; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
sata@80000 { |
|||
status = "okay"; |
|||
nr-ports = <1>; |
|||
}; |
|||
|
|||
spi@10600 { |
|||
status = "okay"; |
|||
|
|||
m25p40@0 { |
|||
#address-cells = <1>; |
|||
#size-cells = <1>; |
|||
compatible = "m25p40"; |
|||
reg = <0>; |
|||
spi-max-frequency = <25000000>; |
|||
mode = <0>; |
|||
|
|||
partition@0 { |
|||
reg = <0x0 0x60000>; |
|||
label = "uboot"; |
|||
read-only; |
|||
}; |
|||
|
|||
partition@60000 { |
|||
reg = <0x60000 0x10000>; |
|||
label = "dtb"; |
|||
read-only; |
|||
}; |
|||
|
|||
partition@70000 { |
|||
reg = <0x70000 0x10000>; |
|||
label = "uboot_env"; |
|||
}; |
|||
}; |
|||
}; |
|||
}; |
|||
|
|||
gpio_keys { |
|||
compatible = "gpio-keys"; |
|||
#address-cells = <1>; |
|||
#size-cells = <0>; |
|||
button@1 { |
|||
label = "Function Button"; |
|||
linux,code = <132>; |
|||
gpios = <&gpio1 9 1>; |
|||
}; |
|||
button@2 { |
|||
label = "Power-on Switch"; |
|||
linux,code = <116>; |
|||
gpios = <&gpio1 10 1>; |
|||
}; |
|||
button@3 { |
|||
label = "Power-auto Switch"; |
|||
linux,code = <142>; |
|||
gpios = <&gpio1 11 1>; |
|||
}; |
|||
}; |
|||
|
|||
gpio_leds { |
|||
compatible = "gpio-leds"; |
|||
|
|||
led@1 { |
|||
label = "lschlv2:blue:func"; |
|||
gpios = <&gpio1 4 1>; |
|||
}; |
|||
|
|||
led@2 { |
|||
label = "lschlv2:red:alarm"; |
|||
gpios = <&gpio1 5 1>; |
|||
}; |
|||
|
|||
led@3 { |
|||
label = "lschlv2:amber:info"; |
|||
gpios = <&gpio1 6 1>; |
|||
}; |
|||
|
|||
led@4 { |
|||
label = "lschlv2:blue:power"; |
|||
gpios = <&gpio1 7 1>; |
|||
linux,default-trigger = "default-on"; |
|||
}; |
|||
|
|||
led@5 { |
|||
label = "lschlv2:red:func"; |
|||
gpios = <&gpio1 16 1>; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,21 @@ |
|||
/dts-v1/; |
|||
|
|||
/include/ "kirkwood-ts219.dtsi" |
|||
|
|||
/ { |
|||
gpio_keys { |
|||
compatible = "gpio-keys"; |
|||
#address-cells = <1>; |
|||
#size-cells = <0>; |
|||
button@1 { |
|||
label = "USB Copy"; |
|||
linux,code = <133>; |
|||
gpios = <&gpio0 15 1>; |
|||
}; |
|||
button@2 { |
|||
label = "Reset"; |
|||
linux,code = <0x198>; |
|||
gpios = <&gpio0 16 1>; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,21 @@ |
|||
/dts-v1/; |
|||
|
|||
/include/ "kirkwood-ts219.dtsi" |
|||
|
|||
/ { |
|||
gpio_keys { |
|||
compatible = "gpio-keys"; |
|||
#address-cells = <1>; |
|||
#size-cells = <0>; |
|||
button@1 { |
|||
label = "USB Copy"; |
|||
linux,code = <133>; |
|||
gpios = <&gpio1 11 1>; |
|||
}; |
|||
button@2 { |
|||
label = "Reset"; |
|||
linux,code = <0x198>; |
|||
gpios = <&gpio1 5 1>; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,78 @@ |
|||
/include/ "kirkwood.dtsi" |
|||
|
|||
/ { |
|||
model = "QNAP TS219 family"; |
|||
compatible = "qnap,ts219", "marvell,kirkwood"; |
|||
|
|||
memory { |
|||
device_type = "memory"; |
|||
reg = <0x00000000 0x20000000>; |
|||
}; |
|||
|
|||
chosen { |
|||
bootargs = "console=ttyS0,115200n8"; |
|||
}; |
|||
|
|||
ocp@f1000000 { |
|||
i2c@11000 { |
|||
status = "okay"; |
|||
clock-frequency = <400000>; |
|||
|
|||
s35390a: s35390a@30 { |
|||
compatible = "s35390a"; |
|||
reg = <0x30>; |
|||
}; |
|||
}; |
|||
serial@12000 { |
|||
clock-frequency = <200000000>; |
|||
status = "okay"; |
|||
}; |
|||
serial@12100 { |
|||
clock-frequency = <200000000>; |
|||
status = "okay"; |
|||
}; |
|||
spi@10600 { |
|||
status = "okay"; |
|||
|
|||
m25p128@0 { |
|||
#address-cells = <1>; |
|||
#size-cells = <1>; |
|||
compatible = "m25p128"; |
|||
reg = <0>; |
|||
spi-max-frequency = <20000000>; |
|||
mode = <0>; |
|||
|
|||
partition@0000000 { |
|||
reg = <0x00000000 0x00080000>; |
|||
label = "U-Boot"; |
|||
}; |
|||
|
|||
partition@00200000 { |
|||
reg = <0x00200000 0x00200000>; |
|||
label = "Kernel"; |
|||
}; |
|||
|
|||
partition@00400000 { |
|||
reg = <0x00400000 0x00900000>; |
|||
label = "RootFS1"; |
|||
}; |
|||
partition@00d00000 { |
|||
reg = <0x00d00000 0x00300000>; |
|||
label = "RootFS2"; |
|||
}; |
|||
partition@00040000 { |
|||
reg = <0x00080000 0x00040000>; |
|||
label = "U-Boot Config"; |
|||
}; |
|||
partition@000c0000 { |
|||
reg = <0x000c0000 0x00140000>; |
|||
label = "NAS Config"; |
|||
}; |
|||
}; |
|||
}; |
|||
sata@80000 { |
|||
status = "okay"; |
|||
nr-ports = <2>; |
|||
}; |
|||
}; |
|||
}; |
|||
@ -0,0 +1,71 @@ |
|||
/*
|
|||
* Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net> |
|||
* |
|||
* arch/arm/mach-kirkwood/board-goflexnet.c |
|||
* |
|||
* Seagate GoFlext Net Board Init for drivers not converted to |
|||
* flattened device tree yet. |
|||
* |
|||
* 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. |
|||
* |
|||
* Copied and modified for Seagate GoFlex Net support by |
|||
* Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's |
|||
* GoFlex kernel patches. |
|||
* |
|||
*/ |
|||
|
|||
#include <linux/kernel.h> |
|||
#include <linux/init.h> |
|||
#include <linux/platform_device.h> |
|||
#include <linux/ata_platform.h> |
|||
#include <linux/mv643xx_eth.h> |
|||
#include <linux/of.h> |
|||
#include <linux/of_address.h> |
|||
#include <linux/of_fdt.h> |
|||
#include <linux/of_irq.h> |
|||
#include <linux/of_platform.h> |
|||
#include <linux/gpio.h> |
|||
#include <asm/mach-types.h> |
|||
#include <asm/mach/arch.h> |
|||
#include <asm/mach/map.h> |
|||
#include <mach/kirkwood.h> |
|||
#include <mach/bridge-regs.h> |
|||
#include <plat/mvsdio.h> |
|||
#include "common.h" |
|||
#include "mpp.h" |
|||
|
|||
static struct mv643xx_eth_platform_data goflexnet_ge00_data = { |
|||
.phy_addr = MV643XX_ETH_PHY_ADDR(0), |
|||
}; |
|||
|
|||
static unsigned int goflexnet_mpp_config[] __initdata = { |
|||
MPP29_GPIO, /* USB Power Enable */ |
|||
MPP47_GPIO, /* LED Orange */ |
|||
MPP46_GPIO, /* LED Green */ |
|||
MPP45_GPIO, /* LED Left Capacity 3 */ |
|||
MPP44_GPIO, /* LED Left Capacity 2 */ |
|||
MPP43_GPIO, /* LED Left Capacity 1 */ |
|||
MPP42_GPIO, /* LED Left Capacity 0 */ |
|||
MPP41_GPIO, /* LED Right Capacity 3 */ |
|||
MPP40_GPIO, /* LED Right Capacity 2 */ |
|||
MPP39_GPIO, /* LED Right Capacity 1 */ |
|||
MPP38_GPIO, /* LED Right Capacity 0 */ |
|||
0 |
|||
}; |
|||
|
|||
void __init goflexnet_init(void) |
|||
{ |
|||
/*
|
|||
* Basic setup. Needs to be called early. |
|||
*/ |
|||
kirkwood_mpp_conf(goflexnet_mpp_config); |
|||
|
|||
if (gpio_request(29, "USB Power Enable") != 0 || |
|||
gpio_direction_output(29, 1) != 0) |
|||
pr_err("can't setup GPIO 29 (USB Power Enable)\n"); |
|||
kirkwood_ehci_init(); |
|||
|
|||
kirkwood_ge00_init(&goflexnet_ge00_data); |
|||
} |
|||