diff for duplicates of <53F4C085.5060101@suse.de> diff --git a/a/1.txt b/N1/1.txt index f4a1578..00e3940 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,7 +25,7 @@ Am 20.08.2014 14:02, schrieb Kiran Padwal: > compatible = "qcom,apq8064-ifc6410", "qcom,apq8064"; > > soc { -> + pinmux@800000 { +> + pinmux at 800000 { > + i2c1_pins: i2c1_pinmux { Is there a requirement to have "_pinmux" in the subnode of the "pinmux" @@ -39,7 +39,7 @@ seems to be dashes rather than underscores for node names. > + }; > + }; > + -> gsbi@16600000 { +> gsbi at 16600000 { > status = "ok"; > qcom,mode = <GSBI_PROT_I2C_UART>; > @@ -12,5 +21,25 @@ @@ -47,7 +47,7 @@ seems to be dashes rather than underscores for node names. > }; > }; > + -> + gsbi1: gsbi@12440000 { +> + gsbi1: gsbi at 12440000 { > + qcom,mode = <GSBI_PROT_I2C>; > + status = "ok"; @@ -62,10 +62,10 @@ Also, you already provide a label "gsbi1" to this node in the .dtsi below, so you don't need to do it here again. Some architectures prefer in such a case that in the .dts the node is referenced as &gsbi1 {...}; below the root node in alphabetical order -rather than duplicating the full /soc/foo@bar hierarchy. +rather than duplicating the full /soc/foo at bar hierarchy. > + -> + i2c1: i2c@12460000 { +> + i2c1: i2c at 12460000 { Suggest to move the i2c1 label to the .dtsi. Then optionally same could be done here as outlined for gsbi1. @@ -80,7 +80,7 @@ be done here as outlined for gsbi1. > + pinctrl-0 = <&i2c1_pins>; > + pinctrl-names = "default"; > + -> + eeprom: eeprom@52 { +> + eeprom: eeprom at 52 { > + compatible = "atmel,24c128"; > + reg = <0x52>; > + pagesize = <32>; @@ -97,7 +97,7 @@ be done here as outlined for gsbi1. > ranges; > compatible = "simple-bus"; > -> + tlmm_pinmux: pinmux@800000 { +> + tlmm_pinmux: pinmux at 800000 { > + compatible = "qcom,apq8064-pinctrl"; > + reg = <0x800000 0x4000>; > + @@ -111,14 +111,14 @@ s/0x4/IRQ_TYPE_LEVEL_HIGH/? > + }; > + -> intc: interrupt-controller@2000000 { +> intc: interrupt-controller at 2000000 { > compatible = "qcom,msm-qgic2"; > interrupt-controller; > @@ -133,6 +144,54 @@ > regulator; > }; > -> + gsbi1: gsbi@12440000 { +> + gsbi1: gsbi at 12440000 { > + compatible = "qcom,gsbi-v1.0.0"; > + reg = <0x12440000 0x100>; > + clocks = <&gcc GSBI1_H_CLK>; @@ -128,7 +128,7 @@ s/0x4/IRQ_TYPE_LEVEL_HIGH/? > + ranges; > + status = "disabled"; > + -> + i2c@12460000 { +> + i2c at 12460000 { > + compatible = "qcom,i2c-qup-v1.1.1"; > + reg = <0x12460000 0x1000>; > + interrupts = <0 194 0>; @@ -148,7 +148,7 @@ I'd guess this is redundant since the parent is already disabled? > + }; > + }; > + -> + gsbi2: gsbi@12480000 { +> + gsbi2: gsbi at 12480000 { > + compatible = "qcom,gsbi-v1.0.0"; > + reg = <0x12480000 0x100>; > + clocks = <&gcc GSBI2_H_CLK>; @@ -158,7 +158,7 @@ I'd guess this is redundant since the parent is already disabled? > + ranges; > + status = "disabled"; > + -> + i2c@124a0000 { +> + i2c at 124a0000 { > + compatible = "qcom,i2c-qup-v1.1.1"; > + reg = <0x124a0000 0x1000>; > + interrupts = <0 196 0>; @@ -178,10 +178,10 @@ Andreas > + }; > + }; > + -> gsbi7: gsbi@16600000 { +> gsbi7: gsbi at 16600000 { > status = "disabled"; > compatible = "qcom,gsbi-v1.0.0"; -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg diff --git a/a/content_digest b/N1/content_digest index 8a9b0f1..43ee3b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,8 @@ "ref\01408536133-13824-1-git-send-email-kiran.padwal@smartplayin.com\0" - "From\0Andreas F\303\244rber <afaerber@suse.de>\0" - "Subject\0Re: [PATCH v2] ARM: apq8064: Add pinmux and i2c pinctrl nodes\0" + "From\0afaerber@suse.de (Andreas F\303\244rber)\0" + "Subject\0[PATCH v2] ARM: apq8064: Add pinmux and i2c pinctrl nodes\0" "Date\0Wed, 20 Aug 2014 17:36:37 +0200\0" - "To\0Kiran Padwal <kiran.padwal@smartplayin.com>" - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - " davidb@codeaurora.org\0" - "Cc\0devicetree@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" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -43,7 +32,7 @@ "> \tcompatible = \"qcom,apq8064-ifc6410\", \"qcom,apq8064\";\n" "> \n" "> \tsoc {\n" - "> +\t\tpinmux@800000 {\n" + "> +\t\tpinmux at 800000 {\n" "> +\t\t\ti2c1_pins: i2c1_pinmux {\n" "\n" "Is there a requirement to have \"_pinmux\" in the subnode of the \"pinmux\"\n" @@ -57,7 +46,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 +21,25 @@\n" @@ -65,7 +54,7 @@ "> \t\t\t};\n" "> \t\t};\n" "> +\n" - "> +\t\tgsbi1: gsbi@12440000 {\n" + "> +\t\tgsbi1: gsbi at 12440000 {\n" "> +\t\t\tqcom,mode = <GSBI_PROT_I2C>;\n" "> +\t\t\tstatus = \"ok\";\n" "\n" @@ -80,10 +69,10 @@ "below, so you don't need to do it here again.\n" "Some architectures prefer in such a case that in the .dts the node is\n" "referenced as &gsbi1 {...}; below the root node in alphabetical order\n" - "rather than duplicating the full /soc/foo@bar hierarchy.\n" + "rather than duplicating the full /soc/foo at bar hierarchy.\n" "\n" "> +\n" - "> +\t\t\ti2c1: i2c@12460000 {\n" + "> +\t\t\ti2c1: i2c at 12460000 {\n" "\n" "Suggest to move the i2c1 label to the .dtsi. Then optionally same could\n" "be done here as outlined for gsbi1.\n" @@ -98,7 +87,7 @@ "> +\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" @@ -115,7 +104,7 @@ "> \t\tranges;\n" "> \t\tcompatible = \"simple-bus\";\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" @@ -129,14 +118,14 @@ "\n" "> +\t\t};\n" "> +\n" - "> \t\tintc: interrupt-controller@2000000 {\n" + "> \t\tintc: interrupt-controller at 2000000 {\n" "> \t\t\tcompatible = \"qcom,msm-qgic2\";\n" "> \t\t\tinterrupt-controller;\n" "> @@ -133,6 +144,54 @@\n" "> \t\t\tregulator;\n" "> \t\t};\n" "> \n" - "> +\t\tgsbi1: gsbi@12440000 {\n" + "> +\t\tgsbi1: gsbi at 12440000 {\n" "> +\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "> +\t\t\treg = <0x12440000 0x100>;\n" "> +\t\t\tclocks = <&gcc GSBI1_H_CLK>;\n" @@ -146,7 +135,7 @@ "> +\t\t\tranges;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\ti2c@12460000 {\n" + "> +\t\t\ti2c 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 0>;\n" @@ -166,7 +155,7 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" - "> +\t\tgsbi2: gsbi@12480000 {\n" + "> +\t\tgsbi2: gsbi at 12480000 {\n" "> +\t\t\tcompatible = \"qcom,gsbi-v1.0.0\";\n" "> +\t\t\treg = <0x12480000 0x100>;\n" "> +\t\t\tclocks = <&gcc GSBI2_H_CLK>;\n" @@ -176,7 +165,7 @@ "> +\t\t\tranges;\n" "> +\t\t\tstatus = \"disabled\";\n" "> +\n" - "> +\t\t\ti2c@124a0000 {\n" + "> +\t\t\ti2c 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 0>;\n" @@ -196,12 +185,12 @@ "> +\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" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" - "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg" + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" + GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg -346c950d876fd8ac9094570e212a7c022f06bcc2a48e307d3bda65f4bc00d870 +a621f3578142b0653d46247f9dba9b846ff7ab728dc701b784cf1f72d8111c91
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.