diff for duplicates of <52FA0B0C.3050801@ti.com> diff --git a/a/1.txt b/N1/1.txt index 8e87dd4..544259a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,9 +18,9 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > Cc: Viresh Kumar <viresh.linux@gmail.com> > Cc: Tejun Heo <tj@kernel.org> > Cc: Kishon Vijay Abraham I <kishon@ti.com> -> Cc: spear-devel at list.st.com -> Cc: linux-arm-kernel at lists.infradead.org -> Cc: linux-kernel at vger.kernel.org +> Cc: spear-devel@list.st.com +> Cc: linux-arm-kernel@lists.infradead.org +> Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/spear1310-evb.dts | 4 + > arch/arm/boot/dts/spear1310.dtsi | 39 +++++++++- @@ -40,11 +40,11 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > status = "okay"; > }; > -> + miphy at eb800000 { +> + miphy@eb800000 { > + status = "okay"; > + }; > + -> cf at b2800000 { +> cf@b2800000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi @@ -55,8 +55,8 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > #gpio-cells = <2>; > }; > -> - ahci at b1000000 { -> + miphy0: miphy at eb800000 { +> - ahci@b1000000 { +> + miphy0: miphy@eb800000 { > + compatible = "st,miphy", "st,spear1310-miphy"; > + reg = <0xeb800000 0x4000>; > + misc = <&misc>; @@ -65,7 +65,7 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > + status = "disabled"; > + }; > + -> + miphy1: miphy at eb804000 { +> + miphy1: miphy@eb804000 { > + compatible = "st,miphy", "st,spear1310-miphy"; > + reg = <0xeb804000 0x4000>; > + misc = <&misc>; @@ -74,7 +74,7 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > + status = "disabled"; > + }; > + -> + miphy2: miphy at eb808000 { +> + miphy2: miphy@eb808000 { > + compatible = "st,miphy", "st,spear1310-miphy"; > + reg = <0xeb808000 0x4000>; > + misc = <&misc>; @@ -83,7 +83,7 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > + status = "disabled"; > + }; > + -> + ahci0: ahci at b1000000 { +> + ahci0: ahci@b1000000 { > compatible = "snps,spear-ahci"; > reg = <0xb1000000 0x10000>; > interrupts = <0 68 0x4>; @@ -92,8 +92,8 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > status = "disabled"; > }; > -> - ahci at b1800000 { -> + ahci1: ahci at b1800000 { +> - ahci@b1800000 { +> + ahci1: ahci@b1800000 { > compatible = "snps,spear-ahci"; > reg = <0xb1800000 0x10000>; > interrupts = <0 69 0x4>; @@ -102,8 +102,8 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > status = "disabled"; > }; > -> - ahci at b4000000 { -> + ahci2: ahci at b4000000 { +> - ahci@b4000000 { +> + ahci2: ahci@b4000000 { > compatible = "snps,spear-ahci"; > reg = <0xb4000000 0x10000>; > interrupts = <0 70 0x4>; @@ -120,11 +120,11 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > status = "okay"; > }; > -> + miphy at eb800000 { +> + miphy@eb800000 { > + status = "okay"; > + }; > + -> dma at ea800000 { +> dma@ea800000 { > status = "okay"; > }; > diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi @@ -135,8 +135,8 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > status = "disabled"; > }; > -> - ahci at b1000000 { -> + miphy0: miphy at eb800000 { +> - ahci@b1000000 { +> + miphy0: miphy@eb800000 { > + compatible = "st,miphy", "st,spear1340-miphy"; > + reg = <0xeb800000 0x4000>; > + misc = <&misc>; @@ -145,7 +145,7 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > + status = "disabled"; > + }; > + -> + ahci0: ahci at b1000000 { +> + ahci0: ahci@b1000000 { > compatible = "snps,spear-ahci"; > reg = <0xb1000000 0x10000>; > interrupts = <0 72 0x4>; @@ -162,12 +162,12 @@ On Tuesday 11 February 2014 03:00 PM, Mohit Kumar wrote: > 0xd8000000 0xd8000000 0x01000000 > 0xe0000000 0xe0000000 0x10000000>; > -> + misc: syscon at e0700000 { +> + misc: syscon@e0700000 { > + compatible = "st,spear1340-misc", "syscon"; > + reg = <0xe0700000 0x1000>; > + }; > + -> gpio0: gpio at e0600000 { +> gpio0: gpio@e0600000 { > compatible = "arm,pl061", "arm,primecell"; > reg = <0xe0600000 0x1000>; > diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig diff --git a/a/content_digest b/N1/content_digest index 0b6036b..3ab47de 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\0cover.1392109054.git.mohit.kumar@st.com\0" "ref\015e900d387a71e48387cf322ca065e38691c50e5.1392109054.git.mohit.kumar@st.com\0" - "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" - "Subject\0[PATCH V6 06/12] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver\0" + "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" + "Subject\0Re: [PATCH V6 06/12] SPEAr13xx: Fixup: Move SPEAr1340 SATA platform code to phy driver\0" "Date\0Tue, 11 Feb 2014 17:05:40 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Mohit Kumar <mohit.kumar@st.com>" + " <arnd@arndb.de>\0" + "Cc\0Pratyush Anand <pratyush.anand@st.com>" + Viresh Kumar <viresh.linux@gmail.com> + Tejun Heo <tj@kernel.org> + <spear-devel@list.st.com> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -26,9 +33,9 @@ "> Cc: Viresh Kumar <viresh.linux@gmail.com>\n" "> Cc: Tejun Heo <tj@kernel.org>\n" "> Cc: Kishon Vijay Abraham I <kishon@ti.com>\n" - "> Cc: spear-devel at list.st.com\n" - "> Cc: linux-arm-kernel at lists.infradead.org\n" - "> Cc: linux-kernel at vger.kernel.org\n" + "> Cc: spear-devel@list.st.com\n" + "> Cc: linux-arm-kernel@lists.infradead.org\n" + "> Cc: linux-kernel@vger.kernel.org\n" "> ---\n" "> arch/arm/boot/dts/spear1310-evb.dts | 4 +\n" "> arch/arm/boot/dts/spear1310.dtsi | 39 +++++++++-\n" @@ -48,11 +55,11 @@ "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> \n" - "> +\t\tmiphy at eb800000 {\n" + "> +\t\tmiphy@eb800000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> \t\tcf at b2800000 {\n" + "> \t\tcf@b2800000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi\n" @@ -63,8 +70,8 @@ "> \t\t\t#gpio-cells = <2>;\n" "> \t\t};\n" "> \n" - "> -\t\tahci at b1000000 {\n" - "> +\t\tmiphy0: miphy at eb800000 {\n" + "> -\t\tahci@b1000000 {\n" + "> +\t\tmiphy0: miphy@eb800000 {\n" "> +\t\t\tcompatible = \"st,miphy\", \"st,spear1310-miphy\";\n" "> +\t\t\treg = <0xeb800000 0x4000>;\n" "> +\t\t\tmisc = <&misc>;\n" @@ -73,7 +80,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmiphy1: miphy at eb804000 {\n" + "> +\t\tmiphy1: miphy@eb804000 {\n" "> +\t\t\tcompatible = \"st,miphy\", \"st,spear1310-miphy\";\n" "> +\t\t\treg = <0xeb804000 0x4000>;\n" "> +\t\t\tmisc = <&misc>;\n" @@ -82,7 +89,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmiphy2: miphy at eb808000 {\n" + "> +\t\tmiphy2: miphy@eb808000 {\n" "> +\t\t\tcompatible = \"st,miphy\", \"st,spear1310-miphy\";\n" "> +\t\t\treg = <0xeb808000 0x4000>;\n" "> +\t\t\tmisc = <&misc>;\n" @@ -91,7 +98,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tahci0: ahci at b1000000 {\n" + "> +\t\tahci0: ahci@b1000000 {\n" "> \t\t\tcompatible = \"snps,spear-ahci\";\n" "> \t\t\treg = <0xb1000000 0x10000>;\n" "> \t\t\tinterrupts = <0 68 0x4>;\n" @@ -100,8 +107,8 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> -\t\tahci at b1800000 {\n" - "> +\t\tahci1: ahci at b1800000 {\n" + "> -\t\tahci@b1800000 {\n" + "> +\t\tahci1: ahci@b1800000 {\n" "> \t\t\tcompatible = \"snps,spear-ahci\";\n" "> \t\t\treg = <0xb1800000 0x10000>;\n" "> \t\t\tinterrupts = <0 69 0x4>;\n" @@ -110,8 +117,8 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> -\t\tahci at b4000000 {\n" - "> +\t\tahci2: ahci at b4000000 {\n" + "> -\t\tahci@b4000000 {\n" + "> +\t\tahci2: ahci@b4000000 {\n" "> \t\t\tcompatible = \"snps,spear-ahci\";\n" "> \t\t\treg = <0xb4000000 0x10000>;\n" "> \t\t\tinterrupts = <0 70 0x4>;\n" @@ -128,11 +135,11 @@ "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> \n" - "> +\t\tmiphy at eb800000 {\n" + "> +\t\tmiphy@eb800000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> \t\tdma at ea800000 {\n" + "> \t\tdma@ea800000 {\n" "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi\n" @@ -143,8 +150,8 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> -\t\tahci at b1000000 {\n" - "> +\t\tmiphy0: miphy at eb800000 {\n" + "> -\t\tahci@b1000000 {\n" + "> +\t\tmiphy0: miphy@eb800000 {\n" "> +\t\t\tcompatible = \"st,miphy\", \"st,spear1340-miphy\";\n" "> +\t\t\treg = <0xeb800000 0x4000>;\n" "> +\t\t\tmisc = <&misc>;\n" @@ -153,7 +160,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tahci0: ahci at b1000000 {\n" + "> +\t\tahci0: ahci@b1000000 {\n" "> \t\t\tcompatible = \"snps,spear-ahci\";\n" "> \t\t\treg = <0xb1000000 0x10000>;\n" "> \t\t\tinterrupts = <0 72 0x4>;\n" @@ -170,12 +177,12 @@ "> \t\t\t\t 0xd8000000 0xd8000000 0x01000000\n" "> \t\t\t\t 0xe0000000 0xe0000000 0x10000000>;\n" "> \n" - "> +\t\t\tmisc: syscon at e0700000 {\n" + "> +\t\t\tmisc: syscon@e0700000 {\n" "> +\t\t\t\tcompatible = \"st,spear1340-misc\", \"syscon\";\n" "> +\t\t\t\treg = <0xe0700000 0x1000>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tgpio0: gpio at e0600000 {\n" + "> \t\t\tgpio0: gpio@e0600000 {\n" "> \t\t\t\tcompatible = \"arm,pl061\", \"arm,primecell\";\n" "> \t\t\t\treg = <0xe0600000 0x1000>;\n" "> diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig\n" @@ -520,4 +527,4 @@ "Thanks\n" Kishon -4980dea16a410d4b0ad915388ee2f77f512f0bb6c80e97fcd91c7efa05e7b6b0 +f1bb7c4c09c133ea967926598856d8b474748ee3ac7bd293fcb6a96d0f25ea46
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.