diff for duplicates of <20180518094536.17201-18-jagan@amarulasolutions.com> diff --git a/a/1.txt b/N1/1.txt index 689e483..4e6d631 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ index 9c1452ee8027..4ffd4787acd2 100644 #interrupt-cells = <3>; }; -+ hdmi: hdmi@1ee0000 { ++ hdmi: hdmi at 1ee0000 { + compatible = "allwinner,sun50i-a64-dw-hdmi", + "allwinner,sun8i-a83t-dw-hdmi"; + reg = <0x01ee0000 0x10000>; @@ -37,7 +37,7 @@ index 9c1452ee8027..4ffd4787acd2 100644 + status = "disabled"; + }; + -+ hdmi_phy: hdmi-phy@1ef0000 { ++ hdmi_phy: hdmi-phy at 1ef0000 { + compatible = "allwinner,sun50i-a64-hdmi-phy"; + reg = <0x01ef0000 0x10000>; + clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>, @@ -48,7 +48,7 @@ index 9c1452ee8027..4ffd4787acd2 100644 + #phy-cells = <0>; + }; + - rtc: rtc@1f00000 { + rtc: rtc at 1f00000 { compatible = "allwinner,sun6i-a31-rtc"; reg = <0x01f00000 0x54>; -- diff --git a/a/content_digest b/N1/content_digest index 687d1b9..7b2f1c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,8 @@ "ref\020180518094536.17201-1-jagan@amarulasolutions.com\0" - "From\0Jagan Teki <jagan@amarulasolutions.com>\0" + "From\0jagan@amarulasolutions.com (Jagan Teki)\0" "Subject\0[PATCH v2 17/26] arm64: dts: allwinner: a64: Add HDMI support\0" "Date\0Fri, 18 May 2018 15:15:27 +0530\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>" - Chen-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\0" - "Cc\0Jagan Teki <jagan@amarulasolutions.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "HDMI on Allwinner A64 has similar behaviour like H3/H5/A83T, so\n" @@ -46,7 +28,7 @@ " \t\t\t#interrupt-cells = <3>;\n" " \t\t};\n" " \n" - "+\t\thdmi: hdmi@1ee0000 {\n" + "+\t\thdmi: hdmi at 1ee0000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-dw-hdmi\",\n" "+\t\t\t\t \"allwinner,sun8i-a83t-dw-hdmi\";\n" "+\t\t\treg = <0x01ee0000 0x10000>;\n" @@ -62,7 +44,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\thdmi_phy: hdmi-phy@1ef0000 {\n" + "+\t\thdmi_phy: hdmi-phy at 1ef0000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-hdmi-phy\";\n" "+\t\t\treg = <0x01ef0000 0x10000>;\n" "+\t\t\tclocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,\n" @@ -73,10 +55,10 @@ "+\t\t\t#phy-cells = <0>;\n" "+\t\t};\n" "+\n" - " \t\trtc: rtc@1f00000 {\n" + " \t\trtc: rtc at 1f00000 {\n" " \t\t\tcompatible = \"allwinner,sun6i-a31-rtc\";\n" " \t\t\treg = <0x01f00000 0x54>;\n" "-- \n" 2.14.3 -b8fa4c02ce50383df617fefcdc38d1685efbe2b4eda4c40258eaa453925bf03d +480f2b53d8a087966bd77a84d6be1f913ebc9e5929a593359005e9fef1c6ca4c
diff --git a/a/1.txt b/N2/1.txt index 689e483..dde3da4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -5,7 +5,7 @@ as fallback. HDMI PHY on Allwinner A64 has two clock parents so add them as pll-0 and pll-1 in CCU clock phadles. -Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> +Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> --- Changes for v2: - Change compatibles and other based on previous patch changes diff --git a/a/content_digest b/N2/content_digest index 687d1b9..39e1b85 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,27 @@ "ref\020180518094536.17201-1-jagan@amarulasolutions.com\0" - "From\0Jagan Teki <jagan@amarulasolutions.com>\0" + "ref\020180518094536.17201-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org\0" + "From\0Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\0" "Subject\0[PATCH v2 17/26] arm64: dts: allwinner: a64: Add HDMI support\0" "Date\0Fri, 18 May 2018 15:15:27 +0530\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>" - Chen-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\0" - "Cc\0Jagan Teki <jagan@amarulasolutions.com>\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> + Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org> + Jernej Skrabec <jernej.skrabec-gGgVlfcn5nU@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + David Airlie <airlied-cv59FeDIM0c@public.gmane.org> + dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org + Michael Turquette <mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> + Stephen Boyd <sboyd-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Michael Trimarchi <michael-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" + "Cc\0Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\0" "\00:1\0" "b\0" "HDMI on Allwinner A64 has similar behaviour like H3/H5/A83T, so\n" @@ -30,7 +31,7 @@ "HDMI PHY on Allwinner A64 has two clock parents so add them\n" "as pll-0 and pll-1 in CCU clock phadles.\n" "\n" - "Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>\n" + "Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>\n" "---\n" "Changes for v2:\n" "- Change compatibles and other based on previous patch changes\n" @@ -79,4 +80,4 @@ "-- \n" 2.14.3 -b8fa4c02ce50383df617fefcdc38d1685efbe2b4eda4c40258eaa453925bf03d +5210a3ddce8946d16d4e67cf28e4af4e3ee8d007d8a7ef1c9ec6bc0acdf20a97
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.