mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +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. ...
238 lines
4.6 KiB
Plaintext
238 lines
4.6 KiB
Plaintext
#include "kirkwood.dtsi"
|
|
#include "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_power_hdd: pmx-power-hdd {
|
|
marvell,pins = "mpp10";
|
|
marvell,function = "gpo";
|
|
};
|
|
pmx_usb_vbus: pmx-usb-vbus {
|
|
marvell,pins = "mpp11";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_fan_high: pmx-fan-high {
|
|
marvell,pins = "mpp18";
|
|
marvell,function = "gpo";
|
|
};
|
|
pmx_fan_low: pmx-fan-low {
|
|
marvell,pins = "mpp19";
|
|
marvell,function = "gpo";
|
|
};
|
|
pmx_led_function_blue: pmx-led-function-blue {
|
|
marvell,pins = "mpp36";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_alarm: pmx-led-alarm {
|
|
marvell,pins = "mpp37";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_info: pmx-led-info {
|
|
marvell,pins = "mpp38";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_power: pmx-led-power {
|
|
marvell,pins = "mpp39";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_fan_lock: pmx-fan-lock {
|
|
marvell,pins = "mpp40";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_button_function: pmx-button-function {
|
|
marvell,pins = "mpp41";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_power_switch: pmx-power-switch {
|
|
marvell,pins = "mpp42";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_power_auto_switch: pmx-power-auto-switch {
|
|
marvell,pins = "mpp43";
|
|
marvell,function = "gpio";
|
|
};
|
|
pmx_led_function_red: pmx-led-function_red {
|
|
marvell,pins = "mpp48";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
};
|
|
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>;
|
|
pinctrl-0 = <&pmx_button_function &pmx_power_switch
|
|
&pmx_power_auto_switch>;
|
|
pinctrl-names = "default";
|
|
|
|
button@1 {
|
|
label = "Function Button";
|
|
linux,code = <357>;
|
|
gpios = <&gpio1 9 1>;
|
|
};
|
|
button@2 {
|
|
label = "Power-on Switch";
|
|
linux,code = <0>;
|
|
linux,input-type = <5>;
|
|
gpios = <&gpio1 10 1>;
|
|
};
|
|
button@3 {
|
|
label = "Power-auto Switch";
|
|
linux,code = <1>;
|
|
linux,input-type = <5>;
|
|
gpios = <&gpio1 11 1>;
|
|
};
|
|
};
|
|
|
|
gpio_leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = <&pmx_led_function_red &pmx_led_alarm
|
|
&pmx_led_info &pmx_led_power
|
|
&pmx_led_function_blue>;
|
|
pinctrl-names = "default";
|
|
|
|
led@1 {
|
|
label = "lsxl:blue:func";
|
|
gpios = <&gpio1 4 1>;
|
|
};
|
|
|
|
led@2 {
|
|
label = "lsxl:red:alarm";
|
|
gpios = <&gpio1 5 1>;
|
|
};
|
|
|
|
led@3 {
|
|
label = "lsxl:amber:info";
|
|
gpios = <&gpio1 6 1>;
|
|
};
|
|
|
|
led@4 {
|
|
label = "lsxl:blue:power";
|
|
gpios = <&gpio1 7 1>;
|
|
linux,default-trigger = "default-on";
|
|
};
|
|
|
|
led@5 {
|
|
label = "lsxl:red:func";
|
|
gpios = <&gpio1 16 1>;
|
|
};
|
|
};
|
|
|
|
gpio_fan {
|
|
compatible = "gpio-fan";
|
|
pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
|
|
pinctrl-names = "default";
|
|
gpios = <&gpio0 19 1
|
|
&gpio0 18 1>;
|
|
gpio-fan,speed-map = <0 3
|
|
1500 2
|
|
3250 1
|
|
5000 0>;
|
|
alarm-gpios = <&gpio1 8 0>;
|
|
};
|
|
|
|
restart_poweroff {
|
|
compatible = "restart-poweroff";
|
|
};
|
|
|
|
regulators {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_power_hdd &pmx_usb_vbus>;
|
|
pinctrl-names = "default";
|
|
|
|
usb_power: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
reg = <1>;
|
|
regulator-name = "USB Power";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 11 0>;
|
|
};
|
|
hdd_power: regulator@2 {
|
|
compatible = "regulator-fixed";
|
|
reg = <2>;
|
|
regulator-name = "HDD Power";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
enable-active-high;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 10 0>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&mdio {
|
|
status = "okay";
|
|
|
|
ethphy0: ethernet-phy@0 {
|
|
device_type = "ethernet-phy";
|
|
reg = <0>;
|
|
};
|
|
|
|
ethphy1: ethernet-phy@8 {
|
|
device_type = "ethernet-phy";
|
|
reg = <8>;
|
|
};
|
|
};
|
|
|
|
ð0 {
|
|
status = "okay";
|
|
ethernet0-port@0 {
|
|
phy-handle = <ðphy0>;
|
|
};
|
|
};
|
|
|
|
ð1 {
|
|
status = "okay";
|
|
ethernet1-port@0 {
|
|
phy-handle = <ðphy1>;
|
|
};
|
|
};
|