diff for duplicates of <56FA98F0.2000300@linaro.org> diff --git a/a/1.txt b/N1/1.txt index 41b630c..d2946f2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,7 @@ ok to do it either way. >> +++ 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>; @@ -52,7 +52,7 @@ ok to do it either way. >> 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>; @@ -63,7 +63,7 @@ ok to do it either way. >> 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>; @@ -73,7 +73,7 @@ ok to do it either way. >> 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>; @@ -93,7 +93,7 @@ ok to do it either way. >> 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 6b4f258..f8eaeac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\01458762366-9233-1-git-send-email-srinivas.kandagatla@linaro.org\0" "ref\01458762421-9339-1-git-send-email-srinivas.kandagatla@linaro.org\0" "ref\020160329142807.GF8929@tuxbot\0" - "From\0Srinivas Kandagatla <srinivas.kandagatla@linaro.org>\0" - "Subject\0Re: [PATCH 01/12] ARM: dts: apq8064: fix the pinctrls for i2c and spi\0" + "From\0srinivas.kandagatla@linaro.org (Srinivas Kandagatla)\0" + "Subject\0[PATCH 01/12] ARM: dts: apq8064: fix the pinctrls for i2c and spi\0" "Date\0Tue, 29 Mar 2016 16:02:08 +0100\0" - "To\0Bjorn Andersson <bjorn.andersson@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" "\n" @@ -58,7 +52,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" @@ -67,7 +61,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" @@ -78,7 +72,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" @@ -88,7 +82,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" @@ -108,7 +102,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" @@ -120,4 +114,4 @@ ">> 2.5.0\n" >> -3d9159f9dfaeb4cb3ae7ed320384a41a371dbb98e2f9661052eb725ecb9650d5 +a664f670d6425663b97067ce7c34181ba8cc6877976c8ccb36da81f9d131ee3a
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.