diff for duplicates of <555AE192.8010700@denx.de> diff --git a/a/1.txt b/N1/1.txt index bad4672..e5e53d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -97,7 +97,7 @@ Ok, remove it. >> + }; >> + >> + soc { ->> + display0: display at di0 { +>> + display0: display@di0 { >> + compatible = "fsl,imx-parallel-display"; >> + interface-pix-fmt = "rgb24"; >> + pinctrl-names = "default"; @@ -133,7 +133,7 @@ I try it ... >> +}; >> + >> +&ecspi1 { ->> + lcd_panel: display at 0 { +>> + lcd_panel: display@0 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "lg,lg4573"; @@ -160,7 +160,7 @@ I try it ... >> +}; >> + >> +&i2c3 { ->> + atmel: atmel_mxt_ts at 4b { +>> + atmel: atmel_mxt_ts@4b { > > Node name should be generic. @@ -264,7 +264,7 @@ I have to look into it. >> +}; >> + >> +&i2c3 { ->> + atmel: atmel_mxt_ts at 4d { +>> + atmel: atmel_mxt_ts@4d { >> + compatible = "atmel,maxtouch"; >> + reg = <0x4d>; >> + interrupt-parent = <&gpio2>; @@ -282,7 +282,7 @@ They have different i2c addresses ... >> +&ldb { >> + status = "okay"; >> + ->> + lvds-channel at 0 { +>> + lvds-channel@0 { >> + fsl,data-mapping = "spwg"; >> + fsl,data-width = <24>; >> + status = "okay"; @@ -429,7 +429,7 @@ this is not longer needed, I remove (and test) it. >> + dma-names; >> + status = "okay"; >> + ->> + flash: m25p80 at 1 { +>> + flash: m25p80@1 { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "micron,n25q128a11"; @@ -443,7 +443,7 @@ this is not longer needed, I remove (and test) it. >> + pinctrl-0 = <&pinctrl_i2c1>; >> + status = "okay"; >> + ->> + pmic at 58 { +>> + pmic@58 { >> + compatible = "dialog,da9063"; >> + reg = <0x58>; >> + interrupt-parent = <&gpio1>; @@ -568,7 +568,7 @@ this is not longer needed, I remove (and test) it. Fixed. ->> + tmp103: tmp103 at 71 { +>> + tmp103: tmp103@71 { >> + compatible = "ti,tmp103"; >> + reg = <0x71>; >> + }; @@ -585,14 +585,14 @@ Fixed. >> + pinctrl-0 = <&pinctrl_i2c3>; >> + status = "okay"; >> + ->> + expander: tca6416 at 20 { +>> + expander: tca6416@20 { >> + compatible = "ti,tca6416"; >> + reg = <0x20>; >> + #gpio-cells = <2>; >> + gpio-controller; >> + }; >> + ->> + rtc at 68 { +>> + rtc@68 { >> + compatible = "dallas,m41t00"; >> + reg = <0x68>; >> + }; @@ -608,7 +608,7 @@ Ok, change this. >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c4>; >> + status = "okay"; ->> + eeprom at 50{ +>> + eeprom@50{ >> + compatible = "atmel,24c64"; >> + reg = <0x50>; >> + }; @@ -617,7 +617,7 @@ Ok, change this. Yep ->> + eeprom at 57{ +>> + eeprom@57{ >> + compatible = "atmel,24c64"; >> + reg = <0x57>; >> + }; @@ -1009,7 +1009,7 @@ Heiko >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in ->> the body of a message to majordomo at vger.kernel.org +>> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ > diff --git a/a/content_digest b/N1/content_digest index d48f04e..8fcab91 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\01431334974-27531-1-git-send-email-hs@denx.de\0" "ref\020150518113135.GD1071@dragon\0" - "From\0hs@denx.de (Heiko Schocher)\0" - "Subject\0[PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" + "From\0Heiko Schocher <hs@denx.de>\0" + "Subject\0Re: [PATCH v2] arm, imx6, dts: add DT for aristainetos2 board\0" "Date\0Tue, 19 May 2015 09:09:06 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Shawn Guo <shawnguo@kernel.org>\0" + "Cc\0linux-kernel@vger.kernel.org" + Shawn Guo <shawn.guo@linaro.org> + Sascha Hauer <kernel@pengutronix.de> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " Philipp Zabel <p.zabel@pengutronix.de>\0" "\00:1\0" "b\0" "Hello Shawn,\n" @@ -105,7 +111,7 @@ ">> +\t};\n" ">> +\n" ">> +\tsoc {\n" - ">> +\t\tdisplay0: display at di0 {\n" + ">> +\t\tdisplay0: display@di0 {\n" ">> +\t\t\tcompatible = \"fsl,imx-parallel-display\";\n" ">> +\t\t\tinterface-pix-fmt = \"rgb24\";\n" ">> +\t\t\tpinctrl-names = \"default\";\n" @@ -141,7 +147,7 @@ ">> +};\n" ">> +\n" ">> +&ecspi1 {\n" - ">> +\tlcd_panel: display at 0 {\n" + ">> +\tlcd_panel: display@0 {\n" ">> +\t\t#address-cells = <1>;\n" ">> +\t\t#size-cells = <1>;\n" ">> +\t\tcompatible = \"lg,lg4573\";\n" @@ -168,7 +174,7 @@ ">> +};\n" ">> +\n" ">> +&i2c3 {\n" - ">> +\tatmel: atmel_mxt_ts at 4b {\n" + ">> +\tatmel: atmel_mxt_ts@4b {\n" ">\n" "> Node name should be generic.\n" "\n" @@ -272,7 +278,7 @@ ">> +};\n" ">> +\n" ">> +&i2c3 {\n" - ">> +\tatmel: atmel_mxt_ts at 4d {\n" + ">> +\tatmel: atmel_mxt_ts@4d {\n" ">> +\t\tcompatible = \"atmel,maxtouch\";\n" ">> +\t\treg = <0x4d>;\n" ">> +\t\tinterrupt-parent = <&gpio2>;\n" @@ -290,7 +296,7 @@ ">> +&ldb {\n" ">> +\tstatus = \"okay\";\n" ">> +\n" - ">> +\tlvds-channel at 0 {\n" + ">> +\tlvds-channel@0 {\n" ">> +\t\tfsl,data-mapping = \"spwg\";\n" ">> +\t\tfsl,data-width = <24>;\n" ">> +\t\tstatus = \"okay\";\n" @@ -437,7 +443,7 @@ ">> +\tdma-names;\n" ">> +\tstatus = \"okay\";\n" ">> +\n" - ">> +\tflash: m25p80 at 1 {\n" + ">> +\tflash: m25p80@1 {\n" ">> +\t\t#address-cells = <1>;\n" ">> +\t\t#size-cells = <1>;\n" ">> +\t\tcompatible = \"micron,n25q128a11\";\n" @@ -451,7 +457,7 @@ ">> +\tpinctrl-0 = <&pinctrl_i2c1>;\n" ">> +\tstatus = \"okay\";\n" ">> +\n" - ">> +\tpmic at 58 {\n" + ">> +\tpmic@58 {\n" ">> +\t\tcompatible = \"dialog,da9063\";\n" ">> +\t\treg = <0x58>;\n" ">> +\t\tinterrupt-parent = <&gpio1>;\n" @@ -576,7 +582,7 @@ "\n" "Fixed.\n" "\n" - ">> +\ttmp103: tmp103 at 71 {\n" + ">> +\ttmp103: tmp103@71 {\n" ">> +\t\tcompatible = \"ti,tmp103\";\n" ">> +\t\treg = <0x71>;\n" ">> +\t};\n" @@ -593,14 +599,14 @@ ">> +\tpinctrl-0 = <&pinctrl_i2c3>;\n" ">> +\tstatus = \"okay\";\n" ">> +\n" - ">> +\texpander: tca6416 at 20 {\n" + ">> +\texpander: tca6416@20 {\n" ">> +\t\tcompatible = \"ti,tca6416\";\n" ">> +\t\treg = <0x20>;\n" ">> +\t\t#gpio-cells = <2>;\n" ">> +\t\tgpio-controller;\n" ">> +\t};\n" ">> +\n" - ">> +\trtc at 68 {\n" + ">> +\trtc@68 {\n" ">> +\t\tcompatible = \"dallas,m41t00\";\n" ">> +\t\treg = <0x68>;\n" ">> +\t};\n" @@ -616,7 +622,7 @@ ">> +\tpinctrl-names = \"default\";\n" ">> +\tpinctrl-0 = <&pinctrl_i2c4>;\n" ">> +\tstatus = \"okay\";\n" - ">> +\teeprom at 50{\n" + ">> +\teeprom@50{\n" ">> +\t\tcompatible = \"atmel,24c64\";\n" ">> +\t\treg = <0x50>;\n" ">> +\t};\n" @@ -625,7 +631,7 @@ "\n" "Yep\n" "\n" - ">> +\teeprom at 57{\n" + ">> +\teeprom@57{\n" ">> +\t\tcompatible = \"atmel,24c64\";\n" ">> +\t\treg = <0x57>;\n" ">> +\t};\n" @@ -1017,7 +1023,7 @@ ">>\n" ">> --\n" ">> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - ">> the body of a message to majordomo at vger.kernel.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" ">> Please read the FAQ at http://www.tux.org/lkml/\n" ">\n" @@ -1026,4 +1032,4 @@ "DENX Software Engineering GmbH, Managing Director: Wolfgang Denk\n" HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany -03a70351d16871cabcb6758b018899abfcfdfbab6d60208c726f0bd18e7157fb +46c2a561e688d746cdd5cf7567baa386429cddd32358b582a77c0a53d75b0597
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.