diff for duplicates of <1439936488-14870-1-git-send-email-mathieu@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 34a5c07..21438f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,11 +14,11 @@ index b08907a..36e2b04 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -46,15 +46,6 @@ - serial@16340000 { + serial at 16340000 { status = "ok"; }; - -- i2c4: i2c@16380000 { +- i2c4: i2c at 16380000 { - status = "ok"; - - clock-frequency = <200000>; @@ -28,7 +28,7 @@ index b08907a..36e2b04 100644 - }; }; - gsbi5: gsbi@1a200000 { + gsbi5: gsbi at 1a200000 { diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c index 5639699..eb4065e 100644 --- a/drivers/clk/qcom/gcc-ipq806x.c diff --git a/a/content_digest b/N1/content_digest index fcfa5ab..f2ef1d6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,7 @@ - "From\0Mathieu Olivari <mathieu@codeaurora.org>\0" + "From\0mathieu@codeaurora.org (Mathieu Olivari)\0" "Subject\0[PATCH] ARM: qcom: Disable i2c device on gsbi4 for ipq806x\0" "Date\0Tue, 18 Aug 2015 15:21:28 -0700\0" - "To\0sboyd@codeaurora.org" - agross@codeaurora.org - rnayak@codeaurora.org - " architt@codeaurora.org\0" - "Cc\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 - mturquette@baylibre.com - mathieu@codeaurora.org - mturquette@linaro.org - georgi.djakov@linaro.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-clk@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Disable the i2c device on gsbi4 and mark gsbi4_h and gsbi4_qup clks as\n" @@ -37,11 +20,11 @@ "--- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts\n" "+++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts\n" "@@ -46,15 +46,6 @@\n" - " \t\t\tserial@16340000 {\n" + " \t\t\tserial at 16340000 {\n" " \t\t\t\tstatus = \"ok\";\n" " \t\t\t};\n" "-\n" - "-\t\t\ti2c4: i2c@16380000 {\n" + "-\t\t\ti2c4: i2c at 16380000 {\n" "-\t\t\t\tstatus = \"ok\";\n" "-\n" "-\t\t\t\tclock-frequency = <200000>;\n" @@ -51,7 +34,7 @@ "-\t\t\t};\n" " \t\t};\n" " \n" - " \t\tgsbi5: gsbi@1a200000 {\n" + " \t\tgsbi5: gsbi at 1a200000 {\n" "diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c\n" "index 5639699..eb4065e 100644\n" "--- a/drivers/clk/qcom/gcc-ipq806x.c\n" @@ -86,4 +69,4 @@ "-- \n" 2.1.4 -70d0ea71a2f44b329b34d20bf03bc5bda0ccdf4cc3cc03e1c3c7b94646b48ece +c820d2de6ce4aeb27f8e3a2e84b8da980ee1f60a764f3ea8dccfadcfa2465e6c
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.