-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
arm64: dts: r8a7795: Add support for R-Car H3 ES2.0
Update r8a7795.dtsi so it corresponds to R-Car H3 ES2.0 or later:
- The following devices no longer exist on ES2.0, and are thus removed:
fcpf2, fcpvd3, fcpvi2, fdp1-2, usb3-if1, vspd3, vspi2.
- The DU <-> VSPD topology is different on ES2.0, hence remove the
"compatible" and "vsps" properties from the DU node until the driver
can handle this.
Move support for the ES1.x revision of the R-Car H3 SoC into a
separate file. To avoid duplication, r8a7795-es1.dtsi includes
r8a7795.dtsi, and adds device nodes and properties where needed.
Note that while currently r8a7795-es1.dtsi only adds device nodes,
removal of devices nodes and properties can be implemented using the
/delete-node/ and /delete-property/ keywords, as shown below:
&soc {
/delete-node/ <name>@<addr>;
};
&<label> {
/delete-property/ <prop>;
};
Switch r8a7795-salvator-x.dts and r8a7795-h3ulcb.dts from r8a7795.dtsi
to r8a7795-es1.dtsi to preserve compatibility.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>- Loading branch information
Geert Uytterhoeven
authored and
Simon Horman
committed
May 22, 2017
1 parent
133ace3
commit 291e0c4
Showing
4 changed files
with
89 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Device Tree Source for the r8a7795 ES1.x SoC | ||
| * | ||
| * Copyright (C) 2015 Renesas Electronics 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 "r8a7795.dtsi" | ||
|
|
||
| &soc { | ||
| xhci1: usb@ee0400000 { | ||
| compatible = "renesas,xhci-r8a7795", "renesas,rcar-gen3-xhci"; | ||
| reg = <0 0xee040000 0 0xc00>; | ||
| interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&cpg CPG_MOD 327>; | ||
| power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; | ||
| resets = <&cpg 327>; | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| fcpf2: fcp@fe952000 { | ||
| compatible = "renesas,fcpf"; | ||
| reg = <0 0xfe952000 0 0x200>; | ||
| clocks = <&cpg CPG_MOD 613>; | ||
| power-domains = <&sysc R8A7795_PD_A3VP>; | ||
| resets = <&cpg 613>; | ||
| }; | ||
|
|
||
| vspi2: vsp@fe9c0000 { | ||
| compatible = "renesas,vsp2"; | ||
| reg = <0 0xfe9c0000 0 0x8000>; | ||
| interrupts = <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&cpg CPG_MOD 629>; | ||
| power-domains = <&sysc R8A7795_PD_A3VP>; | ||
| resets = <&cpg 629>; | ||
|
|
||
| renesas,fcp = <&fcpvi2>; | ||
| }; | ||
|
|
||
| fcpvi2: fcp@fe9cf000 { | ||
| compatible = "renesas,fcpv"; | ||
| reg = <0 0xfe9cf000 0 0x200>; | ||
| clocks = <&cpg CPG_MOD 609>; | ||
| power-domains = <&sysc R8A7795_PD_A3VP>; | ||
| resets = <&cpg 609>; | ||
| }; | ||
|
|
||
| vspd3: vsp@fea38000 { | ||
| compatible = "renesas,vsp2"; | ||
| reg = <0 0xfea38000 0 0x4000>; | ||
| interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&cpg CPG_MOD 620>; | ||
| power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; | ||
| resets = <&cpg 620>; | ||
|
|
||
| renesas,fcp = <&fcpvd3>; | ||
| }; | ||
|
|
||
| fcpvd3: fcp@fea3f000 { | ||
| compatible = "renesas,fcpv"; | ||
| reg = <0 0xfea3f000 0 0x200>; | ||
| clocks = <&cpg CPG_MOD 600>; | ||
| power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; | ||
| resets = <&cpg 600>; | ||
| }; | ||
|
|
||
| fdp1@fe948000 { | ||
| compatible = "renesas,fdp1"; | ||
| reg = <0 0xfe948000 0 0x2400>; | ||
| interrupts = <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&cpg CPG_MOD 117>; | ||
| power-domains = <&sysc R8A7795_PD_A3VP>; | ||
| resets = <&cpg 117>; | ||
| renesas,fcp = <&fcpf2>; | ||
| }; | ||
| }; | ||
|
|
||
| &du { | ||
| compatible = "renesas,du-r8a7795"; | ||
| vsps = <&vspd0 &vspd1 &vspd2 &vspd3>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters