diff for duplicates of <5315D5D6.2070308@ti.com> diff --git a/a/1.txt b/N1/1.txt index 50d4b7f..51107f8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > -- reg : <registers mapping> > - > -Example: -> - sata at ffe07000 { +> - sata@ffe07000 { > - compatible = "samsung,exynos5-sata-phy"; > - reg = <0xffe07000 0x1000>; > - }; @@ -59,12 +59,12 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > +- phy-names : as mentioned in phy-bindings.txt > > Example: -> - sata at ffe08000 { +> - sata@ffe08000 { > - compatible = "samsung,exynos5-sata"; > - reg = <0xffe08000 0x1000>; > - interrupts = <115>; > - }; -> + sata at 122f0000 { +> + sata@122f0000 { > + compatible = "snps,dwc-ahci"; > + samsung,sata-freq = <66>; > + reg = <0x122f0000 0x1ff>; @@ -95,7 +95,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > +- #phy-cells : from the generic phy bindings; > + > +Example: -> + sata_phy: sata-phy at 12170000 { +> + sata_phy: sata-phy@12170000 { > + compatible = "samsung,exynos5250-sata-phy"; > + reg = <0x12170000 0x1ff>; > + clocks = <&clock 287>; @@ -114,7 +114,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + > +Example: > + -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > + reg = <0x38>; > + }; @@ -126,28 +126,28 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > }; > }; > -> + i2c at 121D0000 { +> + i2c@121D0000 { > + status = "okay"; > + samsung,i2c-sda-delay = <100>; > + samsung,i2c-max-bus-freq = <40000>; > + samsung,i2c-slave-addr = <0x38>; > + -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > + reg = <0x38>; > + }; > + }; > + -> + sata at 122F0000 { +> + sata@122F0000 { > + status = "okay"; > + }; > + -> + sata-phy at 12170000 { +> + sata-phy@12170000 { > + status = "okay"; > + samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>; > + }; > + -> mmc_0: mmc at 12200000 { +> mmc_0: mmc@12200000 { > status = "okay"; > num-slots = <1>; > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -160,33 +160,33 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > > - sata-phy { > - compatible = "samsung,sata-phy"; -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > reg = <0x38>; > }; > }; > -> - sata at 122F0000 { +> - sata@122F0000 { > - samsung,sata-freq = <66>; > - }; > - -> i2c at 12C80000 { +> i2c@12C80000 { > samsung,i2c-sda-delay = <100>; > samsung,i2c-max-bus-freq = <66000>; > @@ -274,6 +270,15 @@ > }; > }; > -> + sata at 122F0000 { +> + sata@122F0000 { > + status = "okay"; > + }; > + -> + sata-phy at 12170000 { +> + sata-phy@12170000 { > + status = "okay"; > + samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>; > + }; > + -> mmc at 12200000 { +> mmc@12200000 { > status = "okay"; > num-slots = <1>; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi @@ -204,7 +204,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > @@ -233,16 +234,25 @@ > }; > -> sata at 122F0000 { +> sata@122F0000 { > - compatible = "samsung,exynos5-sata-ahci"; > + compatible = "snps,dwc-ahci"; > + samsung,sata-freq = <66>; @@ -217,9 +217,9 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "disabled"; > }; > -> - sata-phy at 12170000 { +> - sata-phy@12170000 { > - compatible = "samsung,exynos5-sata-phy"; -> + sata_phy: sata-phy at 12170000 { +> + sata_phy: sata-phy@12170000 { > + compatible = "samsung,exynos5250-sata-phy"; > reg = <0x12170000 0x1ff>; > + clocks = <&clock 287>; @@ -229,13 +229,13 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "disabled"; > }; > -> i2c_0: i2c at 12C60000 { +> i2c_0: i2c@12C60000 { > @@ -360,7 +370,7 @@ > status = "disabled"; > }; > -> - i2c at 121D0000 { -> + i2c_9: i2c at 121D0000 { +> - i2c@121D0000 { +> + i2c_9: i2c@121D0000 { > compatible = "samsung,exynos5-sata-phy-i2c"; > reg = <0x121D0000 0x100>; > #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 88639cb..dbd688f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,24 @@ "ref\01393931452-18237-1-git-send-email-yuvaraj.cd@samsung.com\0" - "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" - "Subject\0RESEND [PATCH V9 2/2] ARM: dts: exynos5250: Enable ahci sata and sata phy\0" + "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" + "Subject\0Re: RESEND [PATCH V9 2/2] ARM: dts: exynos5250: Enable ahci sata and sata phy\0" "Date\0Tue, 4 Mar 2014 19:02:06 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yuvaraj Kumar C D <yuvaraj.cd@gmail.com>" + kgene.kim@samsung.com + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-doc@vger.kernel.org\0" + "Cc\0grant.likely@linaro.org" + joshi@samsung.com + swarren@wwwdotorg.org + mark.rutland@arm.com + galak@codeaurora.org + jg1.han@samsung.com + ks.giri@samsung.com + b.zolnierkie@samsung.com + t.figa@samsung.com + christoffer.dall@linaro.com + " Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>\0" "\00:1\0" "b\0" "\n" @@ -42,7 +58,7 @@ "> -- reg : <registers mapping>\n" "> -\n" "> -Example:\n" - "> - sata at ffe07000 {\n" + "> - sata@ffe07000 {\n" "> - compatible = \"samsung,exynos5-sata-phy\";\n" "> - reg = <0xffe07000 0x1000>;\n" "> - };\n" @@ -66,12 +82,12 @@ "> +- phy-names\t\t: as mentioned in phy-bindings.txt\n" ">\n" "> Example:\n" - "> - sata at ffe08000 {\n" + "> - sata@ffe08000 {\n" "> - compatible = \"samsung,exynos5-sata\";\n" "> - reg = <0xffe08000 0x1000>;\n" "> - interrupts = <115>;\n" "> - };\n" - "> +\tsata at 122f0000 {\n" + "> +\tsata@122f0000 {\n" "> +\t\tcompatible = \"snps,dwc-ahci\";\n" "> +\t\tsamsung,sata-freq = <66>;\n" "> +\t\treg = <0x122f0000 0x1ff>;\n" @@ -102,7 +118,7 @@ "> +- #phy-cells : from the generic phy bindings;\n" "> +\n" "> +Example:\n" - "> +\tsata_phy: sata-phy at 12170000 {\n" + "> +\tsata_phy: sata-phy@12170000 {\n" "> +\t\tcompatible = \"samsung,exynos5250-sata-phy\";\n" "> +\t\treg = <0x12170000 0x1ff>;\n" "> +\t\tclocks = <&clock 287>;\n" @@ -121,7 +137,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> +\t\treg = <0x38>;\n" "> +\t};\n" @@ -133,28 +149,28 @@ "> \t\t};\n" "> \t};\n" ">\n" - "> +\ti2c at 121D0000 {\n" + "> +\ti2c@121D0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,i2c-sda-delay = <100>;\n" "> +\t\tsamsung,i2c-max-bus-freq = <40000>;\n" "> +\t\tsamsung,i2c-slave-addr = <0x38>;\n" "> +\n" - "> +\t\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\t\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> +\t\t\treg = <0x38>;\n" "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tsata at 122F0000 {\n" + "> +\tsata@122F0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t};\n" "> +\n" - "> +\tsata-phy at 12170000 {\n" + "> +\tsata-phy@12170000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;\n" "> +\t};\n" "> +\n" - "> \tmmc_0: mmc at 12200000 {\n" + "> \tmmc_0: mmc@12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" @@ -167,33 +183,33 @@ ">\n" "> -\t\tsata-phy {\n" "> -\t\t\tcompatible = \"samsung,sata-phy\";\n" - "> +\t\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\t\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> \t\t\treg = <0x38>;\n" "> \t\t};\n" "> \t};\n" ">\n" - "> -\tsata at 122F0000 {\n" + "> -\tsata@122F0000 {\n" "> -\t\tsamsung,sata-freq = <66>;\n" "> -\t};\n" "> -\n" - "> \ti2c at 12C80000 {\n" + "> \ti2c@12C80000 {\n" "> \t\tsamsung,i2c-sda-delay = <100>;\n" "> \t\tsamsung,i2c-max-bus-freq = <66000>;\n" "> @@ -274,6 +270,15 @@\n" "> \t\t};\n" "> \t};\n" ">\n" - "> +\tsata at 122F0000 {\n" + "> +\tsata@122F0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t};\n" "> +\n" - "> +\tsata-phy at 12170000 {\n" + "> +\tsata-phy@12170000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;\n" "> +\t};\n" "> +\n" - "> \tmmc at 12200000 {\n" + "> \tmmc@12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi\n" @@ -211,7 +227,7 @@ "> @@ -233,16 +234,25 @@\n" "> \t};\n" ">\n" - "> \tsata at 122F0000 {\n" + "> \tsata@122F0000 {\n" "> -\t\tcompatible = \"samsung,exynos5-sata-ahci\";\n" "> +\t\tcompatible = \"snps,dwc-ahci\";\n" "> +\t\tsamsung,sata-freq = <66>;\n" @@ -224,9 +240,9 @@ "> +\t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> -\tsata-phy at 12170000 {\n" + "> -\tsata-phy@12170000 {\n" "> -\t\tcompatible = \"samsung,exynos5-sata-phy\";\n" - "> +\tsata_phy: sata-phy at 12170000 {\n" + "> +\tsata_phy: sata-phy@12170000 {\n" "> +\t\tcompatible = \"samsung,exynos5250-sata-phy\";\n" "> \t\treg = <0x12170000 0x1ff>;\n" "> +\t\tclocks = <&clock 287>;\n" @@ -236,16 +252,16 @@ "> +\t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> \ti2c_0: i2c at 12C60000 {\n" + "> \ti2c_0: i2c@12C60000 {\n" "> @@ -360,7 +370,7 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> -\ti2c at 121D0000 {\n" - "> +\ti2c_9: i2c at 121D0000 {\n" + "> -\ti2c@121D0000 {\n" + "> +\ti2c_9: i2c@121D0000 {\n" "> compatible = \"samsung,exynos5-sata-phy-i2c\";\n" "> reg = <0x121D0000 0x100>;\n" "> #address-cells = <1>;\n" > -11df066f9855e9069ad5c39b1a427e2ab0a7f1d54a7d50b18a24ced112ffd631 +402c1c4e70ff0611e8f7545d7410c6ddc3b7e8cb4fdb642124d2a32409918a6b
diff --git a/a/1.txt b/N2/1.txt index 50d4b7f..51107f8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -35,7 +35,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > -- reg : <registers mapping> > - > -Example: -> - sata at ffe07000 { +> - sata@ffe07000 { > - compatible = "samsung,exynos5-sata-phy"; > - reg = <0xffe07000 0x1000>; > - }; @@ -59,12 +59,12 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > +- phy-names : as mentioned in phy-bindings.txt > > Example: -> - sata at ffe08000 { +> - sata@ffe08000 { > - compatible = "samsung,exynos5-sata"; > - reg = <0xffe08000 0x1000>; > - interrupts = <115>; > - }; -> + sata at 122f0000 { +> + sata@122f0000 { > + compatible = "snps,dwc-ahci"; > + samsung,sata-freq = <66>; > + reg = <0x122f0000 0x1ff>; @@ -95,7 +95,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > +- #phy-cells : from the generic phy bindings; > + > +Example: -> + sata_phy: sata-phy at 12170000 { +> + sata_phy: sata-phy@12170000 { > + compatible = "samsung,exynos5250-sata-phy"; > + reg = <0x12170000 0x1ff>; > + clocks = <&clock 287>; @@ -114,7 +114,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + > +Example: > + -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > + reg = <0x38>; > + }; @@ -126,28 +126,28 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > }; > }; > -> + i2c at 121D0000 { +> + i2c@121D0000 { > + status = "okay"; > + samsung,i2c-sda-delay = <100>; > + samsung,i2c-max-bus-freq = <40000>; > + samsung,i2c-slave-addr = <0x38>; > + -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > + reg = <0x38>; > + }; > + }; > + -> + sata at 122F0000 { +> + sata@122F0000 { > + status = "okay"; > + }; > + -> + sata-phy at 12170000 { +> + sata-phy@12170000 { > + status = "okay"; > + samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>; > + }; > + -> mmc_0: mmc at 12200000 { +> mmc_0: mmc@12200000 { > status = "okay"; > num-slots = <1>; > diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -160,33 +160,33 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > > - sata-phy { > - compatible = "samsung,sata-phy"; -> + sata_phy_i2c:sata-phy at 38 { +> + sata_phy_i2c:sata-phy@38 { > + compatible = "samsung,exynos-sataphy-i2c"; > reg = <0x38>; > }; > }; > -> - sata at 122F0000 { +> - sata@122F0000 { > - samsung,sata-freq = <66>; > - }; > - -> i2c at 12C80000 { +> i2c@12C80000 { > samsung,i2c-sda-delay = <100>; > samsung,i2c-max-bus-freq = <66000>; > @@ -274,6 +270,15 @@ > }; > }; > -> + sata at 122F0000 { +> + sata@122F0000 { > + status = "okay"; > + }; > + -> + sata-phy at 12170000 { +> + sata-phy@12170000 { > + status = "okay"; > + samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>; > + }; > + -> mmc at 12200000 { +> mmc@12200000 { > status = "okay"; > num-slots = <1>; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi @@ -204,7 +204,7 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > @@ -233,16 +234,25 @@ > }; > -> sata at 122F0000 { +> sata@122F0000 { > - compatible = "samsung,exynos5-sata-ahci"; > + compatible = "snps,dwc-ahci"; > + samsung,sata-freq = <66>; @@ -217,9 +217,9 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "disabled"; > }; > -> - sata-phy at 12170000 { +> - sata-phy@12170000 { > - compatible = "samsung,exynos5-sata-phy"; -> + sata_phy: sata-phy at 12170000 { +> + sata_phy: sata-phy@12170000 { > + compatible = "samsung,exynos5250-sata-phy"; > reg = <0x12170000 0x1ff>; > + clocks = <&clock 287>; @@ -229,13 +229,13 @@ Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > + status = "disabled"; > }; > -> i2c_0: i2c at 12C60000 { +> i2c_0: i2c@12C60000 { > @@ -360,7 +370,7 @@ > status = "disabled"; > }; > -> - i2c at 121D0000 { -> + i2c_9: i2c at 121D0000 { +> - i2c@121D0000 { +> + i2c_9: i2c@121D0000 { > compatible = "samsung,exynos5-sata-phy-i2c"; > reg = <0x121D0000 0x100>; > #address-cells = <1>; diff --git a/a/content_digest b/N2/content_digest index 88639cb..bb47b11 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,24 @@ "ref\01393931452-18237-1-git-send-email-yuvaraj.cd@samsung.com\0" - "From\0kishon@ti.com (Kishon Vijay Abraham I)\0" - "Subject\0RESEND [PATCH V9 2/2] ARM: dts: exynos5250: Enable ahci sata and sata phy\0" + "From\0Kishon Vijay Abraham I <kishon@ti.com>\0" + "Subject\0Re: RESEND [PATCH V9 2/2] ARM: dts: exynos5250: Enable ahci sata and sata phy\0" "Date\0Tue, 4 Mar 2014 19:02:06 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Yuvaraj Kumar C D <yuvaraj.cd@gmail.com>" + <kgene.kim@samsung.com> + <linux-kernel@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <devicetree@vger.kernel.org> + " <linux-doc@vger.kernel.org>\0" + "Cc\0<grant.likely@linaro.org>" + <joshi@samsung.com> + <swarren@wwwdotorg.org> + <mark.rutland@arm.com> + <galak@codeaurora.org> + <jg1.han@samsung.com> + <ks.giri@samsung.com> + <b.zolnierkie@samsung.com> + <t.figa@samsung.com> + <christoffer.dall@linaro.com> + " Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>\0" "\00:1\0" "b\0" "\n" @@ -42,7 +58,7 @@ "> -- reg : <registers mapping>\n" "> -\n" "> -Example:\n" - "> - sata at ffe07000 {\n" + "> - sata@ffe07000 {\n" "> - compatible = \"samsung,exynos5-sata-phy\";\n" "> - reg = <0xffe07000 0x1000>;\n" "> - };\n" @@ -66,12 +82,12 @@ "> +- phy-names\t\t: as mentioned in phy-bindings.txt\n" ">\n" "> Example:\n" - "> - sata at ffe08000 {\n" + "> - sata@ffe08000 {\n" "> - compatible = \"samsung,exynos5-sata\";\n" "> - reg = <0xffe08000 0x1000>;\n" "> - interrupts = <115>;\n" "> - };\n" - "> +\tsata at 122f0000 {\n" + "> +\tsata@122f0000 {\n" "> +\t\tcompatible = \"snps,dwc-ahci\";\n" "> +\t\tsamsung,sata-freq = <66>;\n" "> +\t\treg = <0x122f0000 0x1ff>;\n" @@ -102,7 +118,7 @@ "> +- #phy-cells : from the generic phy bindings;\n" "> +\n" "> +Example:\n" - "> +\tsata_phy: sata-phy at 12170000 {\n" + "> +\tsata_phy: sata-phy@12170000 {\n" "> +\t\tcompatible = \"samsung,exynos5250-sata-phy\";\n" "> +\t\treg = <0x12170000 0x1ff>;\n" "> +\t\tclocks = <&clock 287>;\n" @@ -121,7 +137,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> +\t\treg = <0x38>;\n" "> +\t};\n" @@ -133,28 +149,28 @@ "> \t\t};\n" "> \t};\n" ">\n" - "> +\ti2c at 121D0000 {\n" + "> +\ti2c@121D0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,i2c-sda-delay = <100>;\n" "> +\t\tsamsung,i2c-max-bus-freq = <40000>;\n" "> +\t\tsamsung,i2c-slave-addr = <0x38>;\n" "> +\n" - "> +\t\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\t\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> +\t\t\treg = <0x38>;\n" "> +\t\t};\n" "> +\t};\n" "> +\n" - "> +\tsata at 122F0000 {\n" + "> +\tsata@122F0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t};\n" "> +\n" - "> +\tsata-phy at 12170000 {\n" + "> +\tsata-phy@12170000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;\n" "> +\t};\n" "> +\n" - "> \tmmc_0: mmc at 12200000 {\n" + "> \tmmc_0: mmc@12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts\n" @@ -167,33 +183,33 @@ ">\n" "> -\t\tsata-phy {\n" "> -\t\t\tcompatible = \"samsung,sata-phy\";\n" - "> +\t\tsata_phy_i2c:sata-phy at 38 {\n" + "> +\t\tsata_phy_i2c:sata-phy@38 {\n" "> +\t\t\tcompatible = \"samsung,exynos-sataphy-i2c\";\n" "> \t\t\treg = <0x38>;\n" "> \t\t};\n" "> \t};\n" ">\n" - "> -\tsata at 122F0000 {\n" + "> -\tsata@122F0000 {\n" "> -\t\tsamsung,sata-freq = <66>;\n" "> -\t};\n" "> -\n" - "> \ti2c at 12C80000 {\n" + "> \ti2c@12C80000 {\n" "> \t\tsamsung,i2c-sda-delay = <100>;\n" "> \t\tsamsung,i2c-max-bus-freq = <66000>;\n" "> @@ -274,6 +270,15 @@\n" "> \t\t};\n" "> \t};\n" ">\n" - "> +\tsata at 122F0000 {\n" + "> +\tsata@122F0000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t};\n" "> +\n" - "> +\tsata-phy at 12170000 {\n" + "> +\tsata-phy@12170000 {\n" "> +\t\tstatus = \"okay\";\n" "> +\t\tsamsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>;\n" "> +\t};\n" "> +\n" - "> \tmmc at 12200000 {\n" + "> \tmmc@12200000 {\n" "> \t\tstatus = \"okay\";\n" "> \t\tnum-slots = <1>;\n" "> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi\n" @@ -211,7 +227,7 @@ "> @@ -233,16 +234,25 @@\n" "> \t};\n" ">\n" - "> \tsata at 122F0000 {\n" + "> \tsata@122F0000 {\n" "> -\t\tcompatible = \"samsung,exynos5-sata-ahci\";\n" "> +\t\tcompatible = \"snps,dwc-ahci\";\n" "> +\t\tsamsung,sata-freq = <66>;\n" @@ -224,9 +240,9 @@ "> +\t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> -\tsata-phy at 12170000 {\n" + "> -\tsata-phy@12170000 {\n" "> -\t\tcompatible = \"samsung,exynos5-sata-phy\";\n" - "> +\tsata_phy: sata-phy at 12170000 {\n" + "> +\tsata_phy: sata-phy@12170000 {\n" "> +\t\tcompatible = \"samsung,exynos5250-sata-phy\";\n" "> \t\treg = <0x12170000 0x1ff>;\n" "> +\t\tclocks = <&clock 287>;\n" @@ -236,16 +252,16 @@ "> +\t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> \ti2c_0: i2c at 12C60000 {\n" + "> \ti2c_0: i2c@12C60000 {\n" "> @@ -360,7 +370,7 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> -\ti2c at 121D0000 {\n" - "> +\ti2c_9: i2c at 121D0000 {\n" + "> -\ti2c@121D0000 {\n" + "> +\ti2c_9: i2c@121D0000 {\n" "> compatible = \"samsung,exynos5-sata-phy-i2c\";\n" "> reg = <0x121D0000 0x100>;\n" "> #address-cells = <1>;\n" > -11df066f9855e9069ad5c39b1a427e2ab0a7f1d54a7d50b18a24ced112ffd631 +e428988616bbc4ba093279be2654d38aa873eb7f155dfec044e3c6ea49a49fe4
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.