forked from Minki/linux
6fa52ed33b
This is a rather large set of patches for device drivers that for one reason or another the subsystem maintainer preferred to get merged through the arm-soc tree. There are both new drivers as well as existing drivers that are getting converted from platform-specific code into standalone drivers using the appropriate subsystem specific interfaces. In particular, we can now have pinctrl, clk, clksource and irqchip drivers in one file per driver, without the need to call into platform specific interface, or to get called from platform specific code, as long as all information about the hardware is provided through a device tree. Most of the drivers we touch this time are for clocksource. Since now most of them are part of drivers/clocksource, I expect that we won't have to touch these again from arm-soc and can let the clocksource maintainers take care of these in the future. Another larger part of this series is specific to the exynos platform, which is seeing some significant effort in upstreaming and modernization of its device drivers this time around, which unfortunately is also the cause for the churn and a lot of the merge conflicts. There is one new subsystem that gets merged as part of this series: the reset controller interface, which is a very simple interface for taking devices on the SoC out of reset or back into reset. Patches to use this interface on i.MX follow later in this merge window, and we are going to have other platforms (at least tegra and sirf) get converted in 3.11. This will let us get rid of platform specific callbacks in a number of platform independent device drivers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJRhKUsAAoJEIwa5zzehBx3Ug4P/RqEen15hxS/NY8SIVRAU5c0 G9ZiSPcLmvXGR/t1RZFeLWKaKOYRb2oW1EbXrlkddprkmg85RuQE/KMpCgzPPhVC Yrs8UaagMGblaLOjwavVjin/CUXZokRdMfsQoIyMGOezmVGFnv4d4Kt64IOf35DF 24vDv/QO0BAI9k6m6WLqlWvSshb0IkW8r2LneRLnMEAVop7b1xkOxz0sR6l0LWfV 6JAMXyTjJMg0t8uCVW/QyNdxcxINHhV4SYcNkzF3EZ7ol50OiJsT9fg0XW759+Wb vlX6Xuehg+CBOg+g3ZOZuR8JOEkOhAGRSzuJkk/TmLCCxc+ghnuYz8HArxh6GMHK KaxvogLIi0ZsD94A/BZIKkDtOLWlzdz2HBrYo9PTz8zrOz/gXhwQ3zq0jPccC5E0 S+YYiobCBXepknF9301ti7wGD9VDzI8nmqOKG6tEBrD3xuO+RoBv+z4pBugN4/1C DlB19gOz60G5kniziL+wlmWER2qXmYrQZqS+s6+B2XoyoETC0Yij3Rck5vyC6qIK A2sni+Y9rzNOB9nzmnISP/UiGUffCy8AV4DZJjMSl0XkF4cpOXqRVGZ2nGB4tR5q GTOETcDCo5dvMDKX7Wfrz40CQzO39tnPCddg3OIS93ZwMpCeykIlb1FVL7RcsyF7 3uikzYHlDo3C5pvtJ5TS =ZWk9 -----END PGP SIGNATURE----- Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC driver changes from Olof Johansson: "This is a rather large set of patches for device drivers that for one reason or another the subsystem maintainer preferred to get merged through the arm-soc tree. There are both new drivers as well as existing drivers that are getting converted from platform-specific code into standalone drivers using the appropriate subsystem specific interfaces. In particular, we can now have pinctrl, clk, clksource and irqchip drivers in one file per driver, without the need to call into platform specific interface, or to get called from platform specific code, as long as all information about the hardware is provided through a device tree. Most of the drivers we touch this time are for clocksource. Since now most of them are part of drivers/clocksource, I expect that we won't have to touch these again from arm-soc and can let the clocksource maintainers take care of these in the future. Another larger part of this series is specific to the exynos platform, which is seeing some significant effort in upstreaming and modernization of its device drivers this time around, which unfortunately is also the cause for the churn and a lot of the merge conflicts. There is one new subsystem that gets merged as part of this series: the reset controller interface, which is a very simple interface for taking devices on the SoC out of reset or back into reset. Patches to use this interface on i.MX follow later in this merge window, and we are going to have other platforms (at least tegra and sirf) get converted in 3.11. This will let us get rid of platform specific callbacks in a number of platform independent device drivers." * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (256 commits) irqchip: s3c24xx: add missing __init annotations ARM: dts: Disable the RTC by default on exynos5 clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3} ARM: exynos: restore mach/regs-clock.h for exynos5 clocksource: exynos_mct: fix build error on non-DT pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register() irqchip: vt8500: Convert arch-vt8500 to new irqchip infrastructure reset: NULL deref on allocation failure reset: Add reset controller API dt: describe base reset signal binding ARM: EXYNOS: Add arm-pmu DT binding for exynos421x ARM: EXYNOS: Add arm-pmu DT binding for exynos5250 ARM: EXYNOS: Enable PMUs for exynos4 irqchip: exynos-combiner: Correct combined IRQs for exynos4 irqchip: exynos-combiner: Add set_irq_affinity function for combiner_irq ARM: EXYNOS: fix compilation error introduced due to common clock migration clk: exynos5250: Fix divider values for sclk_mmc{0,1,2,3} clk: exynos4: export clocks required for fimc-is clk: samsung: Fix compilation error clk: tegra: fix enum tegra114_clk to match binding ...
141 lines
3.3 KiB
Plaintext
141 lines
3.3 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";
|
|
|
|
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 = <2 3 2>;
|
|
arm,tag-latency = <2 3 2>;
|
|
cache-unified;
|
|
cache-level = <2>;
|
|
};
|
|
|
|
uart0: uart@e0000000 {
|
|
compatible = "xlnx,xuartps";
|
|
reg = <0xE0000000 0x1000>;
|
|
interrupts = <0 27 4>;
|
|
clocks = <&uart_clk 0>;
|
|
};
|
|
|
|
uart1: uart@e0001000 {
|
|
compatible = "xlnx,xuartps";
|
|
reg = <0xE0001000 0x1000>;
|
|
interrupts = <0 50 4>;
|
|
clocks = <&uart_clk 1>;
|
|
};
|
|
|
|
slcr: slcr@f8000000 {
|
|
compatible = "xlnx,zynq-slcr";
|
|
reg = <0xF8000000 0x1000>;
|
|
|
|
clocks {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
ps_clk: ps_clk {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
/* clock-frequency set in board-specific file */
|
|
clock-output-names = "ps_clk";
|
|
};
|
|
armpll: armpll {
|
|
#clock-cells = <0>;
|
|
compatible = "xlnx,zynq-pll";
|
|
clocks = <&ps_clk>;
|
|
reg = <0x100 0x110>;
|
|
clock-output-names = "armpll";
|
|
};
|
|
ddrpll: ddrpll {
|
|
#clock-cells = <0>;
|
|
compatible = "xlnx,zynq-pll";
|
|
clocks = <&ps_clk>;
|
|
reg = <0x104 0x114>;
|
|
clock-output-names = "ddrpll";
|
|
};
|
|
iopll: iopll {
|
|
#clock-cells = <0>;
|
|
compatible = "xlnx,zynq-pll";
|
|
clocks = <&ps_clk>;
|
|
reg = <0x108 0x118>;
|
|
clock-output-names = "iopll";
|
|
};
|
|
uart_clk: uart_clk {
|
|
#clock-cells = <1>;
|
|
compatible = "xlnx,zynq-periph-clock";
|
|
clocks = <&iopll &armpll &ddrpll>;
|
|
reg = <0x154>;
|
|
clock-output-names = "uart0_ref_clk",
|
|
"uart1_ref_clk";
|
|
};
|
|
cpu_clk: cpu_clk {
|
|
#clock-cells = <1>;
|
|
compatible = "xlnx,zynq-cpu-clock";
|
|
clocks = <&iopll &armpll &ddrpll>;
|
|
reg = <0x120 0x1C4>;
|
|
clock-output-names = "cpu_6x4x",
|
|
"cpu_3x2x",
|
|
"cpu_2x",
|
|
"cpu_1x";
|
|
};
|
|
};
|
|
};
|
|
|
|
ttc0: ttc0@f8001000 {
|
|
interrupt-parent = <&intc>;
|
|
interrupts = < 0 10 4 0 11 4 0 12 4 >;
|
|
compatible = "cdns,ttc";
|
|
reg = <0xF8001000 0x1000>;
|
|
clocks = <&cpu_clk 3>;
|
|
clock-names = "cpu_1x";
|
|
clock-ranges;
|
|
};
|
|
|
|
ttc1: ttc1@f8002000 {
|
|
interrupt-parent = <&intc>;
|
|
interrupts = < 0 37 4 0 38 4 0 39 4 >;
|
|
compatible = "cdns,ttc";
|
|
reg = <0xF8002000 0x1000>;
|
|
clocks = <&cpu_clk 3>;
|
|
clock-names = "cpu_1x";
|
|
clock-ranges;
|
|
};
|
|
};
|
|
};
|