mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00: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 ...
98 lines
1.8 KiB
Text
98 lines
1.8 KiB
Text
/ {
|
|
model = "QNAP TS219 family";
|
|
compatible = "qnap,ts219", "marvell,kirkwood";
|
|
|
|
memory {
|
|
device_type = "memory";
|
|
reg = <0x00000000 0x20000000>;
|
|
};
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200n8";
|
|
};
|
|
|
|
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>;
|
|
};
|
|
pcie-controller {
|
|
status = "okay";
|
|
|
|
pcie@1,0 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
};
|
|
};
|