![Linus Torvalds](/assets/img/avatar_default.png)
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 ...
194 lines
3.9 KiB
Plaintext
194 lines
3.9 KiB
Plaintext
/dts-v1/;
|
|
|
|
/include/ "kirkwood.dtsi"
|
|
/include/ "kirkwood-6281.dtsi"
|
|
|
|
/ {
|
|
model = "MPL CEC4";
|
|
compatible = "mpl,cec4-10", "mpl,cec4", "marvell,kirkwood-88f6281", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x20000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8 earlyprintk";
|
|
};
|
|
|
|
ocp@f1000000 {
|
|
pinctrl: pinctrl@10000 {
|
|
pmx_led_health: pmx-led-health {
|
|
marvell,pins = "mpp7";
|
|
marvell,function = "gpo";
|
|
};
|
|
|
|
pmx_sata1: pmx-sata1 {
|
|
marvell,pins = "mpp34";
|
|
marvell,function = "sata1";
|
|
};
|
|
|
|
pmx_sata0: pmx-sata0 {
|
|
marvell,pins = "mpp35";
|
|
marvell,function = "sata0";
|
|
};
|
|
|
|
pmx_led_user1o: pmx-led-user1o {
|
|
marvell,pins = "mpp40";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_user1g: pmx-led-user1g {
|
|
marvell,pins = "mpp41";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_user0o: pmx-led-user0o {
|
|
marvell,pins = "mpp44";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_user0g: pmx-led-user0g {
|
|
marvell,pins = "mpp45";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_led_misc: pmx-led-misc {
|
|
marvell,pins = "mpp46";
|
|
marvell,function = "gpio";
|
|
};
|
|
|
|
pmx_sdio_cd: pmx-sdio-cd {
|
|
marvell,pins = "mpp47";
|
|
marvell,function = "gpio";
|
|
};
|
|
};
|
|
|
|
i2c@11000 {
|
|
status = "okay";
|
|
|
|
rtc@51 {
|
|
compatible = "nxp,pcf8563";
|
|
reg = <0x51>;
|
|
};
|
|
|
|
eeprom@57 {
|
|
compatible = "atmel,24c02";
|
|
reg = <0x57>;
|
|
};
|
|
|
|
};
|
|
|
|
serial@12000 {
|
|
status = "ok";
|
|
pinctrl-0 = <&pmx_uart0>;
|
|
pinctrl-names = "default";
|
|
};
|
|
|
|
nand@3000000 {
|
|
pinctrl-0 = <&pmx_nand>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
|
|
partition@0 {
|
|
label = "uboot";
|
|
reg = <0x0000000 0x100000>;
|
|
};
|
|
|
|
partition@100000 {
|
|
label = "env";
|
|
reg = <0x100000 0x80000>;
|
|
};
|
|
|
|
partition@180000 {
|
|
label = "fdt";
|
|
reg = <0x180000 0x80000>;
|
|
};
|
|
|
|
partition@200000 {
|
|
label = "kernel";
|
|
reg = <0x200000 0x400000>;
|
|
};
|
|
|
|
partition@600000 {
|
|
label = "rootfs";
|
|
reg = <0x600000 0x1fa00000>;
|
|
};
|
|
};
|
|
|
|
rtc@10300 {
|
|
status = "disabled";
|
|
};
|
|
|
|
sata@80000 {
|
|
pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
|
|
pinctrl-names = "default";
|
|
nr-ports = <2>;
|
|
status = "okay";
|
|
};
|
|
|
|
mvsdio@90000 {
|
|
pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
cd-gpios = <&gpio1 15 1>;
|
|
/* No WP GPIO */
|
|
};
|
|
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
|
|
gpio-leds {
|
|
compatible = "gpio-leds";
|
|
pinctrl-0 = < &pmx_led_health
|
|
&pmx_led_user1o
|
|
&pmx_led_user1g &pmx_led_user0o
|
|
&pmx_led_user0g &pmx_led_misc
|
|
>;
|
|
pinctrl-names = "default";
|
|
|
|
health {
|
|
label = "status:green:health";
|
|
gpios = <&gpio0 7 1>;
|
|
};
|
|
|
|
user1o {
|
|
label = "user1:orange";
|
|
gpios = <&gpio1 8 1>;
|
|
default-state = "on";
|
|
};
|
|
|
|
user1g {
|
|
label = "user1:green";
|
|
gpios = <&gpio1 9 1>;
|
|
default-state = "on";
|
|
};
|
|
|
|
user0o {
|
|
label = "user0:orange";
|
|
gpios = <&gpio1 12 1>;
|
|
default-state = "on";
|
|
};
|
|
|
|
user0g {
|
|
label = "user0:green";
|
|
gpios = <&gpio1 13 1>;
|
|
default-state = "on";
|
|
};
|
|
|
|
misc {
|
|
label = "status:orange:misc";
|
|
gpios = <&gpio1 14 1>;
|
|
default-state = "on";
|
|
};
|
|
|
|
};
|
|
};
|
|
|