mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +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. ...
130 lines
2.2 KiB
Plaintext
130 lines
2.2 KiB
Plaintext
/dts-v1/;
|
|
|
|
#include "kirkwood.dtsi"
|
|
#include "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
model = "Globalscale Technologies Dreamplug";
|
|
compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x20000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_led_bluetooth: pmx-led-bluetooth {
|
|
marvell,pins = "mpp47";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_wifi: pmx-led-wifi {
|
|
marvell,pins = "mpp48";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_wifi_ap: pmx-led-wifi-ap {
|
|
marvell,pins = "mpp49";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
serial@12000 {
|
|
status = "ok";
|
|
};
|
|
|
|
spi@10600 {
|
|
status = "okay";
|
|
pinctrl-0 = <&pmx_spi>;
|
|
pinctrl-names = "default";
|
|
|
|
m25p40@0 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "mx25l1606e";
|
|
reg = <0>;
|
|
spi-max-frequency = <50000000>;
|
|
mode = <0>;
|
|
|
|
partition@0 {
|
|
reg = <0x0 0x80000>;
|
|
label = "u-boot";
|
|
};
|
|
|
|
partition@100000 {
|
|
reg = <0x100000 0x10000>;
|
|
label = "u-boot env";
|
|
};
|
|
|
|
partition@180000 {
|
|
reg = <0x180000 0x10000>;
|
|
label = "dtb";
|
|
};
|
|
};
|
|
};
|
|
|
|
sata@80000 {
|
|
status = "okay";
|
|
nr-ports = <1>;
|
|
};
|
|
|
|
mvsdio@90000 {
|
|
pinctrl-0 = <&pmx_sdio>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
/* No CD or WP GPIOs */
|
|
broken-cd;
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = <&pmx_led_bluetooth &pmx_led_wifi
|
|
&pmx_led_wifi_ap >;
|
|
pinctrl-names = "default";
|
|
|
|
bluetooth {
|
|
label = "dreamplug:blue:bluetooth";
|
|
gpios = <&gpio1 15 1>;
|
|
};
|
|
wifi {
|
|
label = "dreamplug:green:wifi";
|
|
gpios = <&gpio1 16 1>;
|
|
};
|
|
wifi-ap {
|
|
label = "dreamplug:green:wifi_ap";
|
|
gpios = <&gpio1 17 1>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&mdio {
|
|
status = "okay";
|
|
|
|
ethphy0: ethernet-phy@0 {
|
|
device_type = "ethernet-phy";
|
|
reg = <0>;
|
|
};
|
|
|
|
ethphy1: ethernet-phy@1 {
|
|
device_type = "ethernet-phy";
|
|
reg = <1>;
|
|
};
|
|
};
|
|
|
|
ð0 {
|
|
status = "okay";
|
|
ethernet0-port@0 {
|
|
phy-handle = <ðphy0>;
|
|
};
|
|
};
|
|
|
|
ð1 {
|
|
status = "okay";
|
|
ethernet1-port@0 {
|
|
phy-handle = <ðphy1>;
|
|
};
|
|
};
|