aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyo Kataoka <ryo.kataoka.wt@renesas.com>2017-05-22 16:46:12 +0900
committerRyo Kataoka <ryo.kataoka.wt@renesas.com>2017-05-22 16:46:12 +0900
commita1e9c32f7e263f5bb868cb2cd706d4447591c7ee (patch)
treee11deea6b3656fd72d0282b4fb8ad326b9b34c14
parent8d3c6dd4fc3c5775cb3f47921cfde7b6fbf5afd3 (diff)
parent806d0abc245c7da6200349cfed06a8cb3c921eb4 (diff)
downloadrenesas-bsp-v4.9/rcar-3.5.4.rc2.tar.gz
Merge branch 'rcar-3.5.3/dts-rcar-gen3.rc2' into v4.9/rcar-3.5.4.rc2rcar-3.5.4.rc2v4.9/rcar-3.5.4.rc2
* rcar-3.5.3/dts-rcar-gen3.rc2: (38 commits) arm64: dts: r8a7795: Add MFIS Lock device node arm64: dts: r8a7796: Add MFIS device node arm64: dts: r8a7795: Add MFIS Lock device node arm64: dts: r8a7795: Add MFIS device node arm64: dts: r8a7795-es1: Add MFIS Lock device node arm64: dts: r8a7795-es1: Add MFIS device node Revert "arm64: dts: r8a7795-es1: Add MFIS device node" Revert "arm64: dts: r8a7795-es1: Add MFIS Lock device node" Revert "arm64: dts: r8a7795: Add MFIS device node" Revert "arm64: dts: r8a7795: Add MFIS Lock device node" Revert "arm64: dts: r8a7796: Add MFIS device node" Revert "arm64: dts: r8a7796: Add MFIS Lock device node" Revert "arm64: dts: r8a7795: Remove clocks and power-domains from MFIS device node" Revert "arm64: dts: r8a7795: Remove clocks and power-domains from MFIS Lock device node" Revert "arm64: dts: r8a7796: Remove clocks and power-domains from MFIS device node" Revert "arm64: dts: r8a7796: Remove clocks and power-domains from MFIS Lock device node" Revert "arm64: dts: r8a7795-es1: Remove clocks and power-domains from MFIS device node" Revert "arm64: dts: r8a7795-es1: Remove clocks and power-domains from MFIS Lock device node" arm64: dts: r8a7796-salvator-x: add 12288000 for sound ADG arm64: dts: r8a7795-salvator-x: add 12288000 for sound ADG arm64: dts: r8a7796: Use IPMMU(MMU mode) in IPMMU-VC0 arm64: dts: r8a7795-es1: Use IPMMU (MMU mode) for IPMMU-VP and IPMMU-VC0/1 arm64: dts: r8a7795: Use IPMMU(MMU mode) for IPMMU-VP0/1 and IPMMU-VC0/1 arm64: dts: r8a7795-es1: Add DEVFREQ support for GSX arm64: dts: r8a7796: Add DEVFREQ support for GSX arm64: dts: r8a7795: Add DEVFREQ support for GSX arm64: dts: r8a7796-salvator-xs: Enable USB3.0 peripheral ch0 arm64: dts: r8a7795-salvator-xs: Enable USB3.0 peripheral ch0 arm64: dts: r8a7796-salvator-x: Enable USB3.0 peripheral ch0 arm64: dts: r8a7795-salvator-x: Enable USB3.0 peripheral ch0 ...
Diffstat
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi33
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts2
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795.dtsi38
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts2
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796.dtsi28
5 files changed, 89 insertions, 14 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index b081cc4657055f..340820dd94d4cd 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -440,6 +440,27 @@
};
};
+ gsx_opp_table: gsx_opp_table {
+ compatible = "operating-points-v2";
+
+ opp@200000000 {
+ opp-hz = /bits/ 64 <200000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@300000000 {
+ opp-hz = /bits/ 64 <300000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@400000000 {
+ opp-hz = /bits/ 64 <400000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <820000>;
+ };
+ };
+
extal_clk: extal {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -822,7 +843,7 @@
status = "okay";
};
- mfis_lock: mfis-lock {
+ mfis_lock: mfis-lock@e62600c0 {
compatible = "renesas,mfis-lock-r8a7795",
"renesas,mfis-lock";
reg = <0 0xe62600c0 0 0x0020>;
@@ -858,7 +879,7 @@
};
ipmmu_vp: mmu@fe990000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe990000 0 0x1000>; /* IPMMU-VP */
renesas,ipmmu-main = <&ipmmu_mm 12>;
#iommu-cells = <1>;
@@ -867,7 +888,7 @@
};
ipmmu_vc0: mmu@fe6b0000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe6b0000 0 0x1000>; /* IPMMU-VC0 */
renesas,ipmmu-main = <&ipmmu_mm 9>;
#iommu-cells = <1>;
@@ -876,7 +897,7 @@
};
ipmmu_vc1: mmu@fe6f0000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe6f0000 0 0x1000>; /* IPMMU-VC1 */
renesas,ipmmu-main = <&ipmmu_mm 10>;
#iommu-cells = <1>;
@@ -1810,6 +1831,7 @@
reg = <0 0xfd000000 0 0x3ffff>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 112>;
+ operating-points-v2 = <&gsx_opp_table>;
power-domains = <&sysc R8A7795_PD_3DG_E>;
};
@@ -2524,6 +2546,7 @@
clocks = <&cpg CPG_MOD 703>;
phys = <&usb2_phy0>;
phy-names = "usb";
+ companion= <&ohci0>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2535,6 +2558,7 @@
clocks = <&cpg CPG_MOD 702>;
phys = <&usb2_phy1>;
phy-names = "usb";
+ companion= <&ohci1>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2546,6 +2570,7 @@
clocks = <&cpg CPG_MOD 701>;
phys = <&usb2_phy2>;
phy-names = "usb";
+ companion= <&ohci2>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 694185eeec4049..28003e411fc732 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -749,7 +749,7 @@
/* audio_clkout0/1/2/3 */
#clock-cells = <1>;
- clock-frequency = <11289600>;
+ clock-frequency = <11289600 12288000>;
clkout-lr-synchronous;
status = "okay";
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index c3e986018d6e0f..7e85ba55eab23c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -435,6 +435,27 @@
};
};
+ gsx_opp_table: gsx_opp_table {
+ compatible = "operating-points-v2";
+
+ opp@200000000 {
+ opp-hz = /bits/ 64 <200000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@300000000 {
+ opp-hz = /bits/ 64 <300000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@400000000 {
+ opp-hz = /bits/ 64 <400000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <820000>;
+ };
+ };
+
extal_clk: extal {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -575,7 +596,7 @@
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
- gpio-ranges = <&pfc 0 32 28>;
+ gpio-ranges = <&pfc 0 32 29>;
#interrupt-cells = <2>;
interrupt-controller;
clocks = <&cpg CPG_MOD 911>;
@@ -817,7 +838,7 @@
status = "okay";
};
- mfis_lock: mfis-lock {
+ mfis_lock: mfis-lock@e62600c0 {
compatible = "renesas,mfis-lock-r8a7795",
"renesas,mfis-lock";
reg = <0 0xe62600c0 0 0x0020>;
@@ -861,7 +882,7 @@
};
ipmmu_vp0: mmu@fe990000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe990000 0 0x1000>; /* IPMMU-VP0 */
renesas,ipmmu-main = <&ipmmu_mm 16>;
#iommu-cells = <1>;
@@ -870,7 +891,7 @@
};
ipmmu_vp1: mmu@fe980000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe980000 0 0x1000>; /* IPMMU-VP1 */
renesas,ipmmu-main = <&ipmmu_mm 17>;
#iommu-cells = <1>;
@@ -879,7 +900,7 @@
};
ipmmu_vc0: mmu@fe6b0000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe6b0000 0 0x1000>; /* IPMMU-VC0 */
renesas,ipmmu-main = <&ipmmu_mm 12>;
#iommu-cells = <1>;
@@ -888,7 +909,7 @@
};
ipmmu_vc1: mmu@fe6f0000 {
- compatible = "renesas,ipmmu-pmb-r8a7795";
+ compatible = "renesas,ipmmu-mmu-r8a7795";
reg = <0 0xfe6f0000 0 0x1000>; /* IPMMU-VC1 */
renesas,ipmmu-main = <&ipmmu_mm 13>;
#iommu-cells = <1>;
@@ -1830,6 +1851,7 @@
reg = <0 0xfd000000 0 0x3ffff>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 112>;
+ operating-points-v2 = <&gsx_opp_table>;
power-domains = <&sysc R8A7795_PD_3DG_E>;
};
@@ -2432,6 +2454,7 @@
clocks = <&cpg CPG_MOD 703>;
phys = <&usb2_phy0>;
phy-names = "usb";
+ companion= <&ohci0>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2443,6 +2466,7 @@
clocks = <&cpg CPG_MOD 702>;
phys = <&usb2_phy1>;
phy-names = "usb";
+ companion = <&ohci1>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2454,6 +2478,7 @@
clocks = <&cpg CPG_MOD 701>;
phys = <&usb2_phy2>;
phy-names = "usb";
+ companion = <&ohci2>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2465,6 +2490,7 @@
clocks = <&cpg CPG_MOD 700>;
phys = <&usb2_phy3>;
phy-names = "usb";
+ companion = <&ohci3>;
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
status = "disabled";
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 99437ed736a5e3..64ee670750ea9b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -738,7 +738,7 @@
/* audio_clkout0/1/2/3 */
#clock-cells = <1>;
- clock-frequency = <11289600>;
+ clock-frequency = <11289600 12288000>;
clkout-lr-synchronous;
status = "okay";
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 21a6b1fac486d8..f088170a51be22 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -448,6 +448,27 @@
};
};
+ gsx_opp_table: gsx_opp_table {
+ compatible = "operating-points-v2";
+
+ opp@200000000 {
+ opp-hz = /bits/ 64 <200000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@300000000 {
+ opp-hz = /bits/ 64 <300000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@400000000 {
+ opp-hz = /bits/ 64 <400000000>;
+ opp-microvolt = <820000>;
+ };
+ opp@600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <820000>;
+ };
+ };
+
extal_clk: extal {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -693,7 +714,7 @@
status = "okay";
};
- mfis_lock: mfis-lock {
+ mfis_lock: mfis-lock@e62600c0 {
compatible = "renesas,mfis-lock-r8a7796",
"renesas,mfis-lock";
reg = <0 0xe62600c0 0 0x0020>;
@@ -734,7 +755,7 @@
};
ipmmu_vc0: mmu@fe6b0000 {
- compatible = "renesas,ipmmu-pmb-r8a7796";
+ compatible = "renesas,ipmmu-mmu-r8a7796";
reg = <0 0xfe6b0000 0 0x1000>; /* IPMMU-VC0 */
renesas,ipmmu-main = <&ipmmu_mm 8>;
#iommu-cells = <1>;
@@ -2063,6 +2084,7 @@
clocks = <&cpg CPG_MOD 703>;
phys = <&usb2_phy0>;
phy-names = "usb";
+ companion= <&ohci0>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2074,6 +2096,7 @@
clocks = <&cpg CPG_MOD 702>;
phys = <&usb2_phy1>;
phy-names = "usb";
+ companion= <&ohci1>;
power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
status = "disabled";
};
@@ -2406,6 +2429,7 @@
reg = <0 0xfd000000 0 0x3ffff>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 112>;
+ operating-points-v2 = <&gsx_opp_table>;
power-domains = <&sysc R8A7796_PD_3DG_B>;
};
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-31 08:16:20 +0000