diff for duplicates of <20171130010723.GA133459@google.com> diff --git a/a/1.txt b/N1/1.txt index 81ca7bf..6d1bd2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,11 @@ -From: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> +From: Nickey Yang <nickey.yang@rock-chips.com> This patch adds the information for the secondary MIPI DSI controller, e.g., interrupts, grf, clocks, ports and so on. Mirrors the existing definition for dsi0. -Signed-off-by: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> -Signed-off-by: Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> +Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com> +Signed-off-by: Brian Norris <briannorris@chromium.org> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) @@ -19,7 +19,7 @@ index 8940a3dc3670..e7e882d06c68 100644 remote-endpoint = <&hdmi_in_vopl>; }; + -+ vopl_out_mipi1: endpoint@3 { ++ vopl_out_mipi1: endpoint at 3 { + reg = <3>; + remote-endpoint = <&mipi1_in_vopl>; + }; @@ -31,7 +31,7 @@ index 8940a3dc3670..e7e882d06c68 100644 remote-endpoint = <&hdmi_in_vopb>; }; + -+ vopb_out_mipi1: endpoint@3 { ++ vopb_out_mipi1: endpoint at 3 { + reg = <3>; + remote-endpoint = <&mipi1_in_vopb>; + }; @@ -42,7 +42,7 @@ index 8940a3dc3670..e7e882d06c68 100644 }; }; -+ mipi_dsi1: mipi@ff968000 { ++ mipi_dsi1: mipi at ff968000 { + compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; + reg = <0x0 0xff968000 0x0 0x8000>; + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>; @@ -59,17 +59,17 @@ index 8940a3dc3670..e7e882d06c68 100644 + #address-cells = <1>; + #size-cells = <0>; + -+ mipi1_in: port@0 { ++ mipi1_in: port at 0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + -+ mipi1_in_vopb: endpoint@0 { ++ mipi1_in_vopb: endpoint at 0 { + reg = <0>; + remote-endpoint = <&vopb_out_mipi1>; + }; + -+ mipi1_in_vopl: endpoint@1 { ++ mipi1_in_vopl: endpoint at 1 { + reg = <1>; + remote-endpoint = <&vopl_out_mipi1>; + }; @@ -77,7 +77,7 @@ index 8940a3dc3670..e7e882d06c68 100644 + }; + }; + - edp: edp@ff970000 { + edp: edp at ff970000 { compatible = "rockchip,rk3399-edp"; reg = <0x0 0xff970000 0x0 0x8000>; -- diff --git a/a/content_digest b/N1/content_digest index b0f05ab..a025002 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,18 @@ "ref\020171129233541.51337-1-briannorris@chromium.org\0" - "ref\020171129233541.51337-1-briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org\0" - "From\0Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\0" + "From\0briannorris@chromium.org (Brian Norris)\0" "Subject\0[PATCH] arm64: dts: rockchip: add rk3399 DSI0 reset\0" "Date\0Wed, 29 Nov 2017 17:07:27 -0800\0" - "To\0Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" - "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> - mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org - Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "From: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\n" + "From: Nickey Yang <nickey.yang@rock-chips.com>\n" "\n" "This patch adds the information for the secondary MIPI DSI controller,\n" "e.g., interrupts, grf, clocks, ports and so on. Mirrors the existing\n" "definition for dsi0.\n" "\n" - "Signed-off-by: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\n" - "Signed-off-by: Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\n" + "Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>\n" + "Signed-off-by: Brian Norris <briannorris@chromium.org>\n" "---\n" " arch/arm64/boot/dts/rockchip/rk3399.dtsi | 45 ++++++++++++++++++++++++++++++++\n" " 1 file changed, 45 insertions(+)\n" @@ -34,7 +26,7 @@ " \t\t\t\tremote-endpoint = <&hdmi_in_vopl>;\n" " \t\t\t};\n" "+\n" - "+\t\t\tvopl_out_mipi1: endpoint@3 {\n" + "+\t\t\tvopl_out_mipi1: endpoint at 3 {\n" "+\t\t\t\treg = <3>;\n" "+\t\t\t\tremote-endpoint = <&mipi1_in_vopl>;\n" "+\t\t\t};\n" @@ -46,7 +38,7 @@ " \t\t\t\tremote-endpoint = <&hdmi_in_vopb>;\n" " \t\t\t};\n" "+\n" - "+\t\t\tvopb_out_mipi1: endpoint@3 {\n" + "+\t\t\tvopb_out_mipi1: endpoint at 3 {\n" "+\t\t\t\treg = <3>;\n" "+\t\t\t\tremote-endpoint = <&mipi1_in_vopb>;\n" "+\t\t\t};\n" @@ -57,7 +49,7 @@ " \t\t};\n" " \t};\n" " \n" - "+\tmipi_dsi1: mipi@ff968000 {\n" + "+\tmipi_dsi1: mipi at ff968000 {\n" "+\t\tcompatible = \"rockchip,rk3399-mipi-dsi\", \"snps,dw-mipi-dsi\";\n" "+\t\treg = <0x0 0xff968000 0x0 0x8000>;\n" "+\t\tinterrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH 0>;\n" @@ -74,17 +66,17 @@ "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\tmipi1_in: port@0 {\n" + "+\t\t\tmipi1_in: port at 0 {\n" "+\t\t\t\treg = <0>;\n" "+\t\t\t\t#address-cells = <1>;\n" "+\t\t\t\t#size-cells = <0>;\n" "+\n" - "+\t\t\t\tmipi1_in_vopb: endpoint@0 {\n" + "+\t\t\t\tmipi1_in_vopb: endpoint at 0 {\n" "+\t\t\t\t\treg = <0>;\n" "+\t\t\t\t\tremote-endpoint = <&vopb_out_mipi1>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tmipi1_in_vopl: endpoint@1 {\n" + "+\t\t\t\tmipi1_in_vopl: endpoint at 1 {\n" "+\t\t\t\t\treg = <1>;\n" "+\t\t\t\t\tremote-endpoint = <&vopl_out_mipi1>;\n" "+\t\t\t\t};\n" @@ -92,10 +84,10 @@ "+\t\t};\n" "+\t};\n" "+\n" - " \tedp: edp@ff970000 {\n" + " \tedp: edp at ff970000 {\n" " \t\tcompatible = \"rockchip,rk3399-edp\";\n" " \t\treg = <0x0 0xff970000 0x0 0x8000>;\n" "-- \n" 2.15.0.531.g2ccb3012c9-goog -fd29d1bb4eba74dc006dc7a6dfc4ca899af159560e8d7852b57719f0aad0b162 +ffbd2aa5d8013b3ad5d9e9e2d502ca4f6437bd876f7104825804f281a01a4274
diff --git a/a/1.txt b/N2/1.txt index 81ca7bf..3113dab 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,11 +1,11 @@ -From: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> +From: Nickey Yang <nickey.yang@rock-chips.com> This patch adds the information for the secondary MIPI DSI controller, e.g., interrupts, grf, clocks, ports and so on. Mirrors the existing definition for dsi0. -Signed-off-by: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> -Signed-off-by: Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> +Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com> +Signed-off-by: Brian Norris <briannorris@chromium.org> --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/a/content_digest b/N2/content_digest index b0f05ab..3b22613 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,26 +1,25 @@ "ref\020171129233541.51337-1-briannorris@chromium.org\0" - "ref\020171129233541.51337-1-briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org\0" - "From\0Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\0" + "From\0Brian Norris <briannorris@chromium.org>\0" "Subject\0[PATCH] arm64: dts: rockchip: add rk3399 DSI0 reset\0" "Date\0Wed, 29 Nov 2017 17:07:27 -0800\0" - "To\0Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>\0" - "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org> - mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org - Chris Zhong <zyw-TNX95d0MmH7DzftRWevZcw@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0Heiko Stuebner <heiko@sntech.de>\0" + "Cc\0linux-kernel@vger.kernel.org" + Doug Anderson <dianders@chromium.org> + linux-rockchip@lists.infradead.org + Nickey Yang <nickey.yang@rock-chips.com> + mka@chromium.org + linux-arm-kernel@lists.infradead.org + " Chris Zhong <zyw@rock-chips.com>\0" "\00:1\0" "b\0" - "From: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\n" + "From: Nickey Yang <nickey.yang@rock-chips.com>\n" "\n" "This patch adds the information for the secondary MIPI DSI controller,\n" "e.g., interrupts, grf, clocks, ports and so on. Mirrors the existing\n" "definition for dsi0.\n" "\n" - "Signed-off-by: Nickey Yang <nickey.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>\n" - "Signed-off-by: Brian Norris <briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>\n" + "Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>\n" + "Signed-off-by: Brian Norris <briannorris@chromium.org>\n" "---\n" " arch/arm64/boot/dts/rockchip/rk3399.dtsi | 45 ++++++++++++++++++++++++++++++++\n" " 1 file changed, 45 insertions(+)\n" @@ -98,4 +97,4 @@ "-- \n" 2.15.0.531.g2ccb3012c9-goog -fd29d1bb4eba74dc006dc7a6dfc4ca899af159560e8d7852b57719f0aad0b162 +d36132701760ba1bea72b8e1425609c65ff2a631e15acf98114d939e5ae54867
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.