diff for duplicates of <53983BBF.4070408@collabora.co.uk> diff --git a/a/1.txt b/N1/1.txt index 66065dd..9f4d083 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,11 +38,11 @@ platforms. > +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts > @@ -169,6 +169,7 @@ > -> spi_2: spi@13940000 { +> spi_2: spi at 13940000 { > status = "okay"; > + cs-gpios = <&gpc1 2 0>; > -> w25x80@0 { +> w25x80 at 0 { > #address-cells = <1>; > @@ -178,7 +179,6 @@ > spi-max-frequency = <1000000>; @@ -57,7 +57,7 @@ platforms. > --- a/arch/arm/boot/dts/exynos4412-trats2.dts > +++ b/arch/arm/boot/dts/exynos4412-trats2.dts > @@ -512,6 +512,7 @@ -> spi_1: spi@13930000 { +> spi_1: spi at 13930000 { > pinctrl-names = "default"; > pinctrl-0 = <&spi1_bus>; > + cs-gpios = <&gpb 5 0>; @@ -79,11 +79,11 @@ platforms. > @@ -316,6 +316,7 @@ > }; > -> spi_1: spi@12d30000 { +> spi_1: spi at 12d30000 { > + cs-gpios = <&gpa2 5 0>; > status = "okay"; > -> w25q80bw@0 { +> w25q80bw at 0 { > @@ -326,7 +327,6 @@ > spi-max-frequency = <1000000>; > diff --git a/a/content_digest b/N1/content_digest index 884ab07..3b1418b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01402468318-7342-1-git-send-email-ch.naveen@samsung.com\0" "ref\01402468318-7342-2-git-send-email-ch.naveen@samsung.com\0" - "From\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" - "Subject\0Re: [PATCH 2/2 v3] ARM: DTS: move \"cs-gpio\" from \"controller-data\" to under spi node\0" + "From\0javier.martinez@collabora.co.uk (Javier Martinez Canillas)\0" + "Subject\0[PATCH 2/2 v3] ARM: DTS: move \"cs-gpio\" from \"controller-data\" to under spi node\0" "Date\0Wed, 11 Jun 2014 13:21:35 +0200\0" - "To\0Naveen Krishna Chatradhi <ch.naveen@samsung.com>" - linux-arm-kernel@lists.infradead.org - spi-devel-general@lists.sourceforge.net - " linux-samsung-soc@vger.kernel.org\0" - "Cc\0naveenkrishna.ch@gmail.com" - broonie@kernel.org - grant.likely@secretlab.ca - jaswinder.singh@linaro.org - kgene.kim@samsung.com - cpgs@samsung.com - devicetree@vger.kernel.org - Doug Anderson <dianders@chromium.org> - " Tomasz Figa <t.figa@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello Naveen,\n" @@ -58,11 +46,11 @@ "> +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts\n" "> @@ -169,6 +169,7 @@\n" "> \n" - "> \tspi_2: spi@13940000 {\n" + "> \tspi_2: spi at 13940000 {\n" "> \t\tstatus = \"okay\";\n" "> +\t\tcs-gpios = <&gpc1 2 0>;\n" "> \n" - "> \t\tw25x80@0 {\n" + "> \t\tw25x80 at 0 {\n" "> \t\t\t#address-cells = <1>;\n" "> @@ -178,7 +179,6 @@\n" "> \t\t\tspi-max-frequency = <1000000>;\n" @@ -77,7 +65,7 @@ "> --- a/arch/arm/boot/dts/exynos4412-trats2.dts\n" "> +++ b/arch/arm/boot/dts/exynos4412-trats2.dts\n" "> @@ -512,6 +512,7 @@\n" - "> \tspi_1: spi@13930000 {\n" + "> \tspi_1: spi at 13930000 {\n" "> \t\tpinctrl-names = \"default\";\n" "> \t\tpinctrl-0 = <&spi1_bus>;\n" "> +\t\tcs-gpios = <&gpb 5 0>;\n" @@ -99,11 +87,11 @@ "> @@ -316,6 +316,7 @@\n" "> \t};\n" "> \n" - "> \tspi_1: spi@12d30000 {\n" + "> \tspi_1: spi at 12d30000 {\n" "> +\t\tcs-gpios = <&gpa2 5 0>;\n" "> \t\tstatus = \"okay\";\n" "> \n" - "> \t\tw25q80bw@0 {\n" + "> \t\tw25q80bw at 0 {\n" "> @@ -326,7 +327,6 @@\n" "> \t\t\tspi-max-frequency = <1000000>;\n" "> \n" @@ -117,4 +105,4 @@ "Best regards,\n" Javier -7e4a5572c5128144045130d8ad827d0de8a38a58573e396d79ffb9b3562801b6 +aacdff2b9cb62236144dd615c8b661daa2c5ffd9ddaac4f62230e44f4fdb43db
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.