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 ...
245 lines
5.2 KiB
Plaintext
245 lines
5.2 KiB
Plaintext
/*
|
|
* Device Tree Include file for Marvell Armada 370 and Armada XP SoC
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Lior Amsalem <alior@marvell.com>
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
* Ben Dooks <ben.dooks@codethink.co.uk>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*
|
|
* This file contains the definitions that are common to the Armada
|
|
* 370 and Armada XP SoC.
|
|
*/
|
|
|
|
/include/ "skeleton64.dtsi"
|
|
|
|
/ {
|
|
model = "Marvell Armada 370 and XP SoC";
|
|
compatible = "marvell,armada-370-xp";
|
|
|
|
aliases {
|
|
eth0 = ð0;
|
|
eth1 = ð1;
|
|
};
|
|
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
cpu@0 {
|
|
compatible = "marvell,sheeva-v7";
|
|
device_type = "cpu";
|
|
reg = <0>;
|
|
};
|
|
};
|
|
|
|
soc {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "simple-bus";
|
|
interrupt-parent = <&mpic>;
|
|
ranges = <0 0 0xd0000000 0x0100000 /* internal registers */
|
|
0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
|
|
|
|
internal-regs {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
ranges;
|
|
|
|
mpic: interrupt-controller@20000 {
|
|
compatible = "marvell,mpic";
|
|
#interrupt-cells = <1>;
|
|
#size-cells = <1>;
|
|
interrupt-controller;
|
|
};
|
|
|
|
coherency-fabric@20200 {
|
|
compatible = "marvell,coherency-fabric";
|
|
reg = <0x20200 0xb0>, <0x21810 0x1c>;
|
|
};
|
|
|
|
serial@12000 {
|
|
compatible = "snps,dw-apb-uart";
|
|
reg = <0x12000 0x100>;
|
|
reg-shift = <2>;
|
|
interrupts = <41>;
|
|
reg-io-width = <1>;
|
|
status = "disabled";
|
|
};
|
|
serial@12100 {
|
|
compatible = "snps,dw-apb-uart";
|
|
reg = <0x12100 0x100>;
|
|
reg-shift = <2>;
|
|
interrupts = <42>;
|
|
reg-io-width = <1>;
|
|
status = "disabled";
|
|
};
|
|
|
|
timer@20300 {
|
|
compatible = "marvell,armada-370-xp-timer";
|
|
reg = <0x20300 0x30>, <0x21040 0x30>;
|
|
interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
|
|
clocks = <&coreclk 2>;
|
|
};
|
|
|
|
sata@a0000 {
|
|
compatible = "marvell,orion-sata";
|
|
reg = <0xa0000 0x5000>;
|
|
interrupts = <55>;
|
|
clocks = <&gateclk 15>, <&gateclk 30>;
|
|
clock-names = "0", "1";
|
|
status = "disabled";
|
|
};
|
|
|
|
mdio {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
compatible = "marvell,orion-mdio";
|
|
reg = <0x72004 0x4>;
|
|
};
|
|
|
|
eth0: ethernet@70000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x70000 0x4000>;
|
|
interrupts = <8>;
|
|
clocks = <&gateclk 4>;
|
|
status = "disabled";
|
|
};
|
|
|
|
eth1: ethernet@74000 {
|
|
compatible = "marvell,armada-370-neta";
|
|
reg = <0x74000 0x4000>;
|
|
interrupts = <10>;
|
|
clocks = <&gateclk 3>;
|
|
status = "disabled";
|
|
};
|
|
|
|
i2c0: i2c@11000 {
|
|
compatible = "marvell,mv64xxx-i2c";
|
|
reg = <0x11000 0x20>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <31>;
|
|
timeout-ms = <1000>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
i2c1: i2c@11100 {
|
|
compatible = "marvell,mv64xxx-i2c";
|
|
reg = <0x11100 0x20>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
interrupts = <32>;
|
|
timeout-ms = <1000>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
rtc@10300 {
|
|
compatible = "marvell,orion-rtc";
|
|
reg = <0x10300 0x20>;
|
|
interrupts = <50>;
|
|
};
|
|
|
|
mvsdio@d4000 {
|
|
compatible = "marvell,orion-sdio";
|
|
reg = <0xd4000 0x200>;
|
|
interrupts = <54>;
|
|
clocks = <&gateclk 17>;
|
|
bus-width = <4>;
|
|
cap-sdio-irq;
|
|
cap-sd-highspeed;
|
|
cap-mmc-highspeed;
|
|
status = "disabled";
|
|
};
|
|
|
|
usb@50000 {
|
|
compatible = "marvell,orion-ehci";
|
|
reg = <0x50000 0x500>;
|
|
interrupts = <45>;
|
|
status = "disabled";
|
|
};
|
|
|
|
usb@51000 {
|
|
compatible = "marvell,orion-ehci";
|
|
reg = <0x51000 0x500>;
|
|
interrupts = <46>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spi0: spi@10600 {
|
|
compatible = "marvell,orion-spi";
|
|
reg = <0x10600 0x28>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
cell-index = <0>;
|
|
interrupts = <30>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
spi1: spi@10680 {
|
|
compatible = "marvell,orion-spi";
|
|
reg = <0x10680 0x28>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
cell-index = <1>;
|
|
interrupts = <92>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
devbus-bootcs@10400 {
|
|
compatible = "marvell,mvebu-devbus";
|
|
reg = <0x10400 0x8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
devbus-cs0@10408 {
|
|
compatible = "marvell,mvebu-devbus";
|
|
reg = <0x10408 0x8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
devbus-cs1@10410 {
|
|
compatible = "marvell,mvebu-devbus";
|
|
reg = <0x10410 0x8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
devbus-cs2@10418 {
|
|
compatible = "marvell,mvebu-devbus";
|
|
reg = <0x10418 0x8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
|
|
devbus-cs3@10420 {
|
|
compatible = "marvell,mvebu-devbus";
|
|
reg = <0x10420 0x8>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
clocks = <&coreclk 0>;
|
|
status = "disabled";
|
|
};
|
|
};
|
|
};
|
|
};
|