![Linus Torvalds](/assets/img/avatar_default.png)
These could not be part of the first cleanup branch, because they either came too late in the cycle, or they have dependencies on other branches. Important changes are: * The integrator platform is almost multiplatform capable after some reorganization (Linus Walleij) * Minor cleanups on Zynq (Michal Simek) * Lots of changes for Exynos and other Samsung platforms, including further preparations for multiplatform support and the clocks bindings are rearranged. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUz/2IGCrR//JCVInAQI+sA//baZOXHTNRR7uBh5PJgaDFIyNjtBDDyyB m+yYgw24n3WP1YWtFhBKza7p5Eh2spWYgffKV/logWM4SC3HjkCUsLkQwruHa2qe H/pCknUXqUNiwH76WVbfrABb+0tARjEB+U0QfXh7af7Zk+ZXMqQ1/ItU0YdpJiGO mOAI5c6gzpr953cmzuHer8foATmF5DNuJPhPDPYlgeg2+yvXgcnfi9a+AXE8Eqb1 sZeWUJrqJERBlmsVgihq1+gPJjh0Kw7D9r835JqQeKRnywFgvGbmf5kYriPiEEBt hJUUnRHW6GCFQM9MemP0nOaRQlQYJA+EPqzB+0YRps0Gq+3QCIXFzZwLije/eMvr 2YjpITS2MaTqvag1o4yNmfeG+hGMN6MgbOh9q5kLagTXn/9nsQ6aYkD9tCXw4G08 bH3PP90AT6jQoNDoac5Pt2xPBPvY1JnnUegw5YmQQAlKeSEaiSJnHaC4gD9jzy7q fvoXey/Fz/ZgtZKL0wjbjhUrurS45xqZUW0MlMFOt6U7wdG4wsuemaI2PID6tKp8 ZmZ5gyHsX+CK4GfmhFFu3XhM8hyRj3/OBSy0/Wls3znFH/6j/X1gvrH87gnS9+ax +Ettut5uCutDaUJRymXDlqdF9ysLC3DVHpofQPSCqVZ+IHQkUadypyc6YY1Z5mtQ x/nxniFA7/A= =1i9x -----END PGP SIGNATURE----- Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC late cleanups from Arnd Bergmann: "These could not be part of the first cleanup branch, because they either came too late in the cycle, or they have dependencies on other branches. Important changes are: - The integrator platform is almost multiplatform capable after some reorganization (Linus Walleij) - Minor cleanups on Zynq (Michal Simek) - Lots of changes for Exynos and other Samsung platforms, including further preparations for multiplatform support and the clocks bindings are rearranged" * tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits) devicetree: fix newly added exynos sata bindings ARM: EXYNOS: Fix compilation error in cpuidle.c ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h ARM: EXYNOS: Remove hardware.h file ARM: SAMSUNG: Remove hardware.h inclusion ARM: S3C24XX: Remove invalid code from hardware.h dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock ARM: dts: Keep some essential LDOs enabled for arndale-octa board ARM: dts: Disable MDMA1 node for arndale-octa board ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion serial: s3c: Fix build of header without serial_core.h preinclusion ARM: EXYNOS: Allow wake-up using GIC interrupts ARM: EXYNOS: Stop using legacy Samsung PM code ARM: EXYNOS: Remove PM initcalls and useless indirection ARM: EXYNOS: Fix abuse of CONFIG_PM ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h ARM: SAMSUNG: Move common save/restore helpers to separate file ARM: SAMSUNG: Move Samsung PM debug code into separate file ARM: SAMSUNG: Consolidate PM debug functions ARM: SAMSUNG: Use debug_ll_addr() to get UART base address ...
189 lines
4.6 KiB
Plaintext
189 lines
4.6 KiB
Plaintext
/*
|
|
* Copyright (C) 2011 Xilinx
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
compatible = "xlnx,zynq-7000";
|
|
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
cpu@0 {
|
|
compatible = "arm,cortex-a9";
|
|
device_type = "cpu";
|
|
reg = <0>;
|
|
clocks = <&clkc 3>;
|
|
operating-points = <
|
|
/* kHz uV */
|
|
666667 1000000
|
|
333334 1000000
|
|
222223 1000000
|
|
>;
|
|
};
|
|
|
|
cpu@1 {
|
|
compatible = "arm,cortex-a9";
|
|
device_type = "cpu";
|
|
reg = <1>;
|
|
clocks = <&clkc 3>;
|
|
};
|
|
};
|
|
|
|
pmu {
|
|
compatible = "arm,cortex-a9-pmu";
|
|
interrupts = <0 5 4>, <0 6 4>;
|
|
interrupt-parent = <&intc>;
|
|
reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
|
|
};
|
|
|
|
amba {
|
|
compatible = "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
interrupt-parent = <&intc>;
|
|
ranges;
|
|
|
|
intc: interrupt-controller@f8f01000 {
|
|
compatible = "arm,cortex-a9-gic";
|
|
#interrupt-cells = <3>;
|
|
#address-cells = <1>;
|
|
interrupt-controller;
|
|
reg = <0xF8F01000 0x1000>,
|
|
<0xF8F00100 0x100>;
|
|
};
|
|
|
|
L2: cache-controller {
|
|
compatible = "arm,pl310-cache";
|
|
reg = <0xF8F02000 0x1000>;
|
|
arm,data-latency = <3 2 2>;
|
|
arm,tag-latency = <2 2 2>;
|
|
cache-unified;
|
|
cache-level = <2>;
|
|
};
|
|
|
|
uart0: uart@e0000000 {
|
|
compatible = "xlnx,xuartps";
|
|
status = "disabled";
|
|
clocks = <&clkc 23>, <&clkc 40>;
|
|
clock-names = "ref_clk", "aper_clk";
|
|
reg = <0xE0000000 0x1000>;
|
|
interrupts = <0 27 4>;
|
|
};
|
|
|
|
uart1: uart@e0001000 {
|
|
compatible = "xlnx,xuartps";
|
|
status = "disabled";
|
|
clocks = <&clkc 24>, <&clkc 41>;
|
|
clock-names = "ref_clk", "aper_clk";
|
|
reg = <0xE0001000 0x1000>;
|
|
interrupts = <0 50 4>;
|
|
};
|
|
|
|
gem0: ethernet@e000b000 {
|
|
compatible = "cdns,gem";
|
|
reg = <0xe000b000 0x4000>;
|
|
status = "disabled";
|
|
interrupts = <0 22 4>;
|
|
clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>;
|
|
clock-names = "pclk", "hclk", "tx_clk";
|
|
};
|
|
|
|
gem1: ethernet@e000c000 {
|
|
compatible = "cdns,gem";
|
|
reg = <0xe000c000 0x4000>;
|
|
status = "disabled";
|
|
interrupts = <0 45 4>;
|
|
clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>;
|
|
clock-names = "pclk", "hclk", "tx_clk";
|
|
};
|
|
|
|
sdhci0: ps7-sdhci@e0100000 {
|
|
compatible = "arasan,sdhci-8.9a";
|
|
status = "disabled";
|
|
clock-names = "clk_xin", "clk_ahb";
|
|
clocks = <&clkc 21>, <&clkc 32>;
|
|
interrupt-parent = <&intc>;
|
|
interrupts = <0 24 4>;
|
|
reg = <0xe0100000 0x1000>;
|
|
} ;
|
|
|
|
sdhci1: ps7-sdhci@e0101000 {
|
|
compatible = "arasan,sdhci-8.9a";
|
|
status = "disabled";
|
|
clock-names = "clk_xin", "clk_ahb";
|
|
clocks = <&clkc 22>, <&clkc 33>;
|
|
interrupt-parent = <&intc>;
|
|
interrupts = <0 47 4>;
|
|
reg = <0xe0101000 0x1000>;
|
|
} ;
|
|
|
|
slcr: slcr@f8000000 {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "xlnx,zynq-slcr", "syscon";
|
|
reg = <0xF8000000 0x1000>;
|
|
ranges;
|
|
clkc: clkc@100 {
|
|
#clock-cells = <1>;
|
|
compatible = "xlnx,ps7-clkc";
|
|
ps-clk-frequency = <33333333>;
|
|
fclk-enable = <0>;
|
|
clock-output-names = "armpll", "ddrpll", "iopll", "cpu_6or4x",
|
|
"cpu_3or2x", "cpu_2x", "cpu_1x", "ddr2x", "ddr3x",
|
|
"dci", "lqspi", "smc", "pcap", "gem0", "gem1",
|
|
"fclk0", "fclk1", "fclk2", "fclk3", "can0", "can1",
|
|
"sdio0", "sdio1", "uart0", "uart1", "spi0", "spi1",
|
|
"dma", "usb0_aper", "usb1_aper", "gem0_aper",
|
|
"gem1_aper", "sdio0_aper", "sdio1_aper",
|
|
"spi0_aper", "spi1_aper", "can0_aper", "can1_aper",
|
|
"i2c0_aper", "i2c1_aper", "uart0_aper", "uart1_aper",
|
|
"gpio_aper", "lqspi_aper", "smc_aper", "swdt",
|
|
"dbg_trc", "dbg_apb";
|
|
reg = <0x100 0x100>;
|
|
};
|
|
};
|
|
|
|
global_timer: timer@f8f00200 {
|
|
compatible = "arm,cortex-a9-global-timer";
|
|
reg = <0xf8f00200 0x20>;
|
|
interrupts = <1 11 0x301>;
|
|
interrupt-parent = <&intc>;
|
|
clocks = <&clkc 4>;
|
|
};
|
|
|
|
ttc0: ttc0@f8001000 {
|
|
interrupt-parent = <&intc>;
|
|
interrupts = < 0 10 4 0 11 4 0 12 4 >;
|
|
compatible = "cdns,ttc";
|
|
clocks = <&clkc 6>;
|
|
reg = <0xF8001000 0x1000>;
|
|
};
|
|
|
|
ttc1: ttc1@f8002000 {
|
|
interrupt-parent = <&intc>;
|
|
interrupts = < 0 37 4 0 38 4 0 39 4 >;
|
|
compatible = "cdns,ttc";
|
|
clocks = <&clkc 6>;
|
|
reg = <0xF8002000 0x1000>;
|
|
};
|
|
scutimer: scutimer@f8f00600 {
|
|
interrupt-parent = <&intc>;
|
|
interrupts = < 1 13 0x301 >;
|
|
compatible = "arm,cortex-a9-twd-timer";
|
|
reg = < 0xf8f00600 0x20 >;
|
|
clocks = <&clkc 4>;
|
|
} ;
|
|
};
|
|
};
|