diff mbox

ARM: dts: Fix mmc node on exynos5250 snow board

Message ID 1386237974-2255-1-git-send-email-yuvaraj.cd@samsung.com
State New, archived
Headers show

Commit Message

Yuvaraj CD Dec. 5, 2013, 10:06 a.m. UTC
Commits 64c138a ("ARM: dts: Move fifo-depth property from exynos5250
board dts") and 0c3de788 ("ARM: dts: change status property of dwmmc
nodes for exynos5250") missed out handling the exynos5250 snow dts file.
Delete the fifo-depth property and enable the mmc node in the snow dts
file.

Signed-off-by : Abhilash Kesavan <a.kesavan@samsung.com>

Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
---
 arch/arm/boot/dts/cros5250-common.dtsi |    7 -------
 arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

Comments

Sonny Rao Dec. 5, 2013, 6:49 p.m. UTC | #1
On Thu, Dec 5, 2013 at 2:06 AM, Yuvaraj Kumar C D <yuvaraj.cd@gmail.com> wrote:
> Commits 64c138a ("ARM: dts: Move fifo-depth property from exynos5250
> board dts") and 0c3de788 ("ARM: dts: change status property of dwmmc
> nodes for exynos5250") missed out handling the exynos5250 snow dts file.
> Delete the fifo-depth property and enable the mmc node in the snow dts
> file.
>

Since this is really fixing two different issues, even though they
both affect dw_mmc, would you mind splitting this up into two
different commits?

> Signed-off-by : Abhilash Kesavan <a.kesavan@samsung.com>
>
> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
> ---
>  arch/arm/boot/dts/cros5250-common.dtsi |    7 -------
>  arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>  2 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
> index 6470536..2dd70e9 100644
> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> @@ -233,7 +233,6 @@
>                 num-slots = <1>;
>                 supports-highspeed;
>                 broken-cd;
> -               fifo-depth = <0x80>;

Why are you deleting fifo-depth?

>                 card-detect-delay = <200>;
>                 samsung,dw-mshc-ciu-div = <3>;
>                 samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -247,14 +246,9 @@
>                 };
>         };
>
> -       mmc@12210000 {
> -               status = "disabled";
> -       };
> -
>         mmc@12220000 {
>                 num-slots = <1>;
>                 supports-highspeed;
> -               fifo-depth = <0x80>;
>                 card-detect-delay = <200>;
>                 samsung,dw-mshc-ciu-div = <3>;
>                 samsung,dw-mshc-sdr-timing = <2 3>;
> @@ -273,7 +267,6 @@
>                 num-slots = <1>;
>                 supports-highspeed;
>                 broken-cd;
> -               fifo-depth = <0x80>;
>                 card-detect-delay = <200>;
>                 samsung,dw-mshc-ciu-div = <3>;
>                 samsung,dw-mshc-sdr-timing = <2 3>;
> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
> index a9395c4..67484d1 100644
> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> @@ -171,11 +171,20 @@
>                 };
>         };
>
> +       mmc@12200000 {
> +               status = "okay";
> +       };
> +
> +       mmc@12220000 {
> +               status = "okay";
> +       };
> +
>         /*
>          * On Snow we've got SIP WiFi and so can keep drive strengths low to
>          * reduce EMI.
>          */
>         mmc@12230000 {
> +               status = "okay";
>                 slot@0 {
>                         pinctrl-names = "default";
>                         pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yuvaraj CD Dec. 6, 2013, 5 a.m. UTC | #2
On Fri, Dec 6, 2013 at 12:19 AM, Sonny Rao <sonnyrao@chromium.org> wrote:
> On Thu, Dec 5, 2013 at 2:06 AM, Yuvaraj Kumar C D <yuvaraj.cd@gmail.com> wrote:
>> Commits 64c138a ("ARM: dts: Move fifo-depth property from exynos5250
>> board dts") and 0c3de788 ("ARM: dts: change status property of dwmmc
>> nodes for exynos5250") missed out handling the exynos5250 snow dts file.
>> Delete the fifo-depth property and enable the mmc node in the snow dts
>> file.
>>
>
> Since this is really fixing two different issues, even though they
> both affect dw_mmc, would you mind splitting this up into two
> different commits?
 OK, I will split into two and repost.
>
>> Signed-off-by : Abhilash Kesavan <a.kesavan@samsung.com>
>>
>> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
>> ---
>>  arch/arm/boot/dts/cros5250-common.dtsi |    7 -------
>>  arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>>  2 files changed, 9 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
>> index 6470536..2dd70e9 100644
>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>> @@ -233,7 +233,6 @@
>>                 num-slots = <1>;
>>                 supports-highspeed;
>>                 broken-cd;
>> -               fifo-depth = <0x80>;
>
> Why are you deleting fifo-depth?
fifo-depth property has been moved to SOC specific file exynos5250.dtsi
>
>>                 card-detect-delay = <200>;
>>                 samsung,dw-mshc-ciu-div = <3>;
>>                 samsung,dw-mshc-sdr-timing = <2 3>;
>> @@ -247,14 +246,9 @@
>>                 };
>>         };
>>
>> -       mmc@12210000 {
>> -               status = "disabled";
>> -       };
>> -
>>         mmc@12220000 {
>>                 num-slots = <1>;
>>                 supports-highspeed;
>> -               fifo-depth = <0x80>;
>>                 card-detect-delay = <200>;
>>                 samsung,dw-mshc-ciu-div = <3>;
>>                 samsung,dw-mshc-sdr-timing = <2 3>;
>> @@ -273,7 +267,6 @@
>>                 num-slots = <1>;
>>                 supports-highspeed;
>>                 broken-cd;
>> -               fifo-depth = <0x80>;
>>                 card-detect-delay = <200>;
>>                 samsung,dw-mshc-ciu-div = <3>;
>>                 samsung,dw-mshc-sdr-timing = <2 3>;
>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
>> index a9395c4..67484d1 100644
>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>> @@ -171,11 +171,20 @@
>>                 };
>>         };
>>
>> +       mmc@12200000 {
>> +               status = "okay";
>> +       };
>> +
>> +       mmc@12220000 {
>> +               status = "okay";
>> +       };
>> +
>>         /*
>>          * On Snow we've got SIP WiFi and so can keep drive strengths low to
>>          * reduce EMI.
>>          */
>>         mmc@12230000 {
>> +               status = "okay";
>>                 slot@0 {
>>                         pinctrl-names = "default";
>>                         pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
>> --
>> 1.7.9.5
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 6470536..2dd70e9 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -233,7 +233,6 @@ 
 		num-slots = <1>;
 		supports-highspeed;
 		broken-cd;
-		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -247,14 +246,9 @@ 
 		};
 	};
 
-	mmc@12210000 {
-		status = "disabled";
-	};
-
 	mmc@12220000 {
 		num-slots = <1>;
 		supports-highspeed;
-		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -273,7 +267,6 @@ 
 		num-slots = <1>;
 		supports-highspeed;
 		broken-cd;
-		fifo-depth = <0x80>;
 		card-detect-delay = <200>;
 		samsung,dw-mshc-ciu-div = <3>;
 		samsung,dw-mshc-sdr-timing = <2 3>;
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index a9395c4..67484d1 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -171,11 +171,20 @@ 
 		};
 	};
 
+	mmc@12200000 {
+		status = "okay";
+	};
+
+	mmc@12220000 {
+		status = "okay";
+	};
+
 	/*
 	 * On Snow we've got SIP WiFi and so can keep drive strengths low to
 	 * reduce EMI.
 	 */
 	mmc@12230000 {
+		status = "okay";
 		slot@0 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;