diff for duplicates of <20171130011127.GB124672@google.com> diff --git a/a/1.txt b/N1/1.txt index 3113dab..6d1bd2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -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 5de4e9c..e125aea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\020171129233541.51337-1-briannorris@chromium.org\0" "ref\020171130010723.GA133459@google.com\0" - "From\0Brian Norris <computersforpeace@gmail.com>\0" + "From\0computersforpeace@gmail.com (Brian Norris)\0" "Subject\0[PATCH] arm64: dts: rockchip: add mipi_dsi1 support for rk3399\0" "Date\0Wed, 29 Nov 2017 17:11:27 -0800\0" - "To\0Brian Norris <briannorris@chromium.org>\0" - "Cc\0Heiko Stuebner <heiko@sntech.de>" - linux-kernel@vger.kernel.org - Doug Anderson <dianders@chromium.org> - linux-rockchip@lists.infradead.org - Nickey Yang <nickey.yang@rock-chips.com> - mka@chromium.org - Chris Zhong <zyw@rock-chips.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Nickey Yang <nickey.yang@rock-chips.com>\n" @@ -35,7 +27,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" @@ -47,7 +39,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" @@ -58,7 +50,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" @@ -75,17 +67,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" @@ -93,10 +85,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 -9c64e0049ea3d17f33212fd4b3e521f3bb44d601805f94b1935280e25f4b2c17 +0b20291e46829ad3d70091e21145617ed8203e0642f6804466983c44527290c0
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.