diff for duplicates of <20150825120804.GA30996@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 46879eb..c84062b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,11 +65,11 @@ index 0000000..e3855d7 + + chosen { + bootargs = "root=/dev/ram rw init=/init initrd=0x82000000,0x000E2246"; -+ stdout-path = "/serial at 78b0000:115200"; ++ stdout-path = "/serial@78b0000:115200"; + }; + + soc { -+ serial at 78b0000 { ++ serial@78b0000 { + status = "ok"; + }; + }; @@ -105,25 +105,25 @@ index 0000000..1be0322 + cpus { + #address-cells = <1>; + #size-cells = <0>; -+ cpu at 0 { ++ cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x0>; + }; + -+ cpu at 1 { ++ cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x1>; + }; + -+ cpu at 2 { ++ cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x2>; + }; + -+ cpu at 3 { ++ cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x3>; @@ -136,7 +136,7 @@ index 0000000..1be0322 + ranges; + compatible = "simple-bus"; + -+ intc: interrupt-controller at b000000 { ++ intc: interrupt-controller@b000000 { + compatible = "qcom,msm-qgic2"; + interrupt-controller; + #interrupt-cells = <3>; @@ -144,7 +144,7 @@ index 0000000..1be0322 + <0x0b002000 0x1000>; + }; + -+ serial at 78b0000 { ++ serial@78b0000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0x78b0000 0x200>; + interrupts = <0 108 0>; diff --git a/a/content_digest b/N1/content_digest index a459106..38cb308 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ - "From\0varada@codeaurora.org (Varadarajan Narayanan)\0" + "From\0Varadarajan Narayanan <varada@codeaurora.org>\0" "Subject\0[PATCH v4] qcom: ipq4019: Add basic board/dts support for IPQ4019 SoC\0" "Date\0Tue, 25 Aug 2015 17:38:04 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh+dt@kernel.org>" + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add initial dts files and SoC support for IPQ4019\n" @@ -71,11 +79,11 @@ "+\n" "+\tchosen {\n" "+\t\tbootargs = \"root=/dev/ram rw init=/init initrd=0x82000000,0x000E2246\";\n" - "+\t\tstdout-path = \"/serial at 78b0000:115200\";\n" + "+\t\tstdout-path = \"/serial@78b0000:115200\";\n" "+\t};\n" "+\n" "+\tsoc {\n" - "+\t\tserial at 78b0000 {\n" + "+\t\tserial@78b0000 {\n" "+\t\t\tstatus = \"ok\";\n" "+\t\t};\n" "+\t};\n" @@ -111,25 +119,25 @@ "+\tcpus {\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" - "+\t\tcpu at 0 {\n" + "+\t\tcpu@0 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x0>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu at 1 {\n" + "+\t\tcpu@1 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x1>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu at 2 {\n" + "+\t\tcpu@2 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x2>;\n" "+\t\t};\n" "+\n" - "+\t\tcpu at 3 {\n" + "+\t\tcpu@3 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x3>;\n" @@ -142,7 +150,7 @@ "+\t\tranges;\n" "+\t\tcompatible = \"simple-bus\";\n" "+\n" - "+\t\tintc: interrupt-controller at b000000 {\n" + "+\t\tintc: interrupt-controller@b000000 {\n" "+\t\t\tcompatible = \"qcom,msm-qgic2\";\n" "+\t\t\tinterrupt-controller;\n" "+\t\t\t#interrupt-cells = <3>;\n" @@ -150,7 +158,7 @@ "+\t\t\t<0x0b002000 0x1000>;\n" "+\t\t};\n" "+\n" - "+\t\tserial at 78b0000 {\n" + "+\t\tserial@78b0000 {\n" "+\t\t\tcompatible = \"qcom,msm-uartdm-v1.4\", \"qcom,msm-uartdm\";\n" "+\t\t\treg = <0x78b0000 0x200>;\n" "+\t\t\tinterrupts = <0 108 0>;\n" @@ -170,4 +178,4 @@ "-- \n" 1.8.2.1 -ef1fb7e269e138947c7189f6d5756c59ffa059f2bd712dba89910189cc6348ea +f5137e3da733f12e01a0f9dcd5ba35625894ce70abd3af6e473b583f71ffd3c4
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.