diff for duplicates of <20141103061408.GA21210@tiger> diff --git a/a/1.txt b/N1/1.txt index 1aa949f..ddde011 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ On Wed, Oct 29, 2014 at 04:47:03PM +0300, Dmitry Lavnikevich wrote: > }; > + > + regulators { -> + sound_1v8: regulator@2 { +> + sound_1v8: regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "i2s-audio-1v8"; @@ -32,7 +32,7 @@ On Wed, Oct 29, 2014 at 04:47:03PM +0300, Dmitry Lavnikevich wrote: > + regulator-max-microvolt = <1800000>; > + }; > + -> + sound_3v3: regulator@3 { +> + sound_3v3: regulator at 3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "i2s-audio-3v3"; @@ -125,9 +125,9 @@ Have a new line between nodes. > &i2c2 { > status = "okay"; > -> - tlv320@18 { +> - tlv320 at 18 { > - compatible = "ti,tlv320aic3x"; -> + codec: tlv320@18 { +> + codec: tlv320 at 18 { > + compatible = "ti,tlv320aic3007"; Both compatible strings are documented in @@ -144,7 +144,7 @@ this change will not cause any DT compatible issues. > + DVDD-supply = <&sound_1v8>; > }; > -> stmpe@41 { +> stmpe at 41 { > diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi > index aa2275671d2c..d7f34664e008 100644 > --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi @@ -188,6 +188,6 @@ Shawn > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at 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 71ab361..45afbf8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,9 @@ "ref\01414590424-25585-1-git-send-email-d.lavnikevich@sam-solutions.com\0" "ref\01414590424-25585-3-git-send-email-d.lavnikevich@sam-solutions.com\0" - "From\0Shawn Guo <shawn.guo@linaro.org>\0" - "Subject\0Re: [PATCH v5 2/3] ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards\0" + "From\0shawn.guo@linaro.org (Shawn Guo)\0" + "Subject\0[PATCH v5 2/3] ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards\0" "Date\0Mon, 3 Nov 2014 14:14:13 +0800\0" - "To\0Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com>\0" - "Cc\0shawn.guo@freescale.com" - kernel@pengutronix.de - robh+dt@kernel.org - pawel.moll@arm.com - mark.rutland@arm.com - ijc+devicetree@hellion.org.uk - galak@codeaurora.org - linux@arm.linux.org.uk - lgirdwood@gmail.com - broonie@kernel.org - perex@perex.cz - tiwai@suse.de - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - " alsa-devel@alsa-project.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Oct 29, 2014 at 04:47:03PM +0300, Dmitry Lavnikevich wrote:\n" @@ -48,7 +32,7 @@ "> \t};\n" "> +\n" "> +\tregulators {\n" - "> +\t\tsound_1v8: regulator@2 {\n" + "> +\t\tsound_1v8: regulator at 2 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <2>;\n" "> +\t\t\tregulator-name = \"i2s-audio-1v8\";\n" @@ -56,7 +40,7 @@ "> +\t\t\tregulator-max-microvolt = <1800000>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tsound_3v3: regulator@3 {\n" + "> +\t\tsound_3v3: regulator at 3 {\n" "> +\t\t\tcompatible = \"regulator-fixed\";\n" "> +\t\t\treg = <3>;\n" "> +\t\t\tregulator-name = \"i2s-audio-3v3\";\n" @@ -149,9 +133,9 @@ "> &i2c2 {\n" "> \tstatus = \"okay\";\n" "> \n" - "> -\ttlv320@18 {\n" + "> -\ttlv320 at 18 {\n" "> -\t\tcompatible = \"ti,tlv320aic3x\";\n" - "> +\tcodec: tlv320@18 {\n" + "> +\tcodec: tlv320 at 18 {\n" "> +\t\tcompatible = \"ti,tlv320aic3007\";\n" "\n" "Both compatible strings are documented in\n" @@ -168,7 +152,7 @@ "> +\t\tDVDD-supply = <&sound_1v8>;\n" "> \t};\n" "> \n" - "> \tstmpe@41 {\n" + "> \tstmpe at 41 {\n" "> diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi\n" "> index aa2275671d2c..d7f34664e008 100644\n" "> --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi\n" @@ -212,8 +196,8 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-kernel\" in\n" - "> the body of a message to majordomo@vger.kernel.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" > Please read the FAQ at http://www.tux.org/lkml/ -2f9ad951d8020a9c10fc045a80a7b19c78fc952f30e0c31937101eb7fc2cd2d8 +65a13bb9eeff4fdca5026dfa8a1d5884c70ba958dc5a9a9012a00724e3ec55ec
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.