mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
44598f98b9
Board updates for 3.12. Again, a bit of domain overlap with SoC and DT branches,
but most of this is around legacy code and board support. We've found that
platform maintainers have a hard time separating all of these out and might
move towards fewer branches for next release.
- Removal of a number of Marvell Kirkwood board files, since contents
is now common and mostly configured via DT.
- Device-tree updates for Marvell Dove, including irqchip and clocksource
setup.
- Defconfig updates. Gotta go somewhere. One new one for Renesas Lager.
- New backlight drivers for backlights used on Renesas shmobile platforms.
- Removal of Renesas leds driver.
- Shuffling of some of the new Broadcom platforms to give room for others in
the same mach directory. More in 2.13.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSKhrfAAoJEIwa5zzehBx3OOAQAJCWhoYaHvWmyAf+xCOQNpX2
YgAngENW04VpHFOyn6BtoGv6+5JypdB2TmK3GHHlVJd1Im5mD1wgm8hAfgyV8lQ4
UeJULdA2HZAstKeTirO65BIyUb5QIrWakF24ccfIfg2xeScM8FV0m8cmzeo3fYAf
DmmeoSCmvTdu/cDWBNlsQZ/as8qCQwyF+5kZg+SMl1btA1Publu2I5lDE02TH46d
sc5mN+ihw0JG62EJV7pov6uVyeFLExoTbrNfQZ4rixmKkMDS/jq5ZbBS5c0i8ULF
s1UMSZtYTcUO9rAPv3+MOIc7fq7nKo9lLuwMrA1HHUEDJ2BEi8DIp99F+ZYm/MSL
WpVxYNwOobPcMJBYGR2fy4GgpIyWB285GgrBUxcq7t0Xi4uBbptwjLhDE4d7LREV
8guW251R+OEVPYcwFctsubnox0MViyC3CQ1FaAAdtTjpSKomlhk/yaxaQ9nGrxls
QCZgXHWm4Ir3QYv8XfOn0X9vdP81EnX11SiwtrRSJ71QMs814nB8NdPDqU4VHsw8
exKmqjq/Lt+F9Kpxn/FevNNuYOdefZNQi00yl3ERchdIGdvRwE/0yA0D69mpwIVr
E41UwvH3g43vazCo2PMdWPWuFlpGMR3iZ4pXnDLH/w33ppfJWfokYwKSRQ/mu/MN
LMjkwoZn1X+fZzNSh9/G
=EGua
-----END PGP SIGNATURE-----
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board updates from Olof Johansson:
"Board updates for 3.12. Again, a bit of domain overlap with SoC and
DT branches, but most of this is around legacy code and board support.
We've found that platform maintainers have a hard time separating all
of these out and might move towards fewer branches for next release.
- Removal of a number of Marvell Kirkwood board files, since contents
is now common and mostly configured via DT.
- Device-tree updates for Marvell Dove, including irqchip and
clocksource setup.
- Defconfig updates. Gotta go somewhere. One new one for Renesas
Lager.
- New backlight drivers for backlights used on Renesas shmobile
platforms.
- Removal of Renesas leds driver.
- Shuffling of some of the new Broadcom platforms to give room for
others in the same mach directory. More in 3.13"
* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
mmc: sdhci-bcm-kona: Staticize sdhci_bcm_kona_card_event
mmc: sdhci-bcm-kona: Remove unneeded version.h inclusion
ARM: bcm: Make secure API call optional
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
ARM: bcm: Rename board_bcm
mmc: sdhci-bcm-kona: make linker-section warning go away
ARM: tegra: defconfig updates
ARM: dove: add initial DT file for Globalscale D2Plug
ARM: dove: add GPIO IR receiver node to SolidRun CuBox
ARM: dove: add common pinmux functions to DT
ARM: dove: add cpu device tree node
ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument
ARM: kirkwood: fix DT building and update defconfig
ARM: kirkwood: Remove all remaining trace of DNS-320/325 platform code
ARM: configs: disable DEBUG_LL in bcm_defconfig
ARM: bcm281xx: Board specific reboot code
ARM bcm281xx: Turn on socket & network support.
ARM: bcm281xx: Turn on L2 cache.
...
282 lines
6.1 KiB
Text
282 lines
6.1 KiB
Text
/include/ "skeleton.dtsi"
|
|
|
|
#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
|
|
|
|
/ {
|
|
compatible = "marvell,kirkwood";
|
|
interrupt-parent = <&intc>;
|
|
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
cpu@0 {
|
|
device_type = "cpu";
|
|
compatible = "marvell,feroceon";
|
|
clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
|
|
clock-names = "cpu_clk", "ddrclk", "powersave";
|
|
};
|
|
};
|
|
|
|
aliases {
|
|
gpio0 = &gpio0;
|
|
gpio1 = &gpio1;
|
|
};
|
|
|
|
mbus {
|
|
compatible = "marvell,kirkwood-mbus", "simple-bus";
|
|
#address-cells = <2>;
|
|
#size-cells = <1>;
|
|
controller = <&mbusc>;
|
|
pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
|
|
pcie-io-aperture = <0xf2000000 0x100000>; /* 1 MiB I/O space */
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
compatible = "simple-bus";
|
|
ranges = <0x00000000 0xf1000000 0x0100000
|
|
0xf4000000 0xf4000000 0x0000400
|
|
0xf5000000 0xf5000000 0x0000400>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
mbusc: mbus-controller@20000 {
|
|
compatible = "marvell,mbus-controller";
|
|
reg = <0x20000 0x80>, <0x1500 0x20>;
|
|
};
|
|
|
|
timer: timer@20300 {
|
|
compatible = "marvell,orion-timer";
|
|
reg = <0x20300 0x20>;
|
|
interrupt-parent = <&bridge_intc>;
|
|
interrupts = <1>, <2>;
|
|
clocks = <&core_clk 0>;
|
|
};
|
|
|
|
intc: main-interrupt-ctrl@20200 {
|
|
compatible = "marvell,orion-intc";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
reg = <0x20200 0x10>, <0x20210 0x10>;
|
|
};
|
|
|
|
bridge_intc: bridge-interrupt-ctrl@20110 {
|
|
compatible = "marvell,orion-bridge-intc";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
reg = <0x20110 0x8>;
|
|
interrupts = <1>;
|
|
marvell,#interrupts = <6>;
|
|
};
|
|
|
|
core_clk: core-clocks@10030 {
|
|
compatible = "marvell,kirkwood-core-clock";
|
|
reg = <0x10030 0x4>;
|
|
#clock-cells = <1>;
|
|
};
|
|
|
|
gpio0: gpio@10100 {
|
|
compatible = "marvell,orion-gpio";
|
|
#gpio-cells = <2>;
|
|
gpio-controller;
|
|
reg = <0x10100 0x40>;
|
|
ngpios = <32>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <35>, <36>, <37>, <38>;
|
|
clocks = <&gate_clk 7>;
|
|
};
|
|
|
|
gpio1: gpio@10140 {
|
|
compatible = "marvell,orion-gpio";
|
|
#gpio-cells = <2>;
|
|
gpio-controller;
|
|
reg = <0x10140 0x40>;
|
|
ngpios = <18>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
interrupts = <39>, <40>, <41>;
|
|
clocks = <&gate_clk 7>;
|
|
};
|
|
|
|
serial@12000 {
|
|
compatible = "ns16550a";
|
|
reg = <0x12000 0x100>;
|
|
reg-shift = <2>;
|
|
interrupts = <33>;
|
|
clocks = <&gate_clk 7>;
|
|
status = "disabled";
|
|
};
|
|
|
|
serial@12100 {
|
|
compatible = "ns16550a";
|
|
reg = <0x12100 0x100>;
|
|
reg-shift = <2>;
|
|
interrupts = <34>;
|
|
clocks = <&gate_clk 7>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spi@10600 {
|
|
compatible = "marvell,orion-spi";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
cell-index = <0>;
|
|
interrupts = <23>;
|
|
reg = <0x10600 0x28>;
|
|
clocks = <&gate_clk 7>;
|
|
status = "disabled";
|
|
};
|
|
|
|
gate_clk: clock-gating-control@2011c {
|
|
compatible = "marvell,kirkwood-gating-clock";
|
|
reg = <0x2011c 0x4>;
|
|
clocks = <&core_clk 0>;
|
|
#clock-cells = <1>;
|
|
};
|
|
|
|
wdt: watchdog-timer@20300 {
|
|
compatible = "marvell,orion-wdt";
|
|
reg = <0x20300 0x28>;
|
|
interrupt-parent = <&bridge_intc>;
|
|
interrupts = <3>;
|
|
clocks = <&gate_clk 7>;
|
|
status = "okay";
|
|
};
|
|
|
|
xor@60800 {
|
|
compatible = "marvell,orion-xor";
|
|
reg = <0x60800 0x100
|
|
0x60A00 0x100>;
|
|
status = "okay";
|
|
clocks = <&gate_clk 8>;
|
|
|
|
xor00 {
|
|
interrupts = <5>;
|
|
dmacap,memcpy;
|
|
dmacap,xor;
|
|
};
|
|
xor01 {
|
|
interrupts = <6>;
|
|
dmacap,memcpy;
|
|
dmacap,xor;
|
|
dmacap,memset;
|
|
};
|
|
};
|
|
|
|
xor@60900 {
|
|
compatible = "marvell,orion-xor";
|
|
reg = <0x60900 0x100
|
|
0xd0B00 0x100>;
|
|
status = "okay";
|
|
clocks = <&gate_clk 16>;
|
|
|
|
xor00 {
|
|
interrupts = <7>;
|
|
dmacap,memcpy;
|
|
dmacap,xor;
|
|
};
|
|
xor01 {
|
|
interrupts = <8>;
|
|
dmacap,memcpy;
|
|
dmacap,xor;
|
|
dmacap,memset;
|
|
};
|
|
};
|
|
|
|
ehci@50000 {
|
|
compatible = "marvell,orion-ehci";
|
|
reg = <0x50000 0x1000>;
|
|
interrupts = <19>;
|
|
clocks = <&gate_clk 3>;
|
|
status = "okay";
|
|
};
|
|
|
|
nand@3000000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
cle = <0>;
|
|
ale = <1>;
|
|
bank-width = <1>;
|
|
compatible = "marvell,orion-nand";
|
|
reg = <0xf4000000 0x400>;
|
|
chip-delay = <25>;
|
|
/* set partition map and/or chip-delay in board dts */
|
|
clocks = <&gate_clk 7>;
|
|
status = "disabled";
|
|
};
|
|
|
|
i2c@11000 {
|
|
compatible = "marvell,mv64xxx-i2c";
|
|
reg = <0x11000 0x20>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <29>;
|
|
clock-frequency = <100000>;
|
|
clocks = <&gate_clk 7>;
|
|
status = "disabled";
|
|
};
|
|
|
|
crypto@30000 {
|
|
compatible = "marvell,orion-crypto";
|
|
reg = <0x30000 0x10000>,
|
|
<0xf5000000 0x800>;
|
|
reg-names = "regs", "sram";
|
|
interrupts = <22>;
|
|
clocks = <&gate_clk 17>;
|
|
status = "okay";
|
|
};
|
|
|
|
mdio: mdio-bus@72004 {
|
|
compatible = "marvell,orion-mdio";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0x72004 0x84>;
|
|
interrupts = <46>;
|
|
clocks = <&gate_clk 0>;
|
|
status = "disabled";
|
|
|
|
/* add phy nodes in board file */
|
|
};
|
|
|
|
eth0: ethernet-controller@72000 {
|
|
compatible = "marvell,kirkwood-eth";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0x72000 0x4000>;
|
|
clocks = <&gate_clk 0>;
|
|
marvell,tx-checksum-limit = <1600>;
|
|
status = "disabled";
|
|
|
|
ethernet0-port@0 {
|
|
device_type = "network";
|
|
compatible = "marvell,kirkwood-eth-port";
|
|
reg = <0>;
|
|
interrupts = <11>;
|
|
/* overwrite MAC address in bootloader */
|
|
local-mac-address = [00 00 00 00 00 00];
|
|
/* set phy-handle property in board file */
|
|
};
|
|
};
|
|
|
|
eth1: ethernet-controller@76000 {
|
|
compatible = "marvell,kirkwood-eth";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0x76000 0x4000>;
|
|
clocks = <&gate_clk 19>;
|
|
marvell,tx-checksum-limit = <1600>;
|
|
status = "disabled";
|
|
|
|
ethernet1-port@0 {
|
|
device_type = "network";
|
|
compatible = "marvell,kirkwood-eth-port";
|
|
reg = <0>;
|
|
interrupts = <15>;
|
|
/* overwrite MAC address in bootloader */
|
|
local-mac-address = [00 00 00 00 00 00];
|
|
/* set phy-handle property in board file */
|
|
};
|
|
};
|
|
};
|
|
};
|