diff for duplicates of <20160329161045.GR8929@tuxbot> diff --git a/a/1.txt b/N1/1.txt index 6497c58..1e23c2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,7 @@ Bjorn > >>+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi > >>@@ -227,7 +227,8 @@ > >> -> >> gsbi1_i2c: i2c@12460000 { +> >> gsbi1_i2c: i2c at 12460000 { > >> compatible = "qcom,i2c-qup-v1.1.1"; > >>- pinctrl-0 = <&i2c1_pins &i2c1_pins_sleep>; > >>+ pinctrl-0 = <&i2c1_pins>; @@ -63,7 +63,7 @@ Bjorn > >> reg = <0x12460000 0x1000>; > >> interrupts = <0 194 IRQ_TYPE_NONE>; > >>@@ -255,7 +256,8 @@ -> >> gsbi2_i2c: i2c@124a0000 { +> >> gsbi2_i2c: i2c at 124a0000 { > >> compatible = "qcom,i2c-qup-v1.1.1"; > >> reg = <0x124a0000 0x1000>; > >>- pinctrl-0 = <&i2c2_pins &i2c2_pins_sleep>; @@ -74,7 +74,7 @@ Bjorn > >> clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>; > >>@@ -277,7 +279,8 @@ > >> ranges; -> >> gsbi3_i2c: i2c@16280000 { +> >> gsbi3_i2c: i2c at 16280000 { > >> compatible = "qcom,i2c-qup-v1.1.1"; > >>- pinctrl-0 = <&i2c3_pins &i2c3_pins_sleep>; > >>+ pinctrl-0 = <&i2c3_pins>; @@ -84,7 +84,7 @@ Bjorn > >> interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; > >>@@ -302,7 +305,8 @@ > >> -> >> gsbi4_i2c: i2c@16380000 { +> >> gsbi4_i2c: i2c at 16380000 { > >> compatible = "qcom,i2c-qup-v1.1.1"; > >>- pinctrl-0 = <&i2c4_pins &i2c4_pins_sleep>; > >>+ pinctrl-0 = <&i2c4_pins>; @@ -104,7 +104,7 @@ Bjorn > >> clock-names = "core", "iface"; > >>@@ -370,7 +375,8 @@ > >> -> >> gsbi6_i2c: i2c@16580000 { +> >> gsbi6_i2c: i2c at 16580000 { > >> compatible = "qcom,i2c-qup-v1.1.1"; > >>- pinctrl-0 = <&i2c6_pins &i2c6_pins_sleep>; > >>+ pinctrl-0 = <&i2c6_pins>; diff --git a/a/content_digest b/N1/content_digest index e26f5c7..f7652e1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,10 @@ "ref\01458762421-9339-1-git-send-email-srinivas.kandagatla@linaro.org\0" "ref\020160329142807.GF8929@tuxbot\0" "ref\056FA98F0.2000300@linaro.org\0" - "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0" - "Subject\0Re: [PATCH 01/12] ARM: dts: apq8064: fix the pinctrls for i2c and spi\0" + "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0" + "Subject\0[PATCH 01/12] ARM: dts: apq8064: fix the pinctrls for i2c and spi\0" "Date\0Tue, 29 Mar 2016 09:10:45 -0700\0" - "To\0Srinivas Kandagatla <srinivas.kandagatla@linaro.org>\0" - "Cc\0Andy Gross <andy.gross@linaro.org>" - linux-arm-msm@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " linux-soc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue 29 Mar 08:02 PDT 2016, Srinivas Kandagatla wrote:\n" @@ -70,7 +64,7 @@ "> >>+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi\n" "> >>@@ -227,7 +227,8 @@\n" "> >>\n" - "> >> \t\t\tgsbi1_i2c: i2c@12460000 {\n" + "> >> \t\t\tgsbi1_i2c: i2c at 12460000 {\n" "> >> \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> >>-\t\t\t\tpinctrl-0 = <&i2c1_pins &i2c1_pins_sleep>;\n" "> >>+\t\t\t\tpinctrl-0 = <&i2c1_pins>;\n" @@ -79,7 +73,7 @@ "> >> \t\t\t\treg = <0x12460000 0x1000>;\n" "> >> \t\t\t\tinterrupts = <0 194 IRQ_TYPE_NONE>;\n" "> >>@@ -255,7 +256,8 @@\n" - "> >> \t\t\tgsbi2_i2c: i2c@124a0000 {\n" + "> >> \t\t\tgsbi2_i2c: i2c at 124a0000 {\n" "> >> \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> >> \t\t\t\treg = <0x124a0000 0x1000>;\n" "> >>-\t\t\t\tpinctrl-0 = <&i2c2_pins &i2c2_pins_sleep>;\n" @@ -90,7 +84,7 @@ "> >> \t\t\t\tclocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;\n" "> >>@@ -277,7 +279,8 @@\n" "> >> \t\t\tranges;\n" - "> >> \t\t\tgsbi3_i2c: i2c@16280000 {\n" + "> >> \t\t\tgsbi3_i2c: i2c at 16280000 {\n" "> >> \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> >>-\t\t\t\tpinctrl-0 = <&i2c3_pins &i2c3_pins_sleep>;\n" "> >>+\t\t\t\tpinctrl-0 = <&i2c3_pins>;\n" @@ -100,7 +94,7 @@ "> >> \t\t\t\tinterrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;\n" "> >>@@ -302,7 +305,8 @@\n" "> >>\n" - "> >> \t\t\tgsbi4_i2c: i2c@16380000 {\n" + "> >> \t\t\tgsbi4_i2c: i2c at 16380000 {\n" "> >> \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> >>-\t\t\t\tpinctrl-0 = <&i2c4_pins &i2c4_pins_sleep>;\n" "> >>+\t\t\t\tpinctrl-0 = <&i2c4_pins>;\n" @@ -120,7 +114,7 @@ "> >> \t\t\t\tclock-names = \"core\", \"iface\";\n" "> >>@@ -370,7 +375,8 @@\n" "> >>\n" - "> >> \t\t\tgsbi6_i2c: i2c@16580000 {\n" + "> >> \t\t\tgsbi6_i2c: i2c at 16580000 {\n" "> >> \t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> >>-\t\t\t\tpinctrl-0 = <&i2c6_pins &i2c6_pins_sleep>;\n" "> >>+\t\t\t\tpinctrl-0 = <&i2c6_pins>;\n" @@ -132,4 +126,4 @@ "> >>2.5.0\n" > >> -6fade7cba49d67781935b1285908ef3ed915771b937e9fbe1addf89a5413b9f3 +438c82f73b76992e1dfa27150deda565be69ed7a6e0e2dbb63a2a33ca7ef4f88
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.