Skip to content

Commit

Permalink
Merge tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history 
…x/kernel/git/horms/renesas into next/dt

Pull "Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:

* Add Add SoC-specific SATA compatible property to r8a7779
* Enable DMA for MMCIF on r8a7791 and r8a7790
* Enable USB-PHY, HS-USB and USB3.0 on r8a7791 and r8a7790
* Enable TMU timer via DT on r8a7778
* Enable CMT timer via DT on r8a73a4
* Add MMP and {SR}GX clocks to  r8a7791 and r8a7790
* Correct scifa2 clock index on r8a7740
* Add missing INTCA for irqpin on r8a7740

* tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits)
  ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property
  ARM: shmobile: r8a7791: Reference DMA channels in MMCIF DT node
  ARM: shmobile: r8a7790: Reference DMA channels in MMCIF DT nodes
  ARM: shmobile: r8a7791: Add MMCIF0 DT node
  ARM: shmobile: r8a7790: Rename mmcif node to mmc
  ARM: shmobile: r8a7778: Add SoC-specific TMU compatible property
  ARM: shmobile: r8a73a4: Add SoC-specific CMT compatible property
  ARM: shmobile: henninger: enable HS-USB
  ARM: shmobile: koelsch: enable HS-USB
  ARM: shmobile: r8a7791: add HS-USB device node
  ARM: shmobile: lager: enable HS-USB
  ARM: shmobile: r8a7790: add HS-USB device node
  ARM: shmobile: r8a7791: add USB3.0 device node
  ARM: shmobile: lager: enable USB3.0
  ARM: shmobile: r8a7790: add USB3.0 device node
  ARM: shmobile: r8a7794: Add arch_timer to device tree
  ARM: shmobile: bockw-reference: Initialise TMU device using DT
  ARM: shmobile: r8a7778: Add TMU nodes
  ARM: shmobile: armadillo800eva dts: Enable TMU0
  ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Nov 19, 2014
2 parents 67ec55b + 25af9c8 commit 8ef74e5
Show file tree
Hide file tree
Showing 16 changed files with 351 additions and 40 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/r8a73a4.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
};

cmt1: timer@e6130000 {
compatible = "renesas,cmt-48-gen2";
compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2";
reg = <0 0xe6130000 0 0x1004>;
interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;

Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/r8a7740-armadillo800eva.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,3 +299,7 @@

status = "okay";
};

&tmu0 {
status = "okay";
};
44 changes: 39 additions & 5 deletions arch/arm/boot/dts/r8a7740.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
};

/* irqpin1: IRQ8 - IRQ15 */
Expand All @@ -91,6 +92,7 @@
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
};

/* irqpin2: IRQ16 - IRQ23 */
Expand All @@ -111,6 +113,7 @@
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
};

/* irqpin3: IRQ24 - IRQ31 */
Expand All @@ -131,6 +134,7 @@
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH
0 149 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7740_CLK_INTCA>;
};

ether: ethernet@e9a00000 {
Expand Down Expand Up @@ -193,7 +197,7 @@
compatible = "renesas,scifa-r8a7740", "renesas,scifa";
reg = <0xe6c60000 0x100>;
interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp2_clks R8A7740_CLK_SCIFA0>;
clocks = <&mstp2_clks R8A7740_CLK_SCIFA2>;
clock-names = "sci_ick";
status = "disabled";
};
Expand Down Expand Up @@ -331,6 +335,34 @@
status = "disabled";
};

tmu0: timer@fff80000 {
compatible = "renesas,tmu-r8a7740", "renesas,tmu";
reg = <0xfff80000 0x2c>;
interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
<0 199 IRQ_TYPE_LEVEL_HIGH>,
<0 200 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7740_CLK_TMU0>;
clock-names = "fck";

#renesas,channels = <3>;

status = "disabled";
};

tmu1: timer@fff90000 {
compatible = "renesas,tmu-r8a7740", "renesas,tmu";
reg = <0xfff90000 0x2c>;
interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>,
<0 171 IRQ_TYPE_LEVEL_HIGH>,
<0 172 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7740_CLK_TMU1>;
clock-names = "fck";

#renesas,channels = <3>;

status = "disabled";
};

clocks {
#address-cells = <1>;
#size-cells = <1>;
Expand Down Expand Up @@ -448,8 +480,8 @@
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>,
clocks = <&sub_clk>, <&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>,
Expand All @@ -458,7 +490,8 @@
<&sub_clk>;
#clock-cells = <1>;
renesas,clock-indices = <
R8A7740_CLK_SCIFA6 R8A7740_CLK_SCIFA7
R8A7740_CLK_SCIFA6 R8A7740_CLK_INTCA
R8A7740_CLK_SCIFA7
R8A7740_CLK_DMAC1 R8A7740_CLK_DMAC2
R8A7740_CLK_DMAC3 R8A7740_CLK_USBDMAC
R8A7740_CLK_SCIFA5 R8A7740_CLK_SCIFB
Expand All @@ -467,7 +500,8 @@
R8A7740_CLK_SCIFA4
>;
clock-output-names =
"scifa6", "scifa7", "dmac1", "dmac2", "dmac3",
"scifa6", "intca",
"scifa7", "dmac1", "dmac2", "dmac3",
"usbdmac", "scifa5", "scifb", "scifa0", "scifa1",
"scifa2", "scifa3", "scifa4";
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/r8a7778-bockw-reference.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
status = "okay";
};

&tmu0 {
status = "okay";
};

&pfc {
scif0_pins: serial0 {
renesas,groups = "scif0_data_a", "scif0_ctrl";
Expand Down
36 changes: 36 additions & 0 deletions arch/arm/boot/dts/r8a7778.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,42 @@
status = "disabled";
};

tmu0: timer@ffd80000 {
compatible = "renesas,tmu-r8a7778", "renesas,tmu";
reg = <0xffd80000 0x30>;
interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
<0 33 IRQ_TYPE_LEVEL_HIGH>,
<0 34 IRQ_TYPE_LEVEL_HIGH>;

#renesas,channels = <3>;

status = "disabled";
};

tmu1: timer@ffd81000 {
compatible = "renesas,tmu-r8a7778", "renesas,tmu";
reg = <0xffd81000 0x30>;
interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
<0 37 IRQ_TYPE_LEVEL_HIGH>,
<0 38 IRQ_TYPE_LEVEL_HIGH>;

#renesas,channels = <3>;

status = "disabled";
};

tmu2: timer@ffd82000 {
compatible = "renesas,tmu-r8a7778", "renesas,tmu";
reg = <0xffd82000 0x30>;
interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
<0 41 IRQ_TYPE_LEVEL_HIGH>,
<0 42 IRQ_TYPE_LEVEL_HIGH>;

#renesas,channels = <3>;

status = "disabled";
};

scif0: serial@ffe40000 {
compatible = "renesas,scif-r8a7778", "renesas,scif";
reg = <0xffe40000 0x100>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/r8a7779.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
};

sata: sata@fc600000 {
compatible = "renesas,rcar-sata";
compatible = "renesas,sata-r8a7779", "renesas,rcar-sata";
reg = <0xfc600000 0x2000>;
interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp1_clks R8A7779_CLK_SATA>;
Expand Down
46 changes: 34 additions & 12 deletions arch/arm/boot/dts/r8a7790-lager.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
compatible = "renesas,lager", "renesas,r8a7790";

aliases {
serial6 = &scif0;
serial7 = &scif1;
serial6 = &scifa0;
serial7 = &scifa1;
};

chosen {
Expand Down Expand Up @@ -207,9 +207,9 @@
renesas,function = "du";
};

scif0_pins: serial0 {
renesas,groups = "scif0_data";
renesas,function = "scif0";
scifa0_pins: serial0 {
renesas,groups = "scifa0_data";
renesas,function = "scifa0";
};

ether_pins: ether {
Expand All @@ -222,9 +222,9 @@
renesas,function = "intc";
};

scif1_pins: serial1 {
renesas,groups = "scif1_data";
renesas,function = "scif1";
scifa1_pins: serial1 {
renesas,groups = "scifa1_data";
renesas,function = "scifa1";
};

sdhi0_pins: sd0 {
Expand Down Expand Up @@ -268,6 +268,11 @@
renesas,function = "iic3";
};

hsusb_pins: hsusb {
renesas,groups = "usb0_ovc_vbus";
renesas,function = "usb0";
};

usb0_pins: usb0 {
renesas,groups = "usb0";
renesas,function = "usb0";
Expand Down Expand Up @@ -356,15 +361,15 @@
};
};

&scif0 {
pinctrl-0 = <&scif0_pins>;
&scifa0 {
pinctrl-0 = <&scifa0_pins>;
pinctrl-names = "default";

status = "okay";
};

&scif1 {
pinctrl-0 = <&scif1_pins>;
&scifa1 {
pinctrl-0 = <&scifa1_pins>;
pinctrl-names = "default";

status = "okay";
Expand Down Expand Up @@ -466,12 +471,29 @@
pinctrl-names = "default";
};

&xhci {
status = "okay";
pinctrl-0 = <&usb2_pins>;
pinctrl-names = "default";
};

&pci2 {
status = "okay";
pinctrl-0 = <&usb2_pins>;
pinctrl-names = "default";
};

&hsusb {
status = "okay";
pinctrl-0 = <&hsusb_pins>;
pinctrl-names = "default";
renesas,enable-gpio = <&gpio5 18 GPIO_ACTIVE_HIGH>;
};

&usbphy {
status = "okay";
};

/* composite video input */
&vin1 {
pinctrl-0 = <&vin1_pins>;
Expand Down
Loading

0 comments on commit 8ef74e5

Please sign in to comment.