diff mbox

[1/3] ARM: dts: Leave Exynos5250 SPI controller disabled by default

Message ID 1385381710-5212-1-git-send-email-broonie@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Mark Brown Nov. 25, 2013, 12:15 p.m. UTC
From: Mark Brown <broonie@linaro.org>

Rather than requiring each board to explicitly disable the SPI controllers
it is not using instead require boards to enable those that they are using.
This is less work overall since normally at most one of the controllers is
in use and avoids issues caused by inappropriate pinmuxing.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Tomasz Figa <t.figa@samsung.com>
---
 arch/arm/boot/dts/cros5250-common.dtsi    |  9 +--------
 arch/arm/boot/dts/exynos5250-arndale.dts  | 12 ------------
 arch/arm/boot/dts/exynos5250-smdk5250.dts |  6 ++----
 arch/arm/boot/dts/exynos5250.dtsi         |  3 +++
 4 files changed, 6 insertions(+), 24 deletions(-)

Comments

Tomasz Figa Dec. 9, 2013, 3:23 p.m. UTC | #1
Hi Kukjin,

On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
> 
> Rather than requiring each board to explicitly disable the SPI controllers
> it is not using instead require boards to enable those that they are using.
> This is less work overall since normally at most one of the controllers is
> in use and avoids issues caused by inappropriate pinmuxing.
> 
> Signed-off-by: Mark Brown <broonie@linaro.org>
> Acked-by: Tomasz Figa <t.figa@samsung.com>
> ---
>  arch/arm/boot/dts/cros5250-common.dtsi    |  9 +--------
>  arch/arm/boot/dts/exynos5250-arndale.dts  | 12 ------------
>  arch/arm/boot/dts/exynos5250-smdk5250.dts |  6 ++----
>  arch/arm/boot/dts/exynos5250.dtsi         |  3 +++
>  4 files changed, 6 insertions(+), 24 deletions(-)

Seems like you have missed this series. Could you apply it?

Best regards,
Tomasz
Kim Kukjin Dec. 9, 2013, 9:07 p.m. UTC | #2
On 12/10/13 00:23, Tomasz Figa wrote:
> Hi Kukjin,
>
Hi,

> On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
>> From: Mark Brown<broonie@linaro.org>
>>
>> Rather than requiring each board to explicitly disable the SPI controllers
>> it is not using instead require boards to enable those that they are using.
>> This is less work overall since normally at most one of the controllers is
>> in use and avoids issues caused by inappropriate pinmuxing.
>>
>> Signed-off-by: Mark Brown<broonie@linaro.org>
>> Acked-by: Tomasz Figa<t.figa@samsung.com>
>> ---
>>   arch/arm/boot/dts/cros5250-common.dtsi    |  9 +--------
>>   arch/arm/boot/dts/exynos5250-arndale.dts  | 12 ------------
>>   arch/arm/boot/dts/exynos5250-smdk5250.dts |  6 ++----
>>   arch/arm/boot/dts/exynos5250.dtsi         |  3 +++
>>   4 files changed, 6 insertions(+), 24 deletions(-)
>
> Seems like you have missed this series. Could you apply it?
>
Yeah, thanks for your gentle reminder.

+ Doug and Olof

BTW, Doug and Olof, are you OK with changing the name of cros5250-common 
DT file? Basically, I agree with Mark's patch.

- Kukjin
Doug Anderson Dec. 10, 2013, 12:48 a.m. UTC | #3
Hi,

On Mon, Dec 9, 2013 at 1:07 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 12/10/13 00:23, Tomasz Figa wrote:
>>
>> Hi Kukjin,
>>
> Hi,
>
>
>> On Monday 25 of November 2013 12:15:08 Mark Brown wrote:
>>>
>>> From: Mark Brown<broonie@linaro.org>
>>>
>>> Rather than requiring each board to explicitly disable the SPI
>>> controllers
>>> it is not using instead require boards to enable those that they are
>>> using.
>>> This is less work overall since normally at most one of the controllers
>>> is
>>> in use and avoids issues caused by inappropriate pinmuxing.
>>>
>>> Signed-off-by: Mark Brown<broonie@linaro.org>
>>> Acked-by: Tomasz Figa<t.figa@samsung.com>
>>> ---
>>>   arch/arm/boot/dts/cros5250-common.dtsi    |  9 +--------
>>>   arch/arm/boot/dts/exynos5250-arndale.dts  | 12 ------------
>>>   arch/arm/boot/dts/exynos5250-smdk5250.dts |  6 ++----
>>>   arch/arm/boot/dts/exynos5250.dtsi         |  3 +++
>>>   4 files changed, 6 insertions(+), 24 deletions(-)
>>
>>
>> Seems like you have missed this series. Could you apply it?
>>
> Yeah, thanks for your gentle reminder.
>
> + Doug and Olof
>
> BTW, Doug and Olof, are you OK with changing the name of cros5250-common DT
> file? Basically, I agree with Mark's patch.

I don't see anything that's changing a name, so perhaps I'm confused
or missing something.  Mark's patch looks good to me so I'll add a
reviewed by...

-Doug
Doug Anderson Dec. 10, 2013, 12:57 a.m. UTC | #4
Hi,

On Mon, Nov 25, 2013 at 4:15 AM, Mark Brown <broonie@kernel.org> wrote:
> From: Mark Brown <broonie@linaro.org>
>
> Rather than requiring each board to explicitly disable the SPI controllers
> it is not using instead require boards to enable those that they are using.
> This is less work overall since normally at most one of the controllers is
> in use and avoids issues caused by inappropriate pinmuxing.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
> Acked-by: Tomasz Figa <t.figa@samsung.com>
> ---
>  arch/arm/boot/dts/cros5250-common.dtsi    |  9 +--------
>  arch/arm/boot/dts/exynos5250-arndale.dts  | 12 ------------
>  arch/arm/boot/dts/exynos5250-smdk5250.dts |  6 ++----
>  arch/arm/boot/dts/exynos5250.dtsi         |  3 +++
>  4 files changed, 6 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
> index dc259e8b8a73..0fcca2930c61 100644
> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> @@ -286,19 +286,12 @@
>                 };
>         };
>
> -       spi_0: spi@12d20000 {
> -               status = "disabled";
> -       };
> -
>         spi_1: spi@12d30000 {
> +               status = "okay";
>                 samsung,spi-src-clk = <0>;
>                 num-cs = <1>;
>         };
>
> -       spi_2: spi@12d40000 {
> -               status = "disabled";
> -       };
> -
>         hdmi {
>                 hpd-gpio = <&gpx3 7 0>;
>         };
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
> index 684527087aa4..0385b58116ec 100644
> --- a/arch/arm/boot/dts/exynos5250-arndale.dts
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -434,18 +434,6 @@
>                 status = "okay";
>         };
>
> -       spi_0: spi@12d20000 {
> -               status = "disabled";
> -       };
> -
> -       spi_1: spi@12d30000 {
> -               status = "disabled";
> -       };
> -
> -       spi_2: spi@12d40000 {
> -               status = "disabled";
> -       };
> -
>         gpio_keys {
>                 compatible = "gpio-keys";
>
> diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> index f86d56760a45..5d0395e07eee 100644
> --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
> +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
> @@ -189,6 +189,8 @@
>         };
>
>         spi_1: spi@12d30000 {
> +               status = "okay";
> +
>                 w25q80bw@0 {
>                         #address-cells = <1>;
>                         #size-cells = <1>;
> @@ -214,10 +216,6 @@
>                 };
>         };
>
> -       spi_2: spi@12d40000 {
> -               status = "disabled";
> -       };
> -
>         hdmi {
>                 hpd-gpio = <&gpx3 7 0>;
>         };

I'm a little surprised that I don't see removal of spi_0 on SMDK5250.
When I apply your patch to ToT Linux I still see this in
"exynos5250-smdk5250.dts":

        spi_0: spi@12d20000 {
                status = "disabled";
        };

Other than that things look good to me and you can add my Reviewed-by:

Reviewed-by: Doug Anderson <dianders@chromium.org>


-Doug
Mark Brown Dec. 10, 2013, 11:13 a.m. UTC | #5
On Mon, Dec 09, 2013 at 04:57:01PM -0800, Doug Anderson wrote:

> I'm a little surprised that I don't see removal of spi_0 on SMDK5250.
> When I apply your patch to ToT Linux I still see this in
> "exynos5250-smdk5250.dts":

>         spi_0: spi@12d20000 {
>                 status = "disabled";
>         };

I suspect that one went AWOL during rebasing - these have been kicking
around since September.  Resent with that added.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index dc259e8b8a73..0fcca2930c61 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -286,19 +286,12 @@ 
 		};
 	};
 
-	spi_0: spi@12d20000 {
-		status = "disabled";
-	};
-
 	spi_1: spi@12d30000 {
+		status = "okay";
 		samsung,spi-src-clk = <0>;
 		num-cs = <1>;
 	};
 
-	spi_2: spi@12d40000 {
-		status = "disabled";
-	};
-
 	hdmi {
 		hpd-gpio = <&gpx3 7 0>;
 	};
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 684527087aa4..0385b58116ec 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -434,18 +434,6 @@ 
 		status = "okay";
 	};
 
-	spi_0: spi@12d20000 {
-		status = "disabled";
-	};
-
-	spi_1: spi@12d30000 {
-		status = "disabled";
-	};
-
-	spi_2: spi@12d40000 {
-		status = "disabled";
-	};
-
 	gpio_keys {
 		compatible = "gpio-keys";
 
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index f86d56760a45..5d0395e07eee 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -189,6 +189,8 @@ 
 	};
 
 	spi_1: spi@12d30000 {
+		status = "okay";
+
 		w25q80bw@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -214,10 +216,6 @@ 
 		};
 	};
 
-	spi_2: spi@12d40000 {
-		status = "disabled";
-	};
-
 	hdmi {
 		hpd-gpio = <&gpx3 7 0>;
 	};
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 9db5047812f3..9b58532854e1 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -349,6 +349,7 @@ 
 
 	spi_0: spi@12d20000 {
 		compatible = "samsung,exynos4210-spi";
+		status = "disabled";
 		reg = <0x12d20000 0x100>;
 		interrupts = <0 66 0>;
 		dmas = <&pdma0 5
@@ -364,6 +365,7 @@ 
 
 	spi_1: spi@12d30000 {
 		compatible = "samsung,exynos4210-spi";
+		status = "disabled";
 		reg = <0x12d30000 0x100>;
 		interrupts = <0 67 0>;
 		dmas = <&pdma1 5
@@ -379,6 +381,7 @@ 
 
 	spi_2: spi@12d40000 {
 		compatible = "samsung,exynos4210-spi";
+		status = "disabled";
 		reg = <0x12d40000 0x100>;
 		interrupts = <0 68 0>;
 		dmas = <&pdma0 7