mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 12:32:31 -04:00
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.
...
103 lines
1.6 KiB
Plaintext
103 lines
1.6 KiB
Plaintext
#include "kirkwood.dtsi"
|
|
#include "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_ns2_sata0: pmx-ns2-sata0 {
|
|
marvell,pins = "mpp21";
|
|
marvell,function = "sata0";
|
|
};
|
|
pmx_ns2_sata1: pmx-ns2-sata1 {
|
|
marvell,pins = "mpp20";
|
|
marvell,function = "sata1";
|
|
};
|
|
};
|
|
|
|
serial@12000 {
|
|
pinctrl-0 = <&pmx_uart0>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
};
|
|
|
|
spi@10600 {
|
|
pinctrl-0 = <&pmx_spi>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
|
|
flash@0 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "mx25l4005a";
|
|
reg = <0>;
|
|
spi-max-frequency = <20000000>;
|
|
mode = <0>;
|
|
|
|
partition@0 {
|
|
reg = <0x0 0x80000>;
|
|
label = "u-boot";
|
|
};
|
|
};
|
|
};
|
|
|
|
i2c@11000 {
|
|
pinctrl-0 = <&pmx_twsi0>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
|
|
eeprom@50 {
|
|
compatible = "at,24c04";
|
|
pagesize = <16>;
|
|
reg = <0x50>;
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
button@1 {
|
|
label = "Power push button";
|
|
linux,code = <116>;
|
|
gpios = <&gpio1 0 0>;
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
|
|
red-fail {
|
|
label = "ns2:red:fail";
|
|
gpios = <&gpio0 12 0>;
|
|
};
|
|
};
|
|
|
|
gpio_poweroff {
|
|
compatible = "gpio-poweroff";
|
|
gpios = <&gpio0 31 0>;
|
|
};
|
|
|
|
};
|
|
|
|
&mdio {
|
|
status = "okay";
|
|
|
|
ethphy0: ethernet-phy {
|
|
device_type = "ethernet-phy";
|
|
/* overwrite reg property in board file */
|
|
};
|
|
};
|
|
|
|
ð0 {
|
|
status = "okay";
|
|
ethernet0-port@0 {
|
|
phy-handle = <ðphy0>;
|
|
};
|
|
};
|