diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-11-29 05:58:50 -0500 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2019-01-13 20:51:17 -0500 |
| commit | f325529ba13e2c7213ba2aab69cb22002d0fd1b9 (patch) | |
| tree | 9799531d819a8ac82a60312165e7e2c6a3dbc655 /drivers/gpu/drm | |
| parent | 06c3bbd3c12737a50c2e981821b5585e1786e73d (diff) | |
drm: rcar-du: Convert live DT patches to sugar syntax
Using overlay sugar syntax makes the DTS files easier to read (and
write).
Overlay syntactic sugar for generating target-path fragments is
supported by the version of dtc supplied with the kernel since commit
50aafd60898a8b3e ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts | 93 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts | 53 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts | 53 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts | 53 | ||||
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts | 53 |
5 files changed, 135 insertions, 170 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts index 579753e04f3b..8bee4e787a0a 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts +++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts | |||
| @@ -7,70 +7,63 @@ | |||
| 7 | 7 | ||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | /plugin/; | 9 | /plugin/; |
| 10 | / { | ||
| 11 | fragment@0 { | ||
| 12 | target-path = "/"; | ||
| 13 | __overlay__ { | ||
| 14 | #address-cells = <2>; | ||
| 15 | #size-cells = <2>; | ||
| 16 | 10 | ||
| 17 | lvds@feb90000 { | 11 | &{/} { |
| 18 | compatible = "renesas,r8a7790-lvds"; | 12 | #address-cells = <2>; |
| 19 | reg = <0 0xfeb90000 0 0x1c>; | 13 | #size-cells = <2>; |
| 20 | 14 | ||
| 21 | ports { | 15 | lvds@feb90000 { |
| 22 | #address-cells = <1>; | 16 | compatible = "renesas,r8a7790-lvds"; |
| 23 | #size-cells = <0>; | 17 | reg = <0 0xfeb90000 0 0x1c>; |
| 24 | 18 | ||
| 25 | port@0 { | 19 | ports { |
| 26 | reg = <0>; | 20 | #address-cells = <1>; |
| 27 | lvds0_input: endpoint { | 21 | #size-cells = <0>; |
| 28 | }; | 22 | |
| 29 | }; | 23 | port@0 { |
| 30 | port@1 { | 24 | reg = <0>; |
| 31 | reg = <1>; | 25 | lvds0_input: endpoint { |
| 32 | lvds0_out: endpoint { | ||
| 33 | }; | ||
| 34 | }; | ||
| 35 | }; | 26 | }; |
| 36 | }; | 27 | }; |
| 37 | 28 | port@1 { | |
| 38 | lvds@feb94000 { | 29 | reg = <1>; |
| 39 | compatible = "renesas,r8a7790-lvds"; | 30 | lvds0_out: endpoint { |
| 40 | reg = <0 0xfeb94000 0 0x1c>; | ||
| 41 | |||
| 42 | ports { | ||
| 43 | #address-cells = <1>; | ||
| 44 | #size-cells = <0>; | ||
| 45 | |||
| 46 | port@0 { | ||
| 47 | reg = <0>; | ||
| 48 | lvds1_input: endpoint { | ||
| 49 | }; | ||
| 50 | }; | ||
| 51 | port@1 { | ||
| 52 | reg = <1>; | ||
| 53 | lvds1_out: endpoint { | ||
| 54 | }; | ||
| 55 | }; | ||
| 56 | }; | 31 | }; |
| 57 | }; | 32 | }; |
| 58 | }; | 33 | }; |
| 59 | }; | 34 | }; |
| 60 | 35 | ||
| 61 | fragment@1 { | 36 | lvds@feb94000 { |
| 62 | target-path = "/display@feb00000/ports"; | 37 | compatible = "renesas,r8a7790-lvds"; |
| 63 | __overlay__ { | 38 | reg = <0 0xfeb94000 0 0x1c>; |
| 64 | port@1 { | 39 | |
| 65 | endpoint { | 40 | ports { |
| 66 | remote-endpoint = <&lvds0_input>; | 41 | #address-cells = <1>; |
| 42 | #size-cells = <0>; | ||
| 43 | |||
| 44 | port@0 { | ||
| 45 | reg = <0>; | ||
| 46 | lvds1_input: endpoint { | ||
| 67 | }; | 47 | }; |
| 68 | }; | 48 | }; |
| 69 | port@2 { | 49 | port@1 { |
| 70 | endpoint { | 50 | reg = <1>; |
| 71 | remote-endpoint = <&lvds1_input>; | 51 | lvds1_out: endpoint { |
| 72 | }; | 52 | }; |
| 73 | }; | 53 | }; |
| 74 | }; | 54 | }; |
| 75 | }; | 55 | }; |
| 76 | }; | 56 | }; |
| 57 | |||
| 58 | &{/display@feb00000/ports} { | ||
| 59 | port@1 { | ||
| 60 | endpoint { | ||
| 61 | remote-endpoint = <&lvds0_input>; | ||
| 62 | }; | ||
| 63 | }; | ||
| 64 | port@2 { | ||
| 65 | endpoint { | ||
| 66 | remote-endpoint = <&lvds1_input>; | ||
| 67 | }; | ||
| 68 | }; | ||
| 69 | }; | ||
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts index cb9da1f3942b..92c0509971ec 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts +++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts | |||
| @@ -7,44 +7,37 @@ | |||
| 7 | 7 | ||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | /plugin/; | 9 | /plugin/; |
| 10 | / { | ||
| 11 | fragment@0 { | ||
| 12 | target-path = "/"; | ||
| 13 | __overlay__ { | ||
| 14 | #address-cells = <2>; | ||
| 15 | #size-cells = <2>; | ||
| 16 | 10 | ||
| 17 | lvds@feb90000 { | 11 | &{/} { |
| 18 | compatible = "renesas,r8a7791-lvds"; | 12 | #address-cells = <2>; |
| 19 | reg = <0 0xfeb90000 0 0x1c>; | 13 | #size-cells = <2>; |
| 20 | 14 | ||
| 21 | ports { | 15 | lvds@feb90000 { |
| 22 | #address-cells = <1>; | 16 | compatible = "renesas,r8a7791-lvds"; |
| 23 | #size-cells = <0>; | 17 | reg = <0 0xfeb90000 0 0x1c>; |
| 24 | 18 | ||
| 25 | port@0 { | 19 | ports { |
| 26 | reg = <0>; | 20 | #address-cells = <1>; |
| 27 | lvds0_input: endpoint { | 21 | #size-cells = <0>; |
| 28 | }; | 22 | |
| 29 | }; | 23 | port@0 { |
| 30 | port@1 { | 24 | reg = <0>; |
| 31 | reg = <1>; | 25 | lvds0_input: endpoint { |
| 32 | lvds0_out: endpoint { | ||
| 33 | }; | ||
| 34 | }; | ||
| 35 | }; | 26 | }; |
| 36 | }; | 27 | }; |
| 37 | }; | ||
| 38 | }; | ||
| 39 | |||
| 40 | fragment@1 { | ||
| 41 | target-path = "/display@feb00000/ports"; | ||
| 42 | __overlay__ { | ||
| 43 | port@1 { | 28 | port@1 { |
| 44 | endpoint { | 29 | reg = <1>; |
| 45 | remote-endpoint = <&lvds0_input>; | 30 | lvds0_out: endpoint { |
| 46 | }; | 31 | }; |
| 47 | }; | 32 | }; |
| 48 | }; | 33 | }; |
| 49 | }; | 34 | }; |
| 50 | }; | 35 | }; |
| 36 | |||
| 37 | &{/display@feb00000/ports} { | ||
| 38 | port@1 { | ||
| 39 | endpoint { | ||
| 40 | remote-endpoint = <&lvds0_input>; | ||
| 41 | }; | ||
| 42 | }; | ||
| 43 | }; | ||
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts index e7b8804dc3c1..c8b93f21de0f 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts +++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts | |||
| @@ -7,44 +7,37 @@ | |||
| 7 | 7 | ||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | /plugin/; | 9 | /plugin/; |
| 10 | / { | ||
| 11 | fragment@0 { | ||
| 12 | target-path = "/"; | ||
| 13 | __overlay__ { | ||
| 14 | #address-cells = <2>; | ||
| 15 | #size-cells = <2>; | ||
| 16 | 10 | ||
| 17 | lvds@feb90000 { | 11 | &{/} { |
| 18 | compatible = "renesas,r8a7793-lvds"; | 12 | #address-cells = <2>; |
| 19 | reg = <0 0xfeb90000 0 0x1c>; | 13 | #size-cells = <2>; |
| 20 | 14 | ||
| 21 | ports { | 15 | lvds@feb90000 { |
| 22 | #address-cells = <1>; | 16 | compatible = "renesas,r8a7793-lvds"; |
| 23 | #size-cells = <0>; | 17 | reg = <0 0xfeb90000 0 0x1c>; |
| 24 | 18 | ||
| 25 | port@0 { | 19 | ports { |
| 26 | reg = <0>; | 20 | #address-cells = <1>; |
| 27 | lvds0_input: endpoint { | 21 | #size-cells = <0>; |
| 28 | }; | 22 | |
| 29 | }; | 23 | port@0 { |
| 30 | port@1 { | 24 | reg = <0>; |
| 31 | reg = <1>; | 25 | lvds0_input: endpoint { |
| 32 | lvds0_out: endpoint { | ||
| 33 | }; | ||
| 34 | }; | ||
| 35 | }; | 26 | }; |
| 36 | }; | 27 | }; |
| 37 | }; | ||
| 38 | }; | ||
| 39 | |||
| 40 | fragment@1 { | ||
| 41 | target-path = "/display@feb00000/ports"; | ||
| 42 | __overlay__ { | ||
| 43 | port@1 { | 28 | port@1 { |
| 44 | endpoint { | 29 | reg = <1>; |
| 45 | remote-endpoint = <&lvds0_input>; | 30 | lvds0_out: endpoint { |
| 46 | }; | 31 | }; |
| 47 | }; | 32 | }; |
| 48 | }; | 33 | }; |
| 49 | }; | 34 | }; |
| 50 | }; | 35 | }; |
| 36 | |||
| 37 | &{/display@feb00000/ports} { | ||
| 38 | port@1 { | ||
| 39 | endpoint { | ||
| 40 | remote-endpoint = <&lvds0_input>; | ||
| 41 | }; | ||
| 42 | }; | ||
| 43 | }; | ||
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts index a1327443e6fa..16c2d03cb016 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts +++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts | |||
| @@ -7,44 +7,37 @@ | |||
| 7 | 7 | ||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | /plugin/; | 9 | /plugin/; |
| 10 | / { | ||
| 11 | fragment@0 { | ||
| 12 | target-path = "/soc"; | ||
| 13 | __overlay__ { | ||
| 14 | #address-cells = <2>; | ||
| 15 | #size-cells = <2>; | ||
| 16 | 10 | ||
| 17 | lvds@feb90000 { | 11 | &{/soc} { |
| 18 | compatible = "renesas,r8a7795-lvds"; | 12 | #address-cells = <2>; |
| 19 | reg = <0 0xfeb90000 0 0x14>; | 13 | #size-cells = <2>; |
| 20 | 14 | ||
| 21 | ports { | 15 | lvds@feb90000 { |
| 22 | #address-cells = <1>; | 16 | compatible = "renesas,r8a7795-lvds"; |
| 23 | #size-cells = <0>; | 17 | reg = <0 0xfeb90000 0 0x14>; |
| 24 | 18 | ||
| 25 | port@0 { | 19 | ports { |
| 26 | reg = <0>; | 20 | #address-cells = <1>; |
| 27 | lvds0_input: endpoint { | 21 | #size-cells = <0>; |
| 28 | }; | 22 | |
| 29 | }; | 23 | port@0 { |
| 30 | port@1 { | 24 | reg = <0>; |
| 31 | reg = <1>; | 25 | lvds0_input: endpoint { |
| 32 | lvds0_out: endpoint { | 26 | }; |
| 33 | }; | 27 | }; |
| 34 | }; | 28 | port@1 { |
| 29 | reg = <1>; | ||
| 30 | lvds0_out: endpoint { | ||
| 35 | }; | 31 | }; |
| 36 | }; | 32 | }; |
| 37 | }; | 33 | }; |
| 38 | }; | 34 | }; |
| 35 | }; | ||
| 39 | 36 | ||
| 40 | fragment@1 { | 37 | &{/soc/display@feb00000/ports} { |
| 41 | target-path = "/soc/display@feb00000/ports"; | 38 | port@3 { |
| 42 | __overlay__ { | 39 | endpoint { |
| 43 | port@3 { | 40 | remote-endpoint = <&lvds0_input>; |
| 44 | endpoint { | ||
| 45 | remote-endpoint = <&lvds0_input>; | ||
| 46 | }; | ||
| 47 | }; | ||
| 48 | }; | 41 | }; |
| 49 | }; | 42 | }; |
| 50 | }; | 43 | }; |
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts index b23d6466c415..680e923ac036 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts +++ b/drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts | |||
| @@ -7,44 +7,37 @@ | |||
| 7 | 7 | ||
| 8 | /dts-v1/; | 8 | /dts-v1/; |
| 9 | /plugin/; | 9 | /plugin/; |
| 10 | / { | ||
| 11 | fragment@0 { | ||
| 12 | target-path = "/soc"; | ||
| 13 | __overlay__ { | ||
| 14 | #address-cells = <2>; | ||
| 15 | #size-cells = <2>; | ||
| 16 | 10 | ||
| 17 | lvds@feb90000 { | 11 | &{/soc} { |
| 18 | compatible = "renesas,r8a7796-lvds"; | 12 | #address-cells = <2>; |
| 19 | reg = <0 0xfeb90000 0 0x14>; | 13 | #size-cells = <2>; |
| 20 | 14 | ||
| 21 | ports { | 15 | lvds@feb90000 { |
| 22 | #address-cells = <1>; | 16 | compatible = "renesas,r8a7796-lvds"; |
| 23 | #size-cells = <0>; | 17 | reg = <0 0xfeb90000 0 0x14>; |
| 24 | 18 | ||
| 25 | port@0 { | 19 | ports { |
| 26 | reg = <0>; | 20 | #address-cells = <1>; |
| 27 | lvds0_input: endpoint { | 21 | #size-cells = <0>; |
| 28 | }; | 22 | |
| 29 | }; | 23 | port@0 { |
| 30 | port@1 { | 24 | reg = <0>; |
| 31 | reg = <1>; | 25 | lvds0_input: endpoint { |
| 32 | lvds0_out: endpoint { | 26 | }; |
| 33 | }; | 27 | }; |
| 34 | }; | 28 | port@1 { |
| 29 | reg = <1>; | ||
| 30 | lvds0_out: endpoint { | ||
| 35 | }; | 31 | }; |
| 36 | }; | 32 | }; |
| 37 | }; | 33 | }; |
| 38 | }; | 34 | }; |
| 35 | }; | ||
| 39 | 36 | ||
| 40 | fragment@1 { | 37 | &{/soc/display@feb00000/ports} { |
| 41 | target-path = "/soc/display@feb00000/ports"; | 38 | port@3 { |
| 42 | __overlay__ { | 39 | endpoint { |
| 43 | port@3 { | 40 | remote-endpoint = <&lvds0_input>; |
| 44 | endpoint { | ||
| 45 | remote-endpoint = <&lvds0_input>; | ||
| 46 | }; | ||
| 47 | }; | ||
| 48 | }; | 41 | }; |
| 49 | }; | 42 | }; |
| 50 | }; | 43 | }; |
