2012-07-06 08:08:07 +00:00
|
|
|
/*
|
|
|
|
|
* Device Tree Source for the r8a7740 SoC
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2012 Renesas Solutions Corp.
|
|
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/include/ "skeleton.dtsi"
|
|
|
|
|
|
2014-08-08 14:23:10 +00:00
|
|
|
#include <dt-bindings/clock/r8a7740-clock.h>
|
2013-11-19 02:18:25 +00:00
|
|
|
#include <dt-bindings/interrupt-controller/irq.h>
|
|
|
|
|
|
2012-07-06 08:08:07 +00:00
|
|
|
/ {
|
|
|
|
|
compatible = "renesas,r8a7740";
|
2014-04-30 00:41:28 +00:00
|
|
|
interrupt-parent = <&gic>;
|
2012-07-06 08:08:07 +00:00
|
|
|
|
|
|
|
|
cpus {
|
2013-04-18 17:39:50 +00:00
|
|
|
#address-cells = <1>;
|
|
|
|
|
#size-cells = <0>;
|
2012-07-06 08:08:07 +00:00
|
|
|
cpu@0 {
|
|
|
|
|
compatible = "arm,cortex-a9";
|
2013-04-18 17:39:50 +00:00
|
|
|
device_type = "cpu";
|
|
|
|
|
reg = <0x0>;
|
2014-05-07 23:32:29 +00:00
|
|
|
clock-frequency = <800000000>;
|
2012-07-06 08:08:07 +00:00
|
|
|
};
|
|
|
|
|
};
|
2013-04-17 10:34:05 +00:00
|
|
|
|
|
|
|
|
gic: interrupt-controller@c2800000 {
|
|
|
|
|
compatible = "arm,cortex-a9-gic";
|
|
|
|
|
#interrupt-cells = <3>;
|
|
|
|
|
interrupt-controller;
|
|
|
|
|
reg = <0xc2800000 0x1000>,
|
|
|
|
|
<0xc2000000 0x1000>;
|
|
|
|
|
};
|
|
|
|
|
|
2013-07-24 03:59:09 +00:00
|
|
|
pmu {
|
|
|
|
|
compatible = "arm,cortex-a9-pmu";
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
|
2013-07-24 03:59:09 +00:00
|
|
|
};
|
|
|
|
|
|
2014-08-12 00:04:38 +00:00
|
|
|
cmt1: timer@e6138000 {
|
2014-09-08 00:27:44 +00:00
|
|
|
compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
|
2014-08-12 00:04:38 +00:00
|
|
|
reg = <0xe6138000 0x170>;
|
|
|
|
|
interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_CMT1>;
|
|
|
|
|
clock-names = "fck";
|
|
|
|
|
|
|
|
|
|
renesas,channels-mask = <0x3f>;
|
|
|
|
|
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
2013-04-17 10:34:05 +00:00
|
|
|
/* irqpin0: IRQ0 - IRQ7 */
|
|
|
|
|
irqpin0: irqpin@e6900000 {
|
2013-11-27 23:15:04 +00:00
|
|
|
compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
|
2013-04-17 10:34:05 +00:00
|
|
|
#interrupt-cells = <2>;
|
|
|
|
|
interrupt-controller;
|
|
|
|
|
reg = <0xe6900000 4>,
|
|
|
|
|
<0xe6900010 4>,
|
|
|
|
|
<0xe6900020 1>,
|
|
|
|
|
<0xe6900040 1>,
|
|
|
|
|
<0xe6900060 1>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH>;
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* irqpin1: IRQ8 - IRQ15 */
|
|
|
|
|
irqpin1: irqpin@e6900004 {
|
2013-11-27 23:15:04 +00:00
|
|
|
compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
|
2013-04-17 10:34:05 +00:00
|
|
|
#interrupt-cells = <2>;
|
|
|
|
|
interrupt-controller;
|
|
|
|
|
reg = <0xe6900004 4>,
|
|
|
|
|
<0xe6900014 4>,
|
|
|
|
|
<0xe6900024 1>,
|
|
|
|
|
<0xe6900044 1>,
|
|
|
|
|
<0xe6900064 1>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH>;
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* irqpin2: IRQ16 - IRQ23 */
|
|
|
|
|
irqpin2: irqpin@e6900008 {
|
2013-11-27 23:15:04 +00:00
|
|
|
compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
|
2013-04-17 10:34:05 +00:00
|
|
|
#interrupt-cells = <2>;
|
|
|
|
|
interrupt-controller;
|
|
|
|
|
reg = <0xe6900008 4>,
|
|
|
|
|
<0xe6900018 4>,
|
|
|
|
|
<0xe6900028 1>,
|
|
|
|
|
<0xe6900048 1>,
|
|
|
|
|
<0xe6900068 1>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH>;
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* irqpin3: IRQ24 - IRQ31 */
|
|
|
|
|
irqpin3: irqpin@e690000c {
|
2013-11-27 23:15:04 +00:00
|
|
|
compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
|
2013-04-17 10:34:05 +00:00
|
|
|
#interrupt-cells = <2>;
|
|
|
|
|
interrupt-controller;
|
|
|
|
|
reg = <0xe690000c 4>,
|
|
|
|
|
<0xe690001c 4>,
|
|
|
|
|
<0xe690002c 1>,
|
|
|
|
|
<0xe690004c 1>,
|
|
|
|
|
<0xe690006c 1>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 149 IRQ_TYPE_LEVEL_HIGH>;
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
|
|
|
|
|
2014-05-07 20:32:29 +00:00
|
|
|
ether: ethernet@e9a00000 {
|
|
|
|
|
compatible = "renesas,gether-r8a7740";
|
|
|
|
|
reg = <0xe9a00000 0x800>,
|
|
|
|
|
<0xe9a01800 0x800>;
|
|
|
|
|
interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_GETHER>;
|
2014-05-07 20:32:29 +00:00
|
|
|
phy-mode = "mii";
|
|
|
|
|
#address-cells = <1>;
|
|
|
|
|
#size-cells = <0>;
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
2013-04-17 10:34:05 +00:00
|
|
|
i2c0: i2c@fff20000 {
|
|
|
|
|
#address-cells = <1>;
|
|
|
|
|
#size-cells = <0>;
|
2014-03-27 10:45:44 +00:00
|
|
|
compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";
|
2013-04-17 10:34:05 +00:00
|
|
|
reg = <0xfff20000 0x425>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 201 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 202 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 203 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 204 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp1_clks R8A7740_CLK_IIC0>;
|
2013-09-26 11:06:01 +00:00
|
|
|
status = "disabled";
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
i2c1: i2c@e6c20000 {
|
|
|
|
|
#address-cells = <1>;
|
|
|
|
|
#size-cells = <0>;
|
2014-03-27 10:45:44 +00:00
|
|
|
compatible = "renesas,iic-r8a7740", "renesas,rmobile-iic";
|
2013-04-17 10:34:05 +00:00
|
|
|
reg = <0xe6c20000 0x425>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 71 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 72 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 73 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_IIC1>;
|
2013-09-26 11:06:01 +00:00
|
|
|
status = "disabled";
|
2013-04-17 10:34:05 +00:00
|
|
|
};
|
2012-11-20 13:02:54 +00:00
|
|
|
|
2014-07-07 07:54:41 +00:00
|
|
|
scifa0: serial@e6c40000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6c40000 0x100>;
|
|
|
|
|
interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA0>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa1: serial@e6c50000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6c50000 0x100>;
|
|
|
|
|
interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA1>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa2: serial@e6c60000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6c60000 0x100>;
|
|
|
|
|
interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA0>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa3: serial@e6c70000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6c70000 0x100>;
|
|
|
|
|
interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA3>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa4: serial@e6c80000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6c80000 0x100>;
|
|
|
|
|
interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA4>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa5: serial@e6cb0000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6cb0000 0x100>;
|
|
|
|
|
interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA5>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa6: serial@e6cc0000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6cc0000 0x100>;
|
|
|
|
|
interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA6>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifa7: serial@e6cd0000 {
|
|
|
|
|
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
|
|
|
|
|
reg = <0xe6cd0000 0x100>;
|
|
|
|
|
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFA7>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
scifb8: serial@e6c30000 {
|
|
|
|
|
compatible = "renesas,scifb-r8a7740", "renesas,scifb";
|
|
|
|
|
reg = <0xe6c30000 0x100>;
|
|
|
|
|
interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp2_clks R8A7740_CLK_SCIFB>;
|
|
|
|
|
clock-names = "sci_ick";
|
2014-07-07 07:54:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
2012-11-20 13:02:54 +00:00
|
|
|
pfc: pfc@e6050000 {
|
|
|
|
|
compatible = "renesas,pfc-r8a7740";
|
|
|
|
|
reg = <0xe6050000 0x8000>,
|
|
|
|
|
<0xe605800c 0x20>;
|
|
|
|
|
gpio-controller;
|
|
|
|
|
#gpio-cells = <2>;
|
2013-12-11 03:26:28 +00:00
|
|
|
interrupts-extended =
|
|
|
|
|
<&irqpin0 0 0>, <&irqpin0 1 0>, <&irqpin0 2 0>, <&irqpin0 3 0>,
|
|
|
|
|
<&irqpin0 4 0>, <&irqpin0 5 0>, <&irqpin0 6 0>, <&irqpin0 7 0>,
|
|
|
|
|
<&irqpin1 0 0>, <&irqpin1 1 0>, <&irqpin1 2 0>, <&irqpin1 3 0>,
|
|
|
|
|
<&irqpin1 4 0>, <&irqpin1 5 0>, <&irqpin1 6 0>, <&irqpin1 7 0>,
|
|
|
|
|
<&irqpin2 0 0>, <&irqpin2 1 0>, <&irqpin2 2 0>, <&irqpin2 3 0>,
|
|
|
|
|
<&irqpin2 4 0>, <&irqpin2 5 0>, <&irqpin2 6 0>, <&irqpin2 7 0>,
|
|
|
|
|
<&irqpin3 0 0>, <&irqpin3 1 0>, <&irqpin3 2 0>, <&irqpin3 3 0>,
|
|
|
|
|
<&irqpin3 4 0>, <&irqpin3 5 0>, <&irqpin3 6 0>, <&irqpin3 7 0>;
|
2012-11-20 13:02:54 +00:00
|
|
|
};
|
ARM: Renesas SoC cleanup, refactoring and more SMP support
Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization
Conflicts: Too many. Most of these are because Simon chose to send
some board updates through the V4L tree that ends up colliding with
the main platform changes. We'll work with him on sorting out his
workflow:
- arch/arm/boot/dts/r8a7740.dtsi:
- Add/add conflict in a devicetree file (keep both)
- arch/arm/mach-shmobile/Makefile:
- Splitting out of clock files collides with intc move to DT.
Keep HEAD version but remove intc-* files for R8A7740 and R8A7779.
- arch/arm/mach-shmobile/board-bockw.c:
- Keep HEAD but remove i2c, hspi and mmc device init calls
- arch/arm/mach-shmobile/board-marzen.c
- Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call,
everything else stays.
- arch/arm/mach-shmobile/include/mach/r8a7778.h:
- From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device()
- From branch, keep everything
- arch/arm/mach-shmobile/include/mach/r8a7779.h:
- From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device()
- arch/arm/mach-shmobile/setup-r8a7778.c
- Keep HEAD, but drop the MMC section (struct resource + add_mmc_device())
- take the new function name from our side (r8a7778_add_dt_devices())
- arch/arm/mach-shmobile/setup-r8a7779.c
- Keep HEAD, but drop r8a7779_add_usb_phy_device()
I've also pushed a test-merge2 branch where you can see how I resolved
them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6
pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC
3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih
J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e
5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk
cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy
ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy
LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh
1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM
RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB
VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw
XruUAUKHknTUJ2Q/3y4D
=Fagt
-----END PGP SIGNATURE-----
Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman:
"Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization"
* tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
ARM: shmobile: Introduce per-CPU SMP boot / sleep code
ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
ARM: shmobile: Add shared SCU CPU Hotplug code
ARM: shmobile: Use shared SCU SMP boot code on emev2
ARM: shmobile: Use shared SCU SMP boot code on r8a7779
ARM: shmobile: Use shared SCU SMP boot code on sh73a0
ARM: shmobile: Introduce shared SCU SMP boot code
ARM: shmobile: sh73a0: Remove global GPIO_NR definition
ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
ARM: shmobile: bockw: add missing __initdata
ARM: shmobile: r8a7790: add missing __initdata
ARM: shmobile: r8a7779: add missing __initdata
ARM: shmobile: Remove unused shmobile_init_time()
ARM: shmobile: Use clocksource_of_init() on r8a7790
ARM: shmobile: Use default ->init_time() on KZM9G DT ref
...
2013-09-09 23:33:57 +00:00
|
|
|
|
2013-07-25 22:51:00 +00:00
|
|
|
tpu: pwm@e6600000 {
|
|
|
|
|
compatible = "renesas,tpu-r8a7740", "renesas,tpu";
|
|
|
|
|
reg = <0xe6600000 0x100>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_TPU0>;
|
2013-07-25 22:51:00 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
#pwm-cells = <3>;
|
|
|
|
|
};
|
2013-09-27 08:02:57 +00:00
|
|
|
|
2013-10-22 02:35:08 +00:00
|
|
|
mmcif0: mmc@e6bd0000 {
|
2014-03-27 10:45:44 +00:00
|
|
|
compatible = "renesas,mmcif-r8a7740", "renesas,sh-mmcif";
|
2013-09-27 08:02:57 +00:00
|
|
|
reg = <0xe6bd0000 0x100>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 57 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_MMC>;
|
2013-09-27 08:02:57 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
2013-10-22 02:35:08 +00:00
|
|
|
sdhi0: sd@e6850000 {
|
2013-09-27 08:02:57 +00:00
|
|
|
compatible = "renesas,sdhi-r8a7740";
|
|
|
|
|
reg = <0xe6850000 0x100>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 117 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 118 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 119 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_SDHI0>;
|
2013-09-27 08:02:57 +00:00
|
|
|
cap-sd-highspeed;
|
|
|
|
|
cap-sdio-irq;
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
|
|
|
|
|
2013-10-22 02:35:08 +00:00
|
|
|
sdhi1: sd@e6860000 {
|
2013-09-27 08:02:57 +00:00
|
|
|
compatible = "renesas,sdhi-r8a7740";
|
|
|
|
|
reg = <0xe6860000 0x100>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 122 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 123 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_SDHI1>;
|
2013-09-27 08:02:57 +00:00
|
|
|
cap-sd-highspeed;
|
|
|
|
|
cap-sdio-irq;
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
2013-10-22 02:35:08 +00:00
|
|
|
|
|
|
|
|
sdhi2: sd@e6870000 {
|
|
|
|
|
compatible = "renesas,sdhi-r8a7740";
|
|
|
|
|
reg = <0xe6870000 0x100>;
|
2013-11-19 02:18:25 +00:00
|
|
|
interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 126 IRQ_TYPE_LEVEL_HIGH
|
|
|
|
|
0 127 IRQ_TYPE_LEVEL_HIGH>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp4_clks R8A7740_CLK_SDHI2>;
|
2013-10-22 02:35:08 +00:00
|
|
|
cap-sd-highspeed;
|
|
|
|
|
cap-sdio-irq;
|
|
|
|
|
status = "disabled";
|
|
|
|
|
};
|
2013-12-04 01:28:41 +00:00
|
|
|
|
|
|
|
|
sh_fsi2: sound@fe1f0000 {
|
|
|
|
|
#sound-dai-cells = <1>;
|
2014-03-27 10:45:44 +00:00
|
|
|
compatible = "renesas,fsi2-r8a7740", "renesas,sh_fsi2";
|
2013-12-04 01:28:41 +00:00
|
|
|
reg = <0xfe1f0000 0x400>;
|
|
|
|
|
interrupts = <0 9 0x4>;
|
2014-08-08 14:23:11 +00:00
|
|
|
clocks = <&mstp3_clks R8A7740_CLK_FSI>;
|
2013-12-04 01:28:41 +00:00
|
|
|
status = "disabled";
|
|
|
|
|
};
|
2014-08-08 14:23:10 +00:00
|
|
|
|
|
|
|
|
clocks {
|
|
|
|
|
#address-cells = <1>;
|
|
|
|
|
#size-cells = <1>;
|
|
|
|
|
ranges;
|
|
|
|
|
|
|
|
|
|
/* External root clock */
|
|
|
|
|
extalr_clk: extalr_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <32768>;
|
|
|
|
|
clock-output-names = "extalr";
|
|
|
|
|
};
|
|
|
|
|
extal1_clk: extal1_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <0>;
|
|
|
|
|
clock-output-names = "extal1";
|
|
|
|
|
};
|
|
|
|
|
extal2_clk: extal2_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <0>;
|
|
|
|
|
clock-output-names = "extal2";
|
|
|
|
|
};
|
|
|
|
|
dv_clk: dv_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <27000000>;
|
|
|
|
|
clock-output-names = "dv";
|
|
|
|
|
};
|
|
|
|
|
fsiack_clk: fsiack_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <0>;
|
|
|
|
|
clock-output-names = "fsiack";
|
|
|
|
|
};
|
|
|
|
|
fsibck_clk: fsibck_clk {
|
|
|
|
|
compatible = "fixed-clock";
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-frequency = <0>;
|
|
|
|
|
clock-output-names = "fsibck";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Special CPG clocks */
|
|
|
|
|
cpg_clocks: cpg_clocks@e6150000 {
|
|
|
|
|
compatible = "renesas,r8a7740-cpg-clocks";
|
|
|
|
|
reg = <0xe6150000 0x10000>;
|
|
|
|
|
clocks = <&extal1_clk>, <&extalr_clk>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
clock-output-names = "system", "pllc0", "pllc1",
|
|
|
|
|
"pllc2", "r",
|
|
|
|
|
"usb24s",
|
|
|
|
|
"i", "zg", "b", "m1", "hp",
|
|
|
|
|
"hpp", "usbp", "s", "zb", "m3",
|
|
|
|
|
"cp";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Variable factor clocks (DIV6) */
|
|
|
|
|
sub_clk: sub_clk@e6150080 {
|
|
|
|
|
compatible = "renesas,r8a7740-div6-clock", "renesas,cpg-div6-clock";
|
|
|
|
|
reg = <0xe6150080 4>;
|
|
|
|
|
clocks = <&pllc1_div2_clk>;
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-output-names = "sub";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Fixed factor clocks */
|
|
|
|
|
pllc1_div2_clk: pllc1_div2_clk {
|
|
|
|
|
compatible = "fixed-factor-clock";
|
|
|
|
|
clocks = <&cpg_clocks R8A7740_CLK_PLLC1>;
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-div = <2>;
|
|
|
|
|
clock-mult = <1>;
|
|
|
|
|
clock-output-names = "pllc1_div2";
|
|
|
|
|
};
|
|
|
|
|
extal1_div2_clk: extal1_div2_clk {
|
|
|
|
|
compatible = "fixed-factor-clock";
|
|
|
|
|
clocks = <&extal1_clk>;
|
|
|
|
|
#clock-cells = <0>;
|
|
|
|
|
clock-div = <2>;
|
|
|
|
|
clock-mult = <1>;
|
|
|
|
|
clock-output-names = "extal1_div2";
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Gate clocks */
|
|
|
|
|
subck_clks: subck_clks@e6150080 {
|
|
|
|
|
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
|
|
|
|
|
reg = <0xe6150080 4>;
|
|
|
|
|
clocks = <&sub_clk>, <&sub_clk>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
renesas,clock-indices = <
|
|
|
|
|
R8A7740_CLK_SUBCK R8A7740_CLK_SUBCK2
|
|
|
|
|
>;
|
|
|
|
|
clock-output-names =
|
|
|
|
|
"subck", "subck2";
|
|
|
|
|
};
|
|
|
|
|
mstp1_clks: mstp1_clks@e6150134 {
|
|
|
|
|
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
|
|
|
|
|
reg = <0xe6150134 4>, <0xe6150038 4>;
|
|
|
|
|
clocks = <&cpg_clocks R8A7740_CLK_S>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_S>, <&sub_clk>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_B>,
|
|
|
|
|
<&sub_clk>, <&sub_clk>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_B>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
renesas,clock-indices = <
|
|
|
|
|
R8A7740_CLK_CEU21 R8A7740_CLK_CEU20 R8A7740_CLK_TMU0
|
|
|
|
|
R8A7740_CLK_LCDC1 R8A7740_CLK_IIC0 R8A7740_CLK_TMU1
|
|
|
|
|
R8A7740_CLK_LCDC0
|
|
|
|
|
>;
|
|
|
|
|
clock-output-names =
|
|
|
|
|
"ceu21", "ceu20", "tmu0", "lcdc1", "iic0",
|
|
|
|
|
"tmu1", "lcdc0";
|
|
|
|
|
};
|
|
|
|
|
mstp2_clks: mstp2_clks@e6150138 {
|
|
|
|
|
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
|
|
|
|
|
reg = <0xe6150138 4>, <0xe6150040 4>;
|
|
|
|
|
clocks = <&sub_clk>, <&sub_clk>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&sub_clk>, <&sub_clk>, <&sub_clk>,
|
|
|
|
|
<&sub_clk>, <&sub_clk>, <&sub_clk>,
|
|
|
|
|
<&sub_clk>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
renesas,clock-indices = <
|
|
|
|
|
R8A7740_CLK_SCIFA6 R8A7740_CLK_SCIFA7
|
|
|
|
|
R8A7740_CLK_DMAC1 R8A7740_CLK_DMAC2
|
|
|
|
|
R8A7740_CLK_DMAC3 R8A7740_CLK_USBDMAC
|
|
|
|
|
R8A7740_CLK_SCIFA5 R8A7740_CLK_SCIFB
|
|
|
|
|
R8A7740_CLK_SCIFA0 R8A7740_CLK_SCIFA1
|
|
|
|
|
R8A7740_CLK_SCIFA2 R8A7740_CLK_SCIFA3
|
|
|
|
|
R8A7740_CLK_SCIFA4
|
|
|
|
|
>;
|
|
|
|
|
clock-output-names =
|
|
|
|
|
"scifa6", "scifa7", "dmac1", "dmac2", "dmac3",
|
|
|
|
|
"usbdmac", "scifa5", "scifb", "scifa0", "scifa1",
|
|
|
|
|
"scifa2", "scifa3", "scifa4";
|
|
|
|
|
};
|
|
|
|
|
mstp3_clks: mstp3_clks@e615013c {
|
|
|
|
|
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
|
|
|
|
|
reg = <0xe615013c 4>, <0xe6150048 4>;
|
|
|
|
|
clocks = <&cpg_clocks R8A7740_CLK_R>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&sub_clk>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
renesas,clock-indices = <
|
|
|
|
|
R8A7740_CLK_CMT1 R8A7740_CLK_FSI R8A7740_CLK_IIC1
|
|
|
|
|
R8A7740_CLK_USBF R8A7740_CLK_SDHI0 R8A7740_CLK_SDHI1
|
|
|
|
|
R8A7740_CLK_MMC R8A7740_CLK_GETHER R8A7740_CLK_TPU0
|
|
|
|
|
>;
|
|
|
|
|
clock-output-names =
|
|
|
|
|
"cmt1", "fsi", "iic1", "usbf", "sdhi0", "sdhi1",
|
|
|
|
|
"mmc", "gether", "tpu0";
|
|
|
|
|
};
|
|
|
|
|
mstp4_clks: mstp4_clks@e6150140 {
|
|
|
|
|
compatible = "renesas,r8a7740-mstp-clocks", "renesas,cpg-mstp-clocks";
|
|
|
|
|
reg = <0xe6150140 4>, <0xe615004c 4>;
|
|
|
|
|
clocks = <&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>,
|
|
|
|
|
<&cpg_clocks R8A7740_CLK_HP>;
|
|
|
|
|
#clock-cells = <1>;
|
|
|
|
|
renesas,clock-indices = <
|
|
|
|
|
R8A7740_CLK_USBH R8A7740_CLK_SDHI2
|
|
|
|
|
R8A7740_CLK_USBFUNC R8A7740_CLK_USBPHY
|
|
|
|
|
>;
|
|
|
|
|
clock-output-names =
|
|
|
|
|
"usbhost", "sdhi2", "usbfunc", "usphy";
|
|
|
|
|
};
|
|
|
|
|
};
|
2012-07-06 08:08:07 +00:00
|
|
|
};
|
