diff for duplicates of <54378C69.4000400@compulab.co.il> diff --git a/a/1.txt b/N1/1.txt index 5f38e2c..f5f31f5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ On 10/01/14 19:09, Mike Rapoport wrote: > + compatible = "qcom,apq8064-cm-qs600", "qcom,apq8064"; > + > + soc { -> + pinctrl@800000 { +> + pinctrl at 800000 { > + i2c1_pins: i2c1 { > + mux { > + pins = "gpio20", "gpio21"; @@ -58,17 +58,17 @@ On 10/01/14 19:09, Mike Rapoport wrote: > + }; > + }; > + -> + 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@50 { +> + eeprom: eeprom at 50 { > + compatible = "24c02"; > + reg = <0x50>; > + pagesize = <32>; @@ -76,26 +76,26 @@ On 10/01/14 19:09, Mike Rapoport wrote: > + }; > + }; > + -> + gsbi@16600000 { +> + gsbi at 16600000 { > + status = "ok"; > + qcom,mode = <GSBI_PROT_I2C_UART>; -> + serial@16640000 { +> + serial at 16640000 { > + status = "ok"; > + }; > + }; > + > + amba { > + /* eMMC */ -> + sdcc1: sdcc@12400000 { +> + sdcc1: sdcc at 12400000 { > + status = "okay"; > + }; > + > + /* External micro SD card */ -> + sdcc3: sdcc@12180000 { +> + sdcc3: sdcc at 12180000 { > + status = "okay"; > + }; > + /* WLAN */ -> + sdcc4: sdcc@121c0000 { +> + sdcc4: sdcc at 121c0000 { > + status = "okay"; > + }; > + }; diff --git a/a/content_digest b/N1/content_digest index 30ab78b..0f36511 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01412179751-5859-1-git-send-email-mike.rapoport@gmail.com\0" - "From\0Igor Grinberg <grinberg@compulab.co.il>\0" - "Subject\0Re: [PATCH v4] ARM: dts: qcom: add CM-QS600 board\0" + "From\0grinberg@compulab.co.il (Igor Grinberg)\0" + "Subject\0[PATCH v4] ARM: dts: qcom: add CM-QS600 board\0" "Date\0Fri, 10 Oct 2014 10:36:09 +0300\0" - "To\0Kumar Gala <galak@codeaurora.org>\0" - "Cc\0Mike Rapoport <mike.rapoport@gmail.com>" - Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - Bjorn Andersson <bjorn@kryo.se> - linux-arm-msm@vger.kernel.org - linux-arm-kernel@lists.infradead.org - Nicolas Dechesne <nicolas.dechesne@linaro.org> - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Kumar,\n" @@ -63,7 +56,7 @@ "> +\tcompatible = \"qcom,apq8064-cm-qs600\", \"qcom,apq8064\";\n" "> +\n" "> +\tsoc {\n" - "> +\t\tpinctrl@800000 {\n" + "> +\t\tpinctrl at 800000 {\n" "> +\t\t\ti2c1_pins: i2c1 {\n" "> +\t\t\t\tmux {\n" "> +\t\t\t\t\tpins = \"gpio20\", \"gpio21\";\n" @@ -72,17 +65,17 @@ "> +\t\t\t};\n" "> +\t\t};\n" "> +\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@50 {\n" + "> +\t\t\t\teeprom: eeprom at 50 {\n" "> +\t\t\t\t\tcompatible = \"24c02\";\n" "> +\t\t\t\t\treg = <0x50>;\n" "> +\t\t\t\t\tpagesize = <32>;\n" @@ -90,26 +83,26 @@ "> +\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" - "> +\t\t\tserial@16640000 {\n" + "> +\t\t\tserial at 16640000 {\n" "> +\t\t\t\tstatus = \"ok\";\n" "> +\t\t\t};\n" "> +\t\t};\n" "> +\n" "> +\t\tamba {\n" "> +\t\t\t/* eMMC */\n" - "> +\t\t\tsdcc1: sdcc@12400000 {\n" + "> +\t\t\tsdcc1: sdcc at 12400000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* External micro SD card */\n" - "> +\t\t\tsdcc3: sdcc@12180000 {\n" + "> +\t\t\tsdcc3: sdcc at 12180000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t\t/* WLAN */\n" - "> +\t\t\tsdcc4: sdcc@121c0000 {\n" + "> +\t\t\tsdcc4: sdcc at 121c0000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -121,4 +114,4 @@ "Regards,\n" Igor. -8f661ccd8eefb24b3e0e3257a4e80c6b958a2acae8c886f70e1f012f4e719a3f +c6a57592b974fe5684474dbcdcf4e9835d6d7218945d62ce22d2e0556474e79e
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.