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. ...
118 lines
2.1 KiB
Plaintext
118 lines
2.1 KiB
Plaintext
/ {
|
|
model = "QNAP TS219 family";
|
|
compatible = "qnap,ts219", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x20000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8";
|
|
};
|
|
|
|
mbus {
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
i2c@11000 {
|
|
status = "okay";
|
|
clock-frequency = <400000>;
|
|
pinctrl-0 = <&pmx_twsi0>;
|
|
pinctrl-names = "default";
|
|
|
|
s35390a: s35390a@30 {
|
|
compatible = "s35390a";
|
|
reg = <0x30>;
|
|
};
|
|
};
|
|
serial@12000 {
|
|
clock-frequency = <200000000>;
|
|
status = "okay";
|
|
pinctrl-0 = <&pmx_uart0>;
|
|
pinctrl-names = "default";
|
|
};
|
|
serial@12100 {
|
|
clock-frequency = <200000000>;
|
|
status = "okay";
|
|
pinctrl-0 = <&pmx_uart1>;
|
|
pinctrl-names = "default";
|
|
};
|
|
poweroff@12100 {
|
|
compatible = "qnap,power-off";
|
|
reg = <0x12000 0x100>;
|
|
clocks = <&gate_clk 7>;
|
|
};
|
|
spi@10600 {
|
|
status = "okay";
|
|
pinctrl-0 = <&pmx_spi>;
|
|
pinctrl-names = "default";
|
|
|
|
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 {
|
|
pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
nr-ports = <2>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&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>;
|
|
};
|
|
};
|