Skip to content

L
linux
Commit f325529b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Laurent Pinchart
Browse files
Options

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
50aafd60 ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent 06c3bbd3
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 170 deletions
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts
View file @ f325529b
...@@ -7,70 +7,63 @@ ...@@ -7,70 +7,63 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ {
fragment@0 {
target-path = "/";
__overlay__ {
#address-cells = <2>;
#size-cells = <2>;
lvds@feb90000 { &{/} {
compatible = "renesas,r8a7790-lvds"; #address-cells = <2>;
reg = <0 0xfeb90000 0 0x1c>; #size-cells = <2>;
ports { lvds@feb90000 {
#address-cells = <1>; compatible = "renesas,r8a7790-lvds";
#size-cells = <0>; reg = <0 0xfeb90000 0 0x1c>;
port@0 { ports {
reg = <0>; #address-cells = <1>;
lvds0_input: endpoint { #size-cells = <0>;
};
}; port@0 {
port@1 { reg = <0>;
reg = <1>; lvds0_input: endpoint {
lvds0_out: endpoint {
};
};
}; };
}; };
port@1 {
lvds@feb94000 { reg = <1>;
compatible = "renesas,r8a7790-lvds"; lvds0_out: endpoint {
reg = <0 0xfeb94000 0 0x1c>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
lvds1_input: endpoint {
};
};
port@1 {
reg = <1>;
lvds1_out: endpoint {
};
};
}; };
}; };
}; };
}; };
fragment@1 { lvds@feb94000 {
target-path = "/display@feb00000/ports"; compatible = "renesas,r8a7790-lvds";
__overlay__ { reg = <0 0xfeb94000 0 0x1c>;
port@1 {
endpoint { ports {
remote-endpoint = <&lvds0_input>; #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
lvds1_input: endpoint {
}; };
}; };
port@2 { port@1 {
endpoint { reg = <1>;
remote-endpoint = <&lvds1_input>; lvds1_out: endpoint {
}; };
}; };
}; };
}; };
}; };
&{/display@feb00000/ports} {
port@1 {
endpoint {
remote-endpoint = <&lvds0_input>;
};
};
port@2 {
endpoint {
remote-endpoint = <&lvds1_input>;
};
};
};
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts
View file @ f325529b
...@@ -7,44 +7,37 @@ ...@@ -7,44 +7,37 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ {
fragment@0 {
target-path = "/";
__overlay__ {
#address-cells = <2>;
#size-cells = <2>;
lvds@feb90000 { &{/} {
compatible = "renesas,r8a7791-lvds"; #address-cells = <2>;
reg = <0 0xfeb90000 0 0x1c>; #size-cells = <2>;
ports { lvds@feb90000 {
#address-cells = <1>; compatible = "renesas,r8a7791-lvds";
#size-cells = <0>; reg = <0 0xfeb90000 0 0x1c>;
port@0 { ports {
reg = <0>; #address-cells = <1>;
lvds0_input: endpoint { #size-cells = <0>;
};
}; port@0 {
port@1 { reg = <0>;
reg = <1>; lvds0_input: endpoint {
lvds0_out: endpoint {
};
};
}; };
}; };
};
};
fragment@1 {
target-path = "/display@feb00000/ports";
__overlay__ {
port@1 { port@1 {
endpoint { reg = <1>;
remote-endpoint = <&lvds0_input>; lvds0_out: endpoint {
}; };
}; };
}; };
}; };
}; };
&{/display@feb00000/ports} {
port@1 {
endpoint {
remote-endpoint = <&lvds0_input>;
};
};
};
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts
View file @ f325529b
...@@ -7,44 +7,37 @@ ...@@ -7,44 +7,37 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ {
fragment@0 {
target-path = "/";
__overlay__ {
#address-cells = <2>;
#size-cells = <2>;
lvds@feb90000 { &{/} {
compatible = "renesas,r8a7793-lvds"; #address-cells = <2>;
reg = <0 0xfeb90000 0 0x1c>; #size-cells = <2>;
ports { lvds@feb90000 {
#address-cells = <1>; compatible = "renesas,r8a7793-lvds";
#size-cells = <0>; reg = <0 0xfeb90000 0 0x1c>;
port@0 { ports {
reg = <0>; #address-cells = <1>;
lvds0_input: endpoint { #size-cells = <0>;
};
}; port@0 {
port@1 { reg = <0>;
reg = <1>; lvds0_input: endpoint {
lvds0_out: endpoint {
};
};
}; };
}; };
};
};
fragment@1 {
target-path = "/display@feb00000/ports";
__overlay__ {
port@1 { port@1 {
endpoint { reg = <1>;
remote-endpoint = <&lvds0_input>; lvds0_out: endpoint {
}; };
}; };
}; };
}; };
}; };
&{/display@feb00000/ports} {
port@1 {
endpoint {
remote-endpoint = <&lvds0_input>;
};
};
};
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts
View file @ f325529b
...@@ -7,44 +7,37 @@ ...@@ -7,44 +7,37 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ {
fragment@0 {
target-path = "/soc";
__overlay__ {
#address-cells = <2>;
#size-cells = <2>;
lvds@feb90000 { &{/soc} {
compatible = "renesas,r8a7795-lvds"; #address-cells = <2>;
reg = <0 0xfeb90000 0 0x14>; #size-cells = <2>;
ports { lvds@feb90000 {
#address-cells = <1>; compatible = "renesas,r8a7795-lvds";
#size-cells = <0>; reg = <0 0xfeb90000 0 0x14>;
port@0 { ports {
reg = <0>; #address-cells = <1>;
lvds0_input: endpoint { #size-cells = <0>;
};
}; port@0 {
port@1 { reg = <0>;
reg = <1>; lvds0_input: endpoint {
lvds0_out: endpoint { };
}; };
}; port@1 {
reg = <1>;
lvds0_out: endpoint {
}; };
}; };
}; };
}; };
};
fragment@1 { &{/soc/display@feb00000/ports} {
target-path = "/soc/display@feb00000/ports"; port@3 {
__overlay__ { endpoint {
port@3 { remote-endpoint = <&lvds0_input>;
endpoint {
remote-endpoint = <&lvds0_input>;
};
};
}; };
}; };
}; };
drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts
View file @ f325529b
...@@ -7,44 +7,37 @@ ...@@ -7,44 +7,37 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ {
fragment@0 {
target-path = "/soc";
__overlay__ {
#address-cells = <2>;
#size-cells = <2>;
lvds@feb90000 { &{/soc} {
compatible = "renesas,r8a7796-lvds"; #address-cells = <2>;
reg = <0 0xfeb90000 0 0x14>; #size-cells = <2>;
ports { lvds@feb90000 {
#address-cells = <1>; compatible = "renesas,r8a7796-lvds";
#size-cells = <0>; reg = <0 0xfeb90000 0 0x14>;
port@0 { ports {
reg = <0>; #address-cells = <1>;
lvds0_input: endpoint { #size-cells = <0>;
};
}; port@0 {
port@1 { reg = <0>;
reg = <1>; lvds0_input: endpoint {
lvds0_out: endpoint { };
}; };
}; port@1 {
reg = <1>;
lvds0_out: endpoint {
}; };
}; };
}; };
}; };
};
fragment@1 { &{/soc/display@feb00000/ports} {
target-path = "/soc/display@feb00000/ports"; port@3 {
__overlay__ { endpoint {
port@3 { remote-endpoint = <&lvds0_input>;
endpoint {
remote-endpoint = <&lvds0_input>;
};
};
}; };
}; };
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7