diff for duplicates of <20180430114058.5061-15-jagan@amarulasolutions.com> diff --git a/a/1.txt b/N1/1.txt index 0f4b278..21ceb1c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ index da9128ae836d..f017baa4f5db 100644 #reset-cells = <1>; }; -+ mixer1: mixer@1200000 { ++ mixer1: mixer at 1200000 { + compatible = "allwinner,sun50i-a64-de2-mixer-1", + "allwinner,sun8i-a83t-de2-mixer-1"; + reg = <0x01200000 0x100000>; @@ -41,7 +41,7 @@ index da9128ae836d..f017baa4f5db 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ mixer1_out: port@1 { ++ mixer1_out: port at 1 { + reg = <1>; + + mixer1_out_tcon1: endpoint { @@ -52,14 +52,14 @@ index da9128ae836d..f017baa4f5db 100644 + }; + + - syscon: syscon@1c00000 { + syscon: syscon at 1c00000 { compatible = "allwinner,sun50i-a64-system-controller", "syscon"; @@ -200,6 +231,41 @@ #dma-cells = <1>; }; -+ tcon1: lcd-controller@1c0d000 { ++ tcon1: lcd-controller at 1c0d000 { + compatible = "allwinner,sun50i-a64-tcon-tv", + "allwinner,sun8i-a83t-tcon-tv"; + reg = <0x01c0d000 0x1000>; @@ -73,7 +73,7 @@ index da9128ae836d..f017baa4f5db 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ tcon1_in: port@0 { ++ tcon1_in: port at 0 { + reg = <0>; + + tcon1_in_mixer1: endpoint { @@ -81,12 +81,12 @@ index da9128ae836d..f017baa4f5db 100644 + }; + }; + -+ tcon1_out: port@1 { ++ tcon1_out: port at 1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + -+ tcon1_out_hdmi: endpoint@1 { ++ tcon1_out_hdmi: endpoint at 1 { + reg = <1>; + remote-endpoint = <&hdmi_in_tcon1>; + }; @@ -94,7 +94,7 @@ index da9128ae836d..f017baa4f5db 100644 + }; + }; + - mmc0: mmc@1c0f000 { + mmc0: mmc at 1c0f000 { compatible = "allwinner,sun50i-a64-mmc"; reg = <0x01c0f000 0x1000>; @@ -658,6 +724,23 @@ @@ -106,7 +106,7 @@ index da9128ae836d..f017baa4f5db 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ hdmi_in: port@0 { ++ hdmi_in: port at 0 { + reg = <0>; + + hdmi_in_tcon1: endpoint { @@ -114,12 +114,12 @@ index da9128ae836d..f017baa4f5db 100644 + }; + }; + -+ hdmi_out: port@1 { ++ hdmi_out: port at 1 { + reg = <1>; + }; + }; }; - hdmi_phy: hdmi-phy@1ef0000 { + hdmi_phy: hdmi-phy at 1ef0000 { -- 2.14.3 diff --git a/a/content_digest b/N1/content_digest index 2dc9b4e..d7506fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,8 @@ "ref\020180430114058.5061-1-jagan@amarulasolutions.com\0" - "From\0Jagan Teki <jagan@amarulasolutions.com>\0" + "From\0jagan@amarulasolutions.com (Jagan Teki)\0" "Subject\0[PATCH 14/21] arm64: dts: allwinner: a64: Add HDMI pipeline\0" "Date\0Mon, 30 Apr 2018 17:10:51 +0530\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" - "Cc\0Chen-Yu Tsai <wens@csie.org>" - Icenowy Zheng <icenowy@aosc.io> - Jernej Skrabec <jernej.skrabec@siol.net> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - David Airlie <airlied@linux.ie> - dri-devel@lists.freedesktop.org - Michael Turquette <mturquette@baylibre.com> - Stephen Boyd <sboyd@kernel.org> - linux-clk@vger.kernel.org - Michael Trimarchi <michael@amarulasolutions.com> - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-sunxi@googlegroups.com - " Jagan Teki <jagan@amarulasolutions.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "HDMI pipeline on A64 has similar behavior like A83T where\n" @@ -52,7 +34,7 @@ " \t\t\t#reset-cells = <1>;\n" " \t\t};\n" " \n" - "+\t\tmixer1: mixer@1200000 {\n" + "+\t\tmixer1: mixer at 1200000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-de2-mixer-1\",\n" "+\t\t\t\t \"allwinner,sun8i-a83t-de2-mixer-1\";\n" "+\t\t\treg = <0x01200000 0x100000>;\n" @@ -66,7 +48,7 @@ "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\t\tmixer1_out: port@1 {\n" + "+\t\t\t\tmixer1_out: port at 1 {\n" "+\t\t\t\t\treg = <1>;\n" "+\n" "+\t\t\t\t\tmixer1_out_tcon1: endpoint {\n" @@ -77,14 +59,14 @@ "+\t\t};\n" "+\n" "+\n" - " \t\tsyscon: syscon@1c00000 {\n" + " \t\tsyscon: syscon at 1c00000 {\n" " \t\t\tcompatible = \"allwinner,sun50i-a64-system-controller\",\n" " \t\t\t\t\"syscon\";\n" "@@ -200,6 +231,41 @@\n" " \t\t\t#dma-cells = <1>;\n" " \t\t};\n" " \n" - "+\t\ttcon1: lcd-controller@1c0d000 {\n" + "+\t\ttcon1: lcd-controller at 1c0d000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-tcon-tv\",\n" "+\t\t\t\t \"allwinner,sun8i-a83t-tcon-tv\";\n" "+\t\t\treg = <0x01c0d000 0x1000>;\n" @@ -98,7 +80,7 @@ "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\t\ttcon1_in: port@0 {\n" + "+\t\t\t\ttcon1_in: port at 0 {\n" "+\t\t\t\t\treg = <0>;\n" "+\n" "+\t\t\t\t\ttcon1_in_mixer1: endpoint {\n" @@ -106,12 +88,12 @@ "+\t\t\t\t\t};\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\ttcon1_out: port@1 {\n" + "+\t\t\t\ttcon1_out: port at 1 {\n" "+\t\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t\t#size-cells = <0>;\n" "+\t\t\t\t\treg = <1>;\n" "+\n" - "+\t\t\t\t\ttcon1_out_hdmi: endpoint@1 {\n" + "+\t\t\t\t\ttcon1_out_hdmi: endpoint at 1 {\n" "+\t\t\t\t\t\treg = <1>;\n" "+\t\t\t\t\t\tremote-endpoint = <&hdmi_in_tcon1>;\n" "+\t\t\t\t\t};\n" @@ -119,7 +101,7 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\tmmc0: mmc@1c0f000 {\n" + " \t\tmmc0: mmc at 1c0f000 {\n" " \t\t\tcompatible = \"allwinner,sun50i-a64-mmc\";\n" " \t\t\treg = <0x01c0f000 0x1000>;\n" "@@ -658,6 +724,23 @@\n" @@ -131,7 +113,7 @@ "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\t\thdmi_in: port@0 {\n" + "+\t\t\t\thdmi_in: port at 0 {\n" "+\t\t\t\t\treg = <0>;\n" "+\n" "+\t\t\t\t\thdmi_in_tcon1: endpoint {\n" @@ -139,14 +121,14 @@ "+\t\t\t\t\t};\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\thdmi_out: port@1 {\n" + "+\t\t\t\thdmi_out: port at 1 {\n" "+\t\t\t\t\treg = <1>;\n" "+\t\t\t\t};\n" "+\t\t\t};\n" " \t\t};\n" " \n" - " \t\thdmi_phy: hdmi-phy@1ef0000 {\n" + " \t\thdmi_phy: hdmi-phy at 1ef0000 {\n" "-- \n" 2.14.3 -30ec39b79edd2e7e637eb061b573167754ac542621ca7973ba07b9ee0f840f22 +c392699cb07817203e8baa8f0e0b0ea6ccd984e823754efadd789a49499df43b
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.