diff for duplicates of <1424823716-7504-1-git-send-email-mathieu@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index aadb766..01eb60c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,8 +15,8 @@ index d01f618..ffa5b5e 100644 ranges; status = "disabled"; -- serial at 12490000 { -+ uart2: serial at 12490000 { +- serial@12490000 { ++ uart2: serial@12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, <0x12480000 0x1000>; @@ -24,8 +24,8 @@ index d01f618..ffa5b5e 100644 status = "disabled"; }; -- i2c at 124a0000 { -+ i2c2: i2c at 124a0000 { +- i2c@124a0000 { ++ i2c2: i2c@124a0000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x124a0000 0x1000>; interrupts = <0 196 0>; @@ -33,8 +33,8 @@ index d01f618..ffa5b5e 100644 ranges; status = "disabled"; -- serial at 16340000 { -+ uart4: serial at 16340000 { +- serial@16340000 { ++ uart4: serial@16340000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16340000 0x1000>, <0x16300000 0x1000>; @@ -42,8 +42,8 @@ index d01f618..ffa5b5e 100644 status = "disabled"; }; -- i2c at 16380000 { -+ i2c4: i2c at 16380000 { +- i2c@16380000 { ++ i2c4: i2c@16380000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x16380000 0x1000>; interrupts = <0 153 0>; @@ -51,8 +51,8 @@ index d01f618..ffa5b5e 100644 ranges; status = "disabled"; -- serial at 1a240000 { -+ uart5: serial at 1a240000 { +- serial@1a240000 { ++ uart5: serial@1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, <0x1a200000 0x1000>; @@ -60,8 +60,8 @@ index d01f618..ffa5b5e 100644 status = "disabled"; }; -- i2c at 1a280000 { -+ i2c5: i2c at 1a280000 { +- i2c@1a280000 { ++ i2c5: i2c@1a280000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x1a280000 0x1000>; interrupts = <0 155 0>; @@ -69,8 +69,8 @@ index d01f618..ffa5b5e 100644 #size-cells = <0>; }; -- spi at 1a280000 { -+ spi5: spi at 1a280000 { +- spi@1a280000 { ++ spi5: spi@1a280000 { compatible = "qcom,spi-qup-v1.1.1"; reg = <0x1a280000 0x1000>; interrupts = <0 155 0>; diff --git a/a/content_digest b/N1/content_digest index a41662d..170efb4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,17 @@ - "From\0mathieu@codeaurora.org (Mathieu Olivari)\0" + "From\0Mathieu Olivari <mathieu@codeaurora.org>\0" "Subject\0[PATCH 1/2] ARM: dts: qcom: label all gsbi devices\0" "Date\0Tue, 24 Feb 2015 16:21:55 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + linux@arm.linux.org.uk + " mathieu@codeaurora.org\0" + "Cc\0devicetree@vger.kernel.org" + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " mmcclint@codeaurora.org\0" "\00:1\0" "b\0" "All IPQ806x based boards will include this file and will need a way to\n" @@ -21,8 +31,8 @@ " \t\t\tranges;\n" " \t\t\tstatus = \"disabled\";\n" " \n" - "-\t\t\tserial at 12490000 {\n" - "+\t\t\tuart2: serial at 12490000 {\n" + "-\t\t\tserial@12490000 {\n" + "+\t\t\tuart2: serial@12490000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x12490000 0x1000>,\n" " \t\t\t\t <0x12480000 0x1000>;\n" @@ -30,8 +40,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\ti2c at 124a0000 {\n" - "+\t\t\ti2c2: i2c at 124a0000 {\n" + "-\t\t\ti2c@124a0000 {\n" + "+\t\t\ti2c2: i2c@124a0000 {\n" " \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" " \t\t\t\treg = <0x124a0000 0x1000>;\n" " \t\t\t\tinterrupts = <0 196 0>;\n" @@ -39,8 +49,8 @@ " \t\t\tranges;\n" " \t\t\tstatus = \"disabled\";\n" " \n" - "-\t\t\tserial at 16340000 {\n" - "+\t\t\tuart4: serial at 16340000 {\n" + "-\t\t\tserial@16340000 {\n" + "+\t\t\tuart4: serial@16340000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x16340000 0x1000>,\n" " \t\t\t\t <0x16300000 0x1000>;\n" @@ -48,8 +58,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\ti2c at 16380000 {\n" - "+\t\t\ti2c4: i2c at 16380000 {\n" + "-\t\t\ti2c@16380000 {\n" + "+\t\t\ti2c4: i2c@16380000 {\n" " \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" " \t\t\t\treg = <0x16380000 0x1000>;\n" " \t\t\t\tinterrupts = <0 153 0>;\n" @@ -57,8 +67,8 @@ " \t\t\tranges;\n" " \t\t\tstatus = \"disabled\";\n" " \n" - "-\t\t\tserial at 1a240000 {\n" - "+\t\t\tuart5: serial at 1a240000 {\n" + "-\t\t\tserial@1a240000 {\n" + "+\t\t\tuart5: serial@1a240000 {\n" " \t\t\t\tcompatible = \"qcom,msm-uartdm-v1.3\", \"qcom,msm-uartdm\";\n" " \t\t\t\treg = <0x1a240000 0x1000>,\n" " \t\t\t\t <0x1a200000 0x1000>;\n" @@ -66,8 +76,8 @@ " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - "-\t\t\ti2c at 1a280000 {\n" - "+\t\t\ti2c5: i2c at 1a280000 {\n" + "-\t\t\ti2c@1a280000 {\n" + "+\t\t\ti2c5: i2c@1a280000 {\n" " \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" " \t\t\t\treg = <0x1a280000 0x1000>;\n" " \t\t\t\tinterrupts = <0 155 0>;\n" @@ -75,12 +85,12 @@ " \t\t\t\t#size-cells = <0>;\n" " \t\t\t};\n" " \n" - "-\t\t\tspi at 1a280000 {\n" - "+\t\t\tspi5: spi at 1a280000 {\n" + "-\t\t\tspi@1a280000 {\n" + "+\t\t\tspi5: spi@1a280000 {\n" " \t\t\t\tcompatible = \"qcom,spi-qup-v1.1.1\";\n" " \t\t\t\treg = <0x1a280000 0x1000>;\n" " \t\t\t\tinterrupts = <0 155 0>;\n" "-- \n" 1.9.1 -da71fb1b1742524ba654c0176f4c8d1aacb8465407144f30657244463f33f09f +504f140d8d76ac3f0ec56970f147fd1741cc715ce6844bb5b2d0ce650ab93f00
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.