mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-28 13:34:38 +08:00
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 ...
276 lines
5.2 KiB
Plaintext
276 lines
5.2 KiB
Plaintext
/dts-v1/;
|
|
|
|
/include/ "kirkwood.dtsi"
|
|
/include/ "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
model = "ZyXEL NSA310";
|
|
compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x10000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pinctrl-0 = <&pmx_unknown>;
|
|
pinctrl-names = "default";
|
|
|
|
pmx_led_esata_green: pmx-led-esata-green {
|
|
marvell,pins = "mpp12";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_esata_red: pmx-led-esata-red {
|
|
marvell,pins = "mpp13";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_usb_green: pmx-led-usb-green {
|
|
marvell,pins = "mpp15";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_usb_red: pmx-led-usb-red {
|
|
marvell,pins = "mpp16";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_usb_power_off: pmx-usb-power-off {
|
|
marvell,pins = "mpp21";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_sys_green: pmx-led-sys-green {
|
|
marvell,pins = "mpp28";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_sys_red: pmx-led-sys-red {
|
|
marvell,pins = "mpp29";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_btn_reset: pmx-btn-reset {
|
|
marvell,pins = "mpp36";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_btn_copy: pmx-btn-copy {
|
|
marvell,pins = "mpp37";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_copy_green: pmx-led-copy-green {
|
|
marvell,pins = "mpp39";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_copy_red: pmx-led-copy-red {
|
|
marvell,pins = "mpp40";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_hdd_green: pmx-led-hdd-green {
|
|
marvell,pins = "mpp41";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_hdd_red: pmx-led-hdd-red {
|
|
marvell,pins = "mpp42";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_unknown: pmx-unknown {
|
|
marvell,pins = "mpp44";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_btn_power: pmx-btn-power {
|
|
marvell,pins = "mpp46";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_pwr_off: pmx-pwr-off {
|
|
marvell,pins = "mpp48";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
|
|
serial@12000 {
|
|
status = "ok";
|
|
};
|
|
|
|
sata@80000 {
|
|
status = "okay";
|
|
nr-ports = <2>;
|
|
};
|
|
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
adt7476: adt7476a@2e {
|
|
compatible = "adt7476";
|
|
reg = <0x2e>;
|
|
};
|
|
};
|
|
|
|
nand@3000000 {
|
|
status = "okay";
|
|
chip-delay = <35>;
|
|
|
|
partition@0 {
|
|
label = "uboot";
|
|
reg = <0x0000000 0x0100000>;
|
|
read-only;
|
|
};
|
|
partition@100000 {
|
|
label = "uboot_env";
|
|
reg = <0x0100000 0x0080000>;
|
|
};
|
|
partition@180000 {
|
|
label = "key_store";
|
|
reg = <0x0180000 0x0080000>;
|
|
};
|
|
partition@200000 {
|
|
label = "info";
|
|
reg = <0x0200000 0x0080000>;
|
|
};
|
|
partition@280000 {
|
|
label = "etc";
|
|
reg = <0x0280000 0x0a00000>;
|
|
};
|
|
partition@c80000 {
|
|
label = "kernel_1";
|
|
reg = <0x0c80000 0x0a00000>;
|
|
};
|
|
partition@1680000 {
|
|
label = "rootfs1";
|
|
reg = <0x1680000 0x2fc0000>;
|
|
};
|
|
partition@4640000 {
|
|
label = "kernel_2";
|
|
reg = <0x4640000 0x0a00000>;
|
|
};
|
|
partition@5040000 {
|
|
label = "rootfs2";
|
|
reg = <0x5040000 0x2fc0000>;
|
|
};
|
|
};
|
|
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio_keys {
|
|
compatible = "gpio-keys";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
|
|
pinctrl-names = "default";
|
|
|
|
button@1 {
|
|
label = "Power Button";
|
|
linux,code = <116>;
|
|
gpios = <&gpio1 14 0>;
|
|
};
|
|
button@2 {
|
|
label = "Copy Button";
|
|
linux,code = <133>;
|
|
gpios = <&gpio1 5 1>;
|
|
};
|
|
button@3 {
|
|
label = "Reset Button";
|
|
linux,code = <0x198>;
|
|
gpios = <&gpio1 4 1>;
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
|
|
&pmx_led_usb_green &pmx_led_usb_red
|
|
&pmx_led_sys_green &pmx_led_sys_red
|
|
&pmx_led_copy_green &pmx_led_copy_red
|
|
&pmx_led_hdd_green &pmx_led_hdd_red>;
|
|
pinctrl-names = "default";
|
|
|
|
green-sys {
|
|
label = "nsa310:green:sys";
|
|
gpios = <&gpio0 28 0>;
|
|
};
|
|
red-sys {
|
|
label = "nsa310:red:sys";
|
|
gpios = <&gpio0 29 0>;
|
|
};
|
|
green-hdd {
|
|
label = "nsa310:green:hdd";
|
|
gpios = <&gpio1 9 0>;
|
|
};
|
|
red-hdd {
|
|
label = "nsa310:red:hdd";
|
|
gpios = <&gpio1 10 0>;
|
|
};
|
|
green-esata {
|
|
label = "nsa310:green:esata";
|
|
gpios = <&gpio0 12 0>;
|
|
};
|
|
red-esata {
|
|
label = "nsa310:red:esata";
|
|
gpios = <&gpio0 13 0>;
|
|
};
|
|
green-usb {
|
|
label = "nsa310:green:usb";
|
|
gpios = <&gpio0 15 0>;
|
|
};
|
|
red-usb {
|
|
label = "nsa310:red:usb";
|
|
gpios = <&gpio0 16 0>;
|
|
};
|
|
green-copy {
|
|
label = "nsa310:green:copy";
|
|
gpios = <&gpio1 7 0>;
|
|
};
|
|
red-copy {
|
|
label = "nsa310:red:copy";
|
|
gpios = <&gpio1 8 0>;
|
|
};
|
|
};
|
|
|
|
gpio_poweroff {
|
|
compatible = "gpio-poweroff";
|
|
pinctrl-0 = <&pmx_pwr_off>;
|
|
pinctrl-names = "default";
|
|
gpios = <&gpio1 16 0>;
|
|
};
|
|
|
|
regulators {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
pinctrl-0 = <&pmx_usb_power_off>;
|
|
pinctrl-names = "default";
|
|
|
|
usb0_power_off: regulator@1 {
|
|
compatible = "regulator-fixed";
|
|
reg = <1>;
|
|
regulator-name = "USB Power Off";
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
gpio = <&gpio0 21 0>;
|
|
};
|
|
};
|
|
};
|