forked from Minki/linux
ee1a8d402e
These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once. There are a few conflicts with the other branches unfortunately: * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added from multiple branches. Need to be careful to have the right set of closing braces as git gets this one wrong. * In kirkwood.dtsi, one 'ranges' line got split into two lines, while another line got added. Order of the lines does not matter. * in sama5d3.dtsi, some cleanup was merged the wrong way, causing a bogus conflict. We want the 'dmas' and 'dma-names' properties to get added here. * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1 Bgy9PnJTNo8= =8PtJ -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device tree changes from Arnd Bergmann: "These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits) ARM: at91: dt: rm9200ek: add spi support ARM: at91: dt: rm9200: add spi support ARM: at91/DT: at91sam9n12: add SPI DMA client infos ARM: at91/DT: sama5d3: add SPI DMA client infos ARM: at91/DT: fix SPI compatibility string ARM: Kirkwood: Fix the internal register ranges translation ARM: dts: bcm281xx: change comment to C89 style ARM: mmc: bcm281xx SDHCI driver (dt mods) ARM: nomadik: add the new clocks to the device tree clk: nomadik: implement the Nomadik clocks properly ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency ARM: dts: omap4-panda: Fix DVI EDID reads ARM: dts: omap4-panda: Add USB Host support arm: mvebu: enable mini-PCIe connectors on Armada 370 RD ARM: shmobile: irqpin: add a DT property to enable masking on parent ARM: dts: AM43x EPOS EVM support ARM: dts: OMAP5: Add bandgap DT entry ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone ...
210 lines
4.2 KiB
Plaintext
210 lines
4.2 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>;
|
|
};
|
|
};
|
|
};
|