diff for duplicates of <20140916023922.GB2386@qualcomm.com> diff --git a/a/1.txt b/N1/1.txt index 2bff224..91bf494 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ On Tue, Aug 26, 2014 at 05:00:45PM +0530, Kiran Padwal wrote: Looks fine > -> Signed-off-by: Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org> +> Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com> > --- > Changes since v2: > - Renamed pinmux i2c subnode "i2c1_pinmux" to "i2c1". @@ -32,17 +32,17 @@ Looks fine > compatible = "qcom,apq8064-ifc6410", "qcom,apq8064"; > > soc { -> + gsbi@12440000 { +> + gsbi at 12440000 { > + status = "okay"; > + qcom,mode = <GSBI_PROT_I2C>; > + -> + i2c@12460000 { +> + i2c at 12460000 { > + status = "okay"; > + clock-frequency = <200000>; > + pinctrl-0 = <&i2c1_pins>; > + pinctrl-names = "default"; > + -> + eeprom: eeprom@52 { +> + eeprom: eeprom at 52 { > + compatible = "atmel,24c128"; > + reg = <0x52>; > + pagesize = <32>; @@ -54,7 +54,7 @@ thankfully. > + }; > + }; > + -> gsbi@16600000 { +> gsbi at 16600000 { > status = "ok"; > qcom,mode = <GSBI_PROT_I2C_UART>; > @@ -12,5 +30,14 @@ @@ -62,7 +62,7 @@ thankfully. > }; > }; > + -> + pinmux@800000 { +> + pinmux at 800000 { > + i2c1_pins: i2c1 { > + mux { > + pins = "gpio20", "gpio21"; @@ -80,7 +80,7 @@ thankfully. > cpu-offset = <0x80000>; > }; > -> + tlmm_pinmux: pinmux@800000 { +> + tlmm_pinmux: pinmux at 800000 { > + compatible = "qcom,apq8064-pinctrl"; > + reg = <0x800000 0x4000>; > + @@ -91,14 +91,14 @@ thankfully. > + interrupts = <0 16 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> acc0: clock-controller@2088000 { +> acc0: clock-controller at 2088000 { > compatible = "qcom,kpss-acc-v1"; > reg = <0x02088000 0x1000>, <0x02008000 0x1000>; > @@ -133,6 +144,48 @@ > regulator; > }; > -> + gsbi1: gsbi@12440000 { +> + gsbi1: gsbi at 12440000 { > + status = "disabled"; > + compatible = "qcom,gsbi-v1.0.0"; > + reg = <0x12440000 0x100>; @@ -108,7 +108,7 @@ thankfully. > + #size-cells = <1>; > + ranges; > + -> + i2c1: i2c@12460000 { +> + i2c1: i2c at 12460000 { > + compatible = "qcom,i2c-qup-v1.1.1"; > + reg = <0x12460000 0x1000>; > + interrupts = <0 194 IRQ_TYPE_NONE>; @@ -119,7 +119,7 @@ thankfully. > + }; > + }; > + -> + gsbi2: gsbi@12480000 { +> + gsbi2: gsbi at 12480000 { > + status = "disabled"; > + compatible = "qcom,gsbi-v1.0.0"; > + reg = <0x12480000 0x100>; @@ -129,7 +129,7 @@ thankfully. > + #size-cells = <1>; > + ranges; > + -> + i2c2: i2c@124a0000 { +> + i2c2: i2c at 124a0000 { > + compatible = "qcom,i2c-qup-v1.1.1"; > + reg = <0x124a0000 0x1000>; > + interrupts = <0 196 IRQ_TYPE_NONE>; @@ -140,7 +140,7 @@ thankfully. > + }; > + }; > + -> gsbi7: gsbi@16600000 { +> gsbi7: gsbi at 16600000 { > status = "disabled"; > compatible = "qcom,gsbi-v1.0.0"; > -- @@ -148,14 +148,10 @@ thankfully. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in -> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 0ccc5d5..3ab4d19 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,8 @@ "ref\01409052645-14984-1-git-send-email-kiran.padwal@smartplayin.com\0" - "ref\01409052645-14984-1-git-send-email-kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org\0" - "From\0Andy Gross <agross-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" - "Subject\0Re: [PATCH v3] ARM: apq8064: Add pinmux and i2c pinctrl nodes\0" + "From\0agross@codeaurora.org (Andy Gross)\0" + "Subject\0[PATCH v3] ARM: apq8064: Add pinmux and i2c pinctrl nodes\0" "Date\0Mon, 15 Sep 2014 21:39:22 -0500\0" - "To\0Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>\0" - "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" - pawel.moll-5wv7dgnIgG8@public.gmane.org - mark.rutland-5wv7dgnIgG8@public.gmane.org - ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org - galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - afaerber-l3A5Bk7waGM@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, Aug 26, 2014 at 05:00:45PM +0530, Kiran Padwal wrote:\n" @@ -28,7 +15,7 @@ "Looks fine\n" "\n" "> \n" - "> Signed-off-by: Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>\n" + "> Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com>\n" "> ---\n" "> Changes since v2:\n" "> - Renamed pinmux i2c subnode \"i2c1_pinmux\" to \"i2c1\".\n" @@ -52,17 +39,17 @@ "> \tcompatible = \"qcom,apq8064-ifc6410\", \"qcom,apq8064\";\n" "> \n" "> \tsoc {\n" - "> +\t\tgsbi@12440000 {\n" + "> +\t\tgsbi at 12440000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t\tqcom,mode = <GSBI_PROT_I2C>;\n" "> +\n" - "> +\t\t\ti2c@12460000 {\n" + "> +\t\t\ti2c at 12460000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t\tclock-frequency = <200000>;\n" "> +\t\t\t\tpinctrl-0 = <&i2c1_pins>;\n" "> +\t\t\t\tpinctrl-names = \"default\";\n" "> +\n" - "> +\t\t\t\teeprom: eeprom@52 {\n" + "> +\t\t\t\teeprom: eeprom at 52 {\n" "> +\t\t\t\t\tcompatible = \"atmel,24c128\";\n" "> +\t\t\t\t\treg = <0x52>;\n" "> +\t\t\t\t\tpagesize = <32>;\n" @@ -74,7 +61,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tgsbi@16600000 {\n" + "> \t\tgsbi at 16600000 {\n" "> \t\t\tstatus = \"ok\";\n" "> \t\t\tqcom,mode = <GSBI_PROT_I2C_UART>;\n" "> @@ -12,5 +30,14 @@\n" @@ -82,7 +69,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tpinmux@800000 {\n" + "> +\t\tpinmux at 800000 {\n" "> +\t\t\ti2c1_pins: i2c1 {\n" "> +\t\t\t\tmux {\n" "> +\t\t\t\t\tpins = \"gpio20\", \"gpio21\";\n" @@ -100,7 +87,7 @@ "> \t\t\tcpu-offset = <0x80000>;\n" "> \t\t};\n" "> \n" - "> +\t\ttlmm_pinmux: pinmux@800000 {\n" + "> +\t\ttlmm_pinmux: pinmux at 800000 {\n" "> +\t\t\tcompatible = \"qcom,apq8064-pinctrl\";\n" "> +\t\t\treg = <0x800000 0x4000>;\n" "> +\n" @@ -111,14 +98,14 @@ "> +\t\t\tinterrupts = <0 16 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t};\n" "> +\n" - "> \t\tacc0: clock-controller@2088000 {\n" + "> \t\tacc0: clock-controller at 2088000 {\n" "> \t\t\tcompatible = \"qcom,kpss-acc-v1\";\n" "> \t\t\treg = <0x02088000 0x1000>, <0x02008000 0x1000>;\n" "> @@ -133,6 +144,48 @@\n" "> \t\t\tregulator;\n" "> \t\t};\n" "> \n" - "> +\t\tgsbi1: gsbi@12440000 {\n" + "> +\t\tgsbi1: gsbi at 12440000 {\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "> +\t\t\treg = <0x12440000 0x100>;\n" @@ -128,7 +115,7 @@ "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\ti2c1: i2c@12460000 {\n" + "> +\t\t\ti2c1: i2c at 12460000 {\n" "> +\t\t\t\tcompatible = \"qcom,i2c-qup-v1.1.1\";\n" "> +\t\t\t\treg = <0x12460000 0x1000>;\n" "> +\t\t\t\tinterrupts = <0 194 IRQ_TYPE_NONE>;\n" @@ -139,7 +126,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tgsbi2: gsbi@12480000 {\n" + "> +\t\tgsbi2: gsbi at 12480000 {\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "> +\t\t\treg = <0x12480000 0x100>;\n" @@ -149,7 +136,7 @@ "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\ti2c2: i2c@124a0000 {\n" + "> +\t\t\ti2c2: 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\tinterrupts = <0 196 IRQ_TYPE_NONE>;\n" @@ -160,7 +147,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> \t\tgsbi7: gsbi@16600000 {\n" + "> \t\tgsbi7: gsbi at 16600000 {\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "> -- \n" @@ -168,16 +155,12 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-arm-msm\" in\n" - "> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "-- \n" "sent by an employee of the Qualcomm Innovation Center, Inc.\n" "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" - "hosted by The Linux Foundation\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + hosted by The Linux Foundation -2b13793a5e97d406672012479fffb2932d429c4d5d6c7012204fa4ae56e74ada +d756082a2d3756b0697a71140920a77ef527020437a2168e92dcc3858baba9a1
diff --git a/a/1.txt b/N2/1.txt index 2bff224..1150b50 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,7 +8,7 @@ On Tue, Aug 26, 2014 at 05:00:45PM +0530, Kiran Padwal wrote: Looks fine > -> Signed-off-by: Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org> +> Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com> > --- > Changes since v2: > - Renamed pinmux i2c subnode "i2c1_pinmux" to "i2c1". @@ -148,14 +148,10 @@ thankfully. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in -> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +> the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 0ccc5d5..33499d0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,20 @@ "ref\01409052645-14984-1-git-send-email-kiran.padwal@smartplayin.com\0" - "ref\01409052645-14984-1-git-send-email-kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org\0" - "From\0Andy Gross <agross-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "From\0Andy Gross <agross@codeaurora.org>\0" "Subject\0Re: [PATCH v3] ARM: apq8064: Add pinmux and i2c pinctrl nodes\0" "Date\0Mon, 15 Sep 2014 21:39:22 -0500\0" - "To\0Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>\0" - "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" - pawel.moll-5wv7dgnIgG8@public.gmane.org - mark.rutland-5wv7dgnIgG8@public.gmane.org - ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org - galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - afaerber-l3A5Bk7waGM@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0Kiran Padwal <kiran.padwal@smartplayin.com>\0" + "Cc\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + davidb@codeaurora.org + afaerber@suse.de + devicetree@vger.kernel.org + linux@arm.linux.org.uk + linux-arm-kernel@lists.infradead.org + linux-arm-msm@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Aug 26, 2014 at 05:00:45PM +0530, Kiran Padwal wrote:\n" @@ -28,7 +27,7 @@ "Looks fine\n" "\n" "> \n" - "> Signed-off-by: Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>\n" + "> Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com>\n" "> ---\n" "> Changes since v2:\n" "> - Renamed pinmux i2c subnode \"i2c1_pinmux\" to \"i2c1\".\n" @@ -168,16 +167,12 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-arm-msm\" in\n" - "> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + "> the body of a message to majordomo@vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "-- \n" "sent by an employee of the Qualcomm Innovation Center, Inc.\n" "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" - "hosted by The Linux Foundation\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + hosted by The Linux Foundation -2b13793a5e97d406672012479fffb2932d429c4d5d6c7012204fa4ae56e74ada +235e13064737545e9c8e969ccf2f96124b9270417b7c8c59ea6fbdd29688d4d8
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.