diff mbox

ARM: at91/dt: Disable SPI on at91sam9x5ek to allow MCI1 to work.

Message ID 1487265388-29390-1-git-send-email-cristian.birsan@microchip.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cristian Birsan Feb. 16, 2017, 5:16 p.m. UTC 
From: Cristian Birsan <cristian.birsan@microchip.com>

The A13 hardware line is shared by SPI and MCI1 controller.This patch
disables the SPI controller so that the MCI1 (the big MMC card slot) can
be used.

Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>
---
 arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas Ferre Feb. 20, 2017, 10:20 a.m. UTC | #1 
Le 16/02/2017 à 18:16, cristian.birsan@microchip.com a écrit :
> From: Cristian Birsan <cristian.birsan@microchip.com>
> 
> The A13 hardware line is shared by SPI and MCI1 controller.This patch
> disables the SPI controller so that the MCI1 (the big MMC card slot) can
> be used.
> 
> Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>

Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>

> ---
>  arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
> index 696b8ba..9d2bbc4 100644
> --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
> @@ -116,7 +116,7 @@
>  			};
>  
>  			spi0: spi@f0000000 {
> -				status = "okay";
> +				status = "disabled"; /* conflicts with mmc1 */
>  				cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
>  				m25p80@0 {
>  					compatible = "atmel,at25df321a";
>
Alexandre Belloni March 5, 2017, 10:55 p.m. UTC | #2 
The proper commit prefix was "ARM: dts: at91:"

On 16/02/2017 at 19:16:28 +0200, cristian.birsan@microchip.com wrote:
> From: Cristian Birsan <cristian.birsan@microchip.com>
> 
> The A13 hardware line is shared by SPI and MCI1 controller.This patch
> disables the SPI controller so that the MCI1 (the big MMC card slot) can
> be used.
> 
> Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>
> ---
>  arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Applied, thanks.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 696b8ba..9d2bbc4 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -116,7 +116,7 @@ 
 			};
 
 			spi0: spi@f0000000 {
-				status = "okay";
+				status = "disabled"; /* conflicts with mmc1 */
 				cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
 				m25p80@0 {
 					compatible = "atmel,at25df321a";