aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2018-06-05 05:51:06 -0400
committerSimon Horman <horms+renesas@verge.net.au>2018-08-27 09:06:16 -0400
commit58e8ed2ee9abe7181d68d5cf067a858a753c77a0 (patch)
tree7379c1fc2a27de10f615e696a375b1dd874808f2
parentdc7a6bab2bb78ff403fb7adce81514cb6f82aeb1 (diff)
arm64: dts: renesas: Convert to new LVDS DT bindings
The internal LVDS encoder now has DT bindings separate from the DU. Port the r8a7795 and r8a7796 device trees over to the new model. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7795.dtsi36
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts3
-rw-r--r--arch/arm64/boot/dts/renesas/r8a7796.dtsi36
8 files changed, 66 insertions, 24 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
index 6b5fa91f1d5d..0895503b69d0 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
@@ -40,12 +40,11 @@
40 <&cpg CPG_MOD 723>, 40 <&cpg CPG_MOD 723>,
41 <&cpg CPG_MOD 722>, 41 <&cpg CPG_MOD 722>,
42 <&cpg CPG_MOD 721>, 42 <&cpg CPG_MOD 721>,
43 <&cpg CPG_MOD 727>,
44 <&versaclock5 1>, 43 <&versaclock5 1>,
45 <&x21_clk>, 44 <&x21_clk>,
46 <&x22_clk>, 45 <&x22_clk>,
47 <&versaclock5 2>; 46 <&versaclock5 2>;
48 clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0", 47 clock-names = "du.0", "du.1", "du.2", "du.3",
49 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; 48 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
50}; 49};
51 50
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
index df50bf46406e..54515eaf0310 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
@@ -41,11 +41,10 @@
41 <&cpg CPG_MOD 723>, 41 <&cpg CPG_MOD 723>,
42 <&cpg CPG_MOD 722>, 42 <&cpg CPG_MOD 722>,
43 <&cpg CPG_MOD 721>, 43 <&cpg CPG_MOD 721>,
44 <&cpg CPG_MOD 727>,
45 <&versaclock5 1>, 44 <&versaclock5 1>,
46 <&versaclock5 3>, 45 <&versaclock5 3>,
47 <&versaclock5 4>, 46 <&versaclock5 4>,
48 <&versaclock5 2>; 47 <&versaclock5 2>;
49 clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0", 48 clock-names = "du.0", "du.1", "du.2", "du.3",
50 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; 49 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
51}; 50};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 446822f5751c..1620e8d8dacc 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -40,12 +40,11 @@
40 <&cpg CPG_MOD 723>, 40 <&cpg CPG_MOD 723>,
41 <&cpg CPG_MOD 722>, 41 <&cpg CPG_MOD 722>,
42 <&cpg CPG_MOD 721>, 42 <&cpg CPG_MOD 721>,
43 <&cpg CPG_MOD 727>,
44 <&versaclock5 1>, 43 <&versaclock5 1>,
45 <&x21_clk>, 44 <&x21_clk>,
46 <&x22_clk>, 45 <&x22_clk>,
47 <&versaclock5 2>; 46 <&versaclock5 2>;
48 clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0", 47 clock-names = "du.0", "du.1", "du.2", "du.3",
49 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; 48 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
50}; 49};
51 50
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
index 8ded64d0a4d5..8c142affee49 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
@@ -40,12 +40,11 @@
40 <&cpg CPG_MOD 723>, 40 <&cpg CPG_MOD 723>,
41 <&cpg CPG_MOD 722>, 41 <&cpg CPG_MOD 722>,
42 <&cpg CPG_MOD 721>, 42 <&cpg CPG_MOD 721>,
43 <&cpg CPG_MOD 727>,
44 <&versaclock6 1>, 43 <&versaclock6 1>,
45 <&x21_clk>, 44 <&x21_clk>,
46 <&x22_clk>, 45 <&x22_clk>,
47 <&versaclock6 2>; 46 <&versaclock6 2>;
48 clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0", 47 clock-names = "du.0", "du.1", "du.2", "du.3",
49 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3"; 48 "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
50}; 49};
51 50
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index aa0d4c8f6b04..efc24770c0fd 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2782,9 +2782,7 @@
2782 2782
2783 du: display@feb00000 { 2783 du: display@feb00000 {
2784 compatible = "renesas,du-r8a7795"; 2784 compatible = "renesas,du-r8a7795";
2785 reg = <0 0xfeb00000 0 0x80000>, 2785 reg = <0 0xfeb00000 0 0x80000>;
2786 <0 0xfeb90000 0 0x14>;
2787 reg-names = "du", "lvds.0";
2788 interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, 2786 interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
2789 <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>, 2787 <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
2790 <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>, 2788 <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
@@ -2792,9 +2790,8 @@
2792 clocks = <&cpg CPG_MOD 724>, 2790 clocks = <&cpg CPG_MOD 724>,
2793 <&cpg CPG_MOD 723>, 2791 <&cpg CPG_MOD 723>,
2794 <&cpg CPG_MOD 722>, 2792 <&cpg CPG_MOD 722>,
2795 <&cpg CPG_MOD 721>, 2793 <&cpg CPG_MOD 721>;
2796 <&cpg CPG_MOD 727>; 2794 clock-names = "du.0", "du.1", "du.2", "du.3";
2797 clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0";
2798 vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>; 2795 vsps = <&vspd0 0 &vspd1 0 &vspd2 0 &vspd0 1>;
2799 status = "disabled"; 2796 status = "disabled";
2800 2797
@@ -2822,6 +2819,33 @@
2822 port@3 { 2819 port@3 {
2823 reg = <3>; 2820 reg = <3>;
2824 du_out_lvds0: endpoint { 2821 du_out_lvds0: endpoint {
2822 remote-endpoint = <&lvds0_in>;
2823 };
2824 };
2825 };
2826 };
2827
2828 lvds0: lvds@feb90000 {
2829 compatible = "renesas,r8a7795-lvds";
2830 reg = <0 0xfeb90000 0 0x14>;
2831 clocks = <&cpg CPG_MOD 727>;
2832 power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
2833 resets = <&cpg 727>;
2834 status = "disabled";
2835
2836 ports {
2837 #address-cells = <1>;
2838 #size-cells = <0>;
2839
2840 port@0 {
2841 reg = <0>;
2842 lvds0_in: endpoint {
2843 remote-endpoint = <&du_out_lvds0>;
2844 };
2845 };
2846 port@1 {
2847 reg = <1>;
2848 lvds0_out: endpoint {
2825 }; 2849 };
2826 }; 2850 };
2827 }; 2851 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
index cbd8acbf537e..9e4594c27fa6 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
@@ -30,10 +30,9 @@
30 clocks = <&cpg CPG_MOD 724>, 30 clocks = <&cpg CPG_MOD 724>,
31 <&cpg CPG_MOD 723>, 31 <&cpg CPG_MOD 723>,
32 <&cpg CPG_MOD 722>, 32 <&cpg CPG_MOD 722>,
33 <&cpg CPG_MOD 727>,
34 <&versaclock5 1>, 33 <&versaclock5 1>,
35 <&versaclock5 3>, 34 <&versaclock5 3>,
36 <&versaclock5 2>; 35 <&versaclock5 2>;
37 clock-names = "du.0", "du.1", "du.2", "lvds.0", 36 clock-names = "du.0", "du.1", "du.2",
38 "dclkin.0", "dclkin.1", "dclkin.2"; 37 "dclkin.0", "dclkin.1", "dclkin.2";
39}; 38};
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 052d72acc862..b4f9567cb9f8 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -29,11 +29,10 @@
29 clocks = <&cpg CPG_MOD 724>, 29 clocks = <&cpg CPG_MOD 724>,
30 <&cpg CPG_MOD 723>, 30 <&cpg CPG_MOD 723>,
31 <&cpg CPG_MOD 722>, 31 <&cpg CPG_MOD 722>,
32 <&cpg CPG_MOD 727>,
33 <&versaclock5 1>, 32 <&versaclock5 1>,
34 <&x21_clk>, 33 <&x21_clk>,
35 <&versaclock5 2>; 34 <&versaclock5 2>;
36 clock-names = "du.0", "du.1", "du.2", "lvds.0", 35 clock-names = "du.0", "du.1", "du.2",
37 "dclkin.0", "dclkin.1", "dclkin.2"; 36 "dclkin.0", "dclkin.1", "dclkin.2";
38}; 37};
39 38
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index b93596c9c6b1..258a3271b002 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -2437,17 +2437,14 @@
2437 2437
2438 du: display@feb00000 { 2438 du: display@feb00000 {
2439 compatible = "renesas,du-r8a7796"; 2439 compatible = "renesas,du-r8a7796";
2440 reg = <0 0xfeb00000 0 0x70000>, 2440 reg = <0 0xfeb00000 0 0x70000>;
2441 <0 0xfeb90000 0 0x14>;
2442 reg-names = "du", "lvds.0";
2443 interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, 2441 interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
2444 <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>, 2442 <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
2445 <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>; 2443 <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
2446 clocks = <&cpg CPG_MOD 724>, 2444 clocks = <&cpg CPG_MOD 724>,
2447 <&cpg CPG_MOD 723>, 2445 <&cpg CPG_MOD 723>,
2448 <&cpg CPG_MOD 722>, 2446 <&cpg CPG_MOD 722>;
2449 <&cpg CPG_MOD 727>; 2447 clock-names = "du.0", "du.1", "du.2";
2450 clock-names = "du.0", "du.1", "du.2", "lvds.0";
2451 status = "disabled"; 2448 status = "disabled";
2452 2449
2453 vsps = <&vspd0 &vspd1 &vspd2>; 2450 vsps = <&vspd0 &vspd1 &vspd2>;
@@ -2470,6 +2467,33 @@
2470 port@2 { 2467 port@2 {
2471 reg = <2>; 2468 reg = <2>;
2472 du_out_lvds0: endpoint { 2469 du_out_lvds0: endpoint {
2470 remote-endpoint = <&lvds0_in>;
2471 };
2472 };
2473 };
2474 };
2475
2476 lvds0: lvds@feb90000 {
2477 compatible = "renesas,r8a7796-lvds";
2478 reg = <0 0xfeb90000 0 0x14>;
2479 clocks = <&cpg CPG_MOD 727>;
2480 power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
2481 resets = <&cpg 727>;
2482 status = "disabled";
2483
2484 ports {
2485 #address-cells = <1>;
2486 #size-cells = <0>;
2487
2488 port@0 {
2489 reg = <0>;
2490 lvds0_in: endpoint {
2491 remote-endpoint = <&du_out_lvds0>;
2492 };
2493 };
2494 port@1 {
2495 reg = <1>;
2496 lvds0_out: endpoint {
2473 }; 2497 };
2474 }; 2498 };
2475 }; 2499 };
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-13 08:53:28 -0400