[PATCH 1/2] ARM: at91: at91sam9g45: set default mmc pinctrl-names

[PATCH 1/2] ARM: at91: at91sam9g45: set default mmc pinctrl-names

[ludovic.desroches at atmel.com]

From: Ludovic Desroches <ludovic.desroches@atmel.com>

pinctrl-names property was missing from mmc nodes.

Cc: <stable@vger.kernel.org> #3.11+
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
 arch/arm/boot/dts/at91sam9g45.dtsi |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index c3e5148..cf7de80 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -618,6 +618,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xfff80000 0x600>;
 				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
+				pinctrl-names = "default";
 				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
@@ -629,6 +630,7 @@
 				compatible = "atmel,hsmci";
 				reg = <0xfffd0000 0x600>;
 				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
+				pinctrl-names = "default";
 				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
 				dma-names = "rxtx";
 				#address-cells = <1>;
-- 
1.7.9.5

[PATCH 2/2] ARM: at91: at91sam9g45: add i2c pinctrl

[ludovic.desroches at atmel.com]

From: Ludovic Desroches <ludovic.desroches@atmel.com>

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
---
 arch/arm/boot/dts/at91sam9g45.dtsi |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index cf7de80..dbed3b2 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -143,6 +143,22 @@
 					};
 				};
 
+				i2c0 {
+					pinctrl_i2c0: i2c0-0 {
+						atmel,pins =
+							<AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PA21 periph A TWCK0 */
+							 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PA20 periph A TWD0 */
+					};
+				};
+
+				i2c1 {
+					pinctrl_i2c1: i2c1-0 {
+						atmel,pins =
+							<AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB11 periph A TWCK1 */
+							 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PB10 periph A TWD1 */
+					};
+				};
+
 				usart0 {
 					pinctrl_usart0: usart0-0 {
 						atmel,pins =
@@ -542,6 +558,8 @@
 				compatible = "atmel,at91sam9g10-i2c";
 				reg = <0xfff84000 0x100>;
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c0>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				status = "disabled";
@@ -551,6 +569,8 @@
 				compatible = "atmel,at91sam9g10-i2c";
 				reg = <0xfff88000 0x100>;
 				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_i2c1>;
 				#address-cells = <1>;
 				#size-cells = <0>;
 				status = "disabled";
-- 
1.7.9.5

[PATCH 1/2] ARM: at91: at91sam9g45: set default mmc pinctrl-names

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:49 Fri 22 Nov     , ludovic.desroches at atmel.com wrote:
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
> 
> pinctrl-names property was missing from mmc nodes.
> 
> Cc: <stable@vger.kernel.org> #3.11+
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
on both Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  arch/arm/boot/dts/at91sam9g45.dtsi |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
> index c3e5148..cf7de80 100644
> --- a/arch/arm/boot/dts/at91sam9g45.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
> @@ -618,6 +618,7 @@
>  				compatible = "atmel,hsmci";
>  				reg = <0xfff80000 0x600>;
>  				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
> +				pinctrl-names = "default";
>  				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
>  				dma-names = "rxtx";
>  				#address-cells = <1>;
> @@ -629,6 +630,7 @@
>  				compatible = "atmel,hsmci";
>  				reg = <0xfffd0000 0x600>;
>  				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
> +				pinctrl-names = "default";
>  				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
>  				dma-names = "rxtx";
>  				#address-cells = <1>;
> -- 
> 1.7.9.5
> 

[PATCH 1/2] ARM: at91: at91sam9g45: set default mmc pinctrl-names

[Nicolas Ferre]

On 22/11/2013 14:49, ludovic.desroches at atmel.com :
> From: Ludovic Desroches <ludovic.desroches@atmel.com>
>
> pinctrl-names property was missing from mmc nodes.
>
> Cc: <stable@vger.kernel.org> #3.11+
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>

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

and queued in at91-3.14-dt.

Thanks, bye,

> ---
>   arch/arm/boot/dts/at91sam9g45.dtsi |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
> index c3e5148..cf7de80 100644
> --- a/arch/arm/boot/dts/at91sam9g45.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g45.dtsi
> @@ -618,6 +618,7 @@
>   				compatible = "atmel,hsmci";
>   				reg = <0xfff80000 0x600>;
>   				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
> +				pinctrl-names = "default";
>   				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
>   				dma-names = "rxtx";
>   				#address-cells = <1>;
> @@ -629,6 +630,7 @@
>   				compatible = "atmel,hsmci";
>   				reg = <0xfffd0000 0x600>;
>   				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
> +				pinctrl-names = "default";
>   				dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
>   				dma-names = "rxtx";
>   				#address-cells = <1>;
>


-- 
Nicolas Ferre