[Resend v6 PATCH 1/2] ARM: at91: atmel-ssc: add pinctrl nodes

[Resend v6 PATCH 1/2] ARM: at91: atmel-ssc: add pinctrl nodes

[Bo Shen]

Add pinctrl nodes for atmel ssc peripheral

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
Resend:
  Split one patch into two.
    - one add pinctrl nodes
    - one add pinctrl consumer
---
 arch/arm/boot/dts/at91sam9260.dtsi |   18 ++++++++++++++++++
 arch/arm/boot/dts/at91sam9263.dtsi |   36 ++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91sam9g45.dtsi |   36 ++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91sam9n12.dtsi |   26 ++++++++++++++++++++++++++
 arch/arm/boot/dts/at91sam9x5.dtsi  |   32 +++++++++++++++++++++++++-------
 5 files changed, 141 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 3164dcd..f9dc7db 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -217,6 +217,22 @@
 					};
 				};
 
+				ssc0 {
+					pinctrl_ssc0_tx: ssc0_tx-0 {
+						atmel,pins =
+							<1 16 0x1 0x0	/* PB16 periph A */
+							 1 17 0x1 0x0	/* PB17 periph A */
+							 1 18 0x1 0x0>;	/* PB18 periph A */
+					};
+
+					pinctrl_ssc0_rx: ssc0_rx-0 {
+						atmel,pins =
+							<1 19 0x1 0x0	/* PB19 periph A */
+							 1 20 0x1 0x0	/* PB20 periph A */
+							 1 21 0x1 0x0>;	/* PB21 periph A */
+					};
+				};
+
 				pioA: gpio@fffff400 {
 					compatible = "atmel,at91rm9200-gpio";
 					reg = <0xfffff400 0x200>;
@@ -350,6 +366,8 @@
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfffbc000 0x4000>;
 				interrupts = <14 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 				status = "disable";
 			};
 
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 96e0bc9..6e9a4ff 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -165,6 +165,38 @@
 					};
 				};
 
+				ssc0 {
+					pinctrl_ssc0_tx: ssc0_tx-0 {
+						atmel,pins =
+							<1 0 0x2 0x0	/* PB0 periph B */
+							 1 1 0x2 0x0	/* PB1 periph B */
+							 1 2 0x2 0x0>;	/* PB2 periph B */
+					};
+
+					pinctrl_ssc0_rx: ssc0_rx-0 {
+						atmel,pins =
+							<1 3 0x2 0x0	/* PB3 periph B */
+							 1 4 0x2 0x0	/* PB4 periph B */
+							 1 5 0x2 0x0>;	/* PB5 periph B */
+					};
+				};
+
+				ssc1 {
+					pinctrl_ssc1_tx: ssc1_tx-0 {
+						atmel,pins =
+							<1 6 0x1 0x0	/* PB6 periph A */
+							 1 7 0x1 0x0	/* PB7 periph A */
+							 1 8 0x1 0x0>;	/* PB8 periph A */
+					};
+
+					pinctrl_ssc1_rx: ssc1_rx-0 {
+						atmel,pins =
+							<1 9 0x1 0x0	/* PB9 periph A */
+							 1 10 0x1 0x0	/* PB10 periph A */
+							 1 11 0x1 0x0>;	/* PB11 periph A */
+					};
+				};
+
 				pioA: gpio@fffff200 {
 					compatible = "atmel,at91rm9200-gpio";
 					reg = <0xfffff200 0x200>;
@@ -262,6 +294,8 @@
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfff98000 0x4000>;
 				interrupts = <16 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 				status = "disable";
 			};
 
@@ -269,6 +303,8 @@
 				compatible = "atmel,at91rm9200-ssc";
 				reg = <0xfff9c000 0x4000>;
 				interrupts = <17 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 				status = "disable";
 			};
 
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index c40c3eb..63cf206 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -198,6 +198,38 @@
 					};
 				};
 
+				ssc0 {
+					pinctrl_ssc0_tx: ssc0_tx-0 {
+						atmel,pins =
+							<3 0 0x1 0x0	/* PD0 periph A */
+							 3 1 0x1 0x0	/* PD1 periph A */
+							 3 2 0x1 0x0>;	/* PD2 periph A */
+					};
+
+					pinctrl_ssc0_rx: ssc0_rx-0 {
+						atmel,pins =
+							<3 3 0x1 0x0	/* PD3 periph A */
+							 3 4 0x1 0x0	/* PD4 periph A */
+							 3 5 0x1 0x0>;	/* PD5 periph A */
+					};
+				};
+
+				ssc1 {
+					pinctrl_ssc1_tx: ssc1_tx-0 {
+						atmel,pins =
+							<3 10 0x1 0x0	/* PD10 periph A */
+							 3 11 0x1 0x0	/* PD11 periph A */
+							 3 12 0x1 0x0>;	/* PD12 periph A */
+					};
+
+					pinctrl_ssc1_rx: ssc1_rx-0 {
+						atmel,pins =
+							<3 13 0x1 0x0	/* PD13 periph A */
+							 3 14 0x1 0x0	/* PD14 periph A */
+							 3 15 0x1 0x0>;	/* PD15 periph A */
+					};
+				};
+
 				pioA: gpio@fffff200 {
 					compatible = "atmel,at91rm9200-gpio";
 					reg = <0xfffff200 0x200>;
@@ -331,6 +363,8 @@
 				compatible = "atmel,at91sam9g45-ssc";
 				reg = <0xfff9c000 0x4000>;
 				interrupts = <16 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
 				status = "disable";
 			};
 
@@ -338,6 +372,8 @@
 				compatible = "atmel,at91sam9g45-ssc";
 				reg = <0xfffa0000 0x4000>;
 				interrupts = <17 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
 				status = "disable";
 			};
 
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 7b644c5..b211da6 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -28,6 +28,7 @@
 		tcb1 = &tcb1;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
+		ssc0 = &ssc0;
 	};
 	cpus {
 		cpu@0 {
@@ -199,6 +200,22 @@
 					};
 				};
 
+				ssc0 {
+					pinctrl_ssc0_tx: ssc0_tx-0 {
+						atmel,pins =
+							<0 24 0x2 0x0	/* PA24 periph B */
+							 0 25 0x2 0x0	/* PA25 periph B */
+							 0 26 0x2 0x0>;	/* PA26 periph B */
+					};
+
+					pinctrl_ssc0_rx: ssc0_rx-0 {
+						atmel,pins =
+							<0 27 0x2 0x0	/* PA27 periph B */
+							 0 28 0x2 0x0	/* PA28 periph B */
+							 0 29 0x2 0x0>;	/* PA29 periph B */
+					};
+				};
+
 				pioA: gpio@fffff400 {
 					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 					reg = <0xfffff400 0x200>;
@@ -249,6 +266,15 @@
 				status = "disabled";
 			};
 
+			ssc0: ssc@f0010000 {
+				compatible = "atmel,at91sam9g45-ssc";
+				reg = <0xf0010000 0x4000>;
+				interrupts = <28 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+				status = "disable";
+			};
+
 			usart0: serial@f801c000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xf801c000 0x4000>;
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1cb26c28..df84f39 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -88,13 +88,6 @@
 				interrupts = <1 4 7>;
 			};
 
-			ssc0: ssc@f0010000 {
-				compatible = "atmel,at91sam9g45-ssc";
-				reg = <0xf0010000 0x4000>;
-				interrupts = <28 4 5>;
-				status = "disable";
-			};
-
 			tcb0: timer@f8008000 {
 				compatible = "atmel,at91sam9x5-tcb";
 				reg = <0xf8008000 0x100>;
@@ -214,6 +207,22 @@
 					};
 				};
 
+				ssc0 {
+					pinctrl_ssc0_tx: ssc0_tx-0 {
+						atmel,pins =
+							<0 24 0x2 0x0	/* PA24 periph B */
+							 0 25 0x2 0x0	/* PA25 periph B */
+							 0 26 0x2 0x0>;	/* PA26 periph B */
+					};
+
+					pinctrl_ssc0_rx: ssc0_rx-0 {
+						atmel,pins =
+							<0 27 0x2 0x0	/* PA27 periph B */
+							 0 28 0x2 0x0	/* PA28 periph B */
+							 0 29 0x2 0x0>;	/* PA29 periph B */
+					};
+				};
+
 				pioA: gpio@fffff400 {
 					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 					reg = <0xfffff400 0x200>;
@@ -266,6 +275,15 @@
 				status = "disabled";
 			};
 
+			ssc0: ssc@f0010000 {
+				compatible = "atmel,at91sam9g45-ssc";
+				reg = <0xf0010000 0x4000>;
+				interrupts = <28 4 5>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+				status = "disable";
+			};
+
 			usart0: serial@f801c000 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xf801c000 0x200>;
-- 
1.7.9.5

[Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Bo Shen]

Add pinctrl consumer for atmel ssc peripheral

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
Resend:
  Split one patch into two.
    - one add pinctrl nodes
    - one add pinctrl consumer
---
 drivers/misc/atmel-ssc.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index a769719..3b3d0e0 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 
 #include <linux/of.h>
+#include <linux/pinctrl/consumer.h>
 
 /* Serialize access to ssc_list and user count */
 static DEFINE_SPINLOCK(user_lock);
@@ -131,6 +132,13 @@ static int ssc_probe(struct platform_device *pdev)
 	struct resource *regs;
 	struct ssc_device *ssc;
 	const struct atmel_ssc_platform_data *plat_dat;
+	struct pinctrl *pinctrl;
+
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl)) {
+		dev_err(&pdev->dev, "Failed to request pinctrl\n");
+		return PTR_ERR(pinctrl);
+	}
 
 	ssc = devm_kzalloc(&pdev->dev, sizeof(struct ssc_device), GFP_KERNEL);
 	if (!ssc) {
-- 
1.7.9.5

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

On Fri, Nov 16, 2012 at 02:03:57PM +0800, Bo Shen wrote:
> Add pinctrl consumer for atmel ssc peripheral
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
> Resend:
>   Split one patch into two.
>     - one add pinctrl nodes
>     - one add pinctrl consumer

No, this isn't what was meant - the idea is to send only the addition of
pinctrl data as one patch, based off the ASoC branch instead of -next.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Bo Shen]

Hi Mark,

On 11/16/2012 14:12, Mark Brown wrote:
> On Fri, Nov 16, 2012 at 02:03:57PM +0800, Bo Shen wrote:
>> Add pinctrl consumer for atmel ssc peripheral
>>
>> Signed-off-by: Bo Shen <voice.shen@atmel.com>
>> ---
>> Resend:
>>    Split one patch into two.
>>      - one add pinctrl nodes
>>      - one add pinctrl consumer
>
> No, this isn't what was meant - the idea is to send only the addition of
> pinctrl data as one patch, based off the ASoC branch instead of -next.

What is the pinctrl data? (This patch can be applied on 
sound/topic/atmel branch without any conflicts)
The other one add pinctrl nodes, must based on -next, or else I don't 
know where should I add the pinctrl nodes.

Best Regards,
Bo Shen

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 723 bytes --]

On Fri, Nov 16, 2012 at 02:33:50PM +0800, Bo Shen wrote:
> On 11/16/2012 14:12, Mark Brown wrote:

> >No, this isn't what was meant - the idea is to send only the addition of
> >pinctrl data as one patch, based off the ASoC branch instead of -next.

> What is the pinctrl data? (This patch can be applied on

The data you're adding in the device tree!

> sound/topic/atmel branch without any conflicts)

That's not helpful to anyone doing bisection if there's nothing defining
the pin states, it means that the system won't be able to start the
driver as the API call will fail.

> The other one add pinctrl nodes, must based on -next, or else I
> don't know where should I add the pinctrl nodes.

What makes you say this?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Bo Shen]

On 11/16/2012 14:41, Mark Brown wrote:
> On Fri, Nov 16, 2012 at 02:33:50PM +0800, Bo Shen wrote:
>> On 11/16/2012 14:12, Mark Brown wrote:
>
>>> No, this isn't what was meant - the idea is to send only the addition of
>>> pinctrl data as one patch, based off the ASoC branch instead of -next.
>
>> What is the pinctrl data? (This patch can be applied on
>
> The data you're adding in the device tree!
>
>> sound/topic/atmel branch without any conflicts)
>
> That's not helpful to anyone doing bisection if there's nothing defining
> the pin states, it means that the system won't be able to start the
> driver as the API call will fail.
>
>> The other one add pinctrl nodes, must based on -next, or else I
>> don't know where should I add the pinctrl nodes.
>
> What makes you say this?

For example, if I want to add pinctrl node
---<8---
  ssc0 {
	pinctrl_ssc0_tx: ssc0_tx-0 {
         	atmel,pins = <1 16 0x1 0x0   /* PB16 periph A */
                 	      1 17 0x1 0x0   /* PB17 periph A */
                       	      1 18 0x1 0x0>; /* PB18 periph A */
         };
--->8---
This should be add into dtsi file as following
---<8---
ahb {
	apb {
		pinctrl {
			ssc0 {
				pinctrl_ssc0_tx
			}
		}
	}
}
--->8---

In the ASoC branch tree, I don't see any pinctrl related information. 
So, I say I don't know where should I add the pinctrl nodes.

May be I misunderstanding, do you mean I should only add as followign 
based on ASoC tree? And the upper go into pinctrl tree?
---<8---
ssc0: ssc@fffbc000 {
	compatible = "atmel,at91rm9200-ssc";
         reg = <0xfffbc000 0x4000>;
         interrupts = <14 4 5>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
         status = "disable";
};
--->8---

Best Regards
Bo Shen

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Bo Shen]

Hi Mark,

On 11/16/2012 14:59, Bo Shen wrote:
> On 11/16/2012 14:41, Mark Brown wrote:
>> On Fri, Nov 16, 2012 at 02:33:50PM +0800, Bo Shen wrote:
>>> On 11/16/2012 14:12, Mark Brown wrote:
>>
>>>> No, this isn't what was meant - the idea is to send only the
>>>> addition of
>>>> pinctrl data as one patch, based off the ASoC branch instead of -next.
>>
>>> What is the pinctrl data? (This patch can be applied on
>>
>> The data you're adding in the device tree!
>>
>>> sound/topic/atmel branch without any conflicts)
>>
>> That's not helpful to anyone doing bisection if there's nothing defining
>> the pin states, it means that the system won't be able to start the
>> driver as the API call will fail.
>>
>>> The other one add pinctrl nodes, must based on -next, or else I
>>> don't know where should I add the pinctrl nodes.
>>
>> What makes you say this?
>
> For example, if I want to add pinctrl node
> ---<8---
>   ssc0 {
>      pinctrl_ssc0_tx: ssc0_tx-0 {
>              atmel,pins = <1 16 0x1 0x0   /* PB16 periph A */
>                            1 17 0x1 0x0   /* PB17 periph A */
>                                  1 18 0x1 0x0>; /* PB18 periph A */
>          };
> --->8---
> This should be add into dtsi file as following
> ---<8---
> ahb {
>      apb {
>          pinctrl {
>              ssc0 {
>                  pinctrl_ssc0_tx
>              }
>          }
>      }
> }
> --->8---
>
> In the ASoC branch tree, I don't see any pinctrl related information.
> So, I say I don't know where should I add the pinctrl nodes.
>
> May be I misunderstanding, do you mean I should only add as followign
> based on ASoC tree? And the upper go into pinctrl tree?
> ---<8---
> ssc0: ssc@fffbc000 {
>      compatible = "atmel,at91rm9200-ssc";
>          reg = <0xfffbc000 0x4000>;
>          interrupts = <14 4 5>;
> +        pinctrl-names = "default";
> +        pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
>          status = "disable";
> };
> --->8---

Any suggestion for this? what should I do with this patch for next?

> Best Regards
> Bo Shen
>
>

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

On Tue, Nov 20, 2012 at 05:31:22PM +0800, Bo Shen wrote:

> >based on ASoC tree? And the upper go into pinctrl tree?
> >---<8---
> >ssc0: ssc@fffbc000 {
> >     compatible = "atmel,at91rm9200-ssc";
> >         reg = <0xfffbc000 0x4000>;
> >         interrupts = <14 4 5>;
> >+        pinctrl-names = "default";
> >+        pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
> >         status = "disable";
> >};
> >--->8---

> Any suggestion for this? what should I do with this patch for next?

Send it to pinctrl and we'll deal with the add/add.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Bo Shen]

Hi Mark,

On 11/20/2012 18:27, Mark Brown wrote:
> On Tue, Nov 20, 2012 at 05:31:22PM +0800, Bo Shen wrote:
>
>>> based on ASoC tree? And the upper go into pinctrl tree?
>>> ---<8---
>>> ssc0: ssc@fffbc000 {
>>>      compatible = "atmel,at91rm9200-ssc";
>>>          reg = <0xfffbc000 0x4000>;
>>>          interrupts = <14 4 5>;
>>> +        pinctrl-names = "default";
>>> +        pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
>>>          status = "disable";
>>> };
>>> --->8---
>
>> Any suggestion for this? what should I do with this patch for next?
>
> Send it to pinctrl and we'll deal with the add/add.

So, should I keep these two patches [1] and [2] and then send to pinctrl 
again, or I need keep it in one patch as [3] which i sent first.

1. [Resend,v6,1/2] ARM: at91: atmel-ssc: add pinctrl nodes
    https://patchwork.kernel.org/patch/1753101/

2. [Resend,v6,2/2] ASoC: atmel-ssc: add pinctrl consumer
    https://patchwork.kernel.org/patch/1753091/

3. [v6,1/4] ARM: at91: atmel-ssc: add pinctrl support
    https://patchwork.kernel.org/patch/1740391/

Best regards,
Bo Shen

Re: [Resend v6 PATCH 2/2] ASoC: atmel-ssc: add pinctrl consumer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

On Wed, Nov 21, 2012 at 09:43:33AM +0800, Bo Shen wrote:

> So, should I keep these two patches [1] and [2] and then send to
> pinctrl again, or I need keep it in one patch as [3] which i sent
> first.

Please send something coherent which can be applied without breaking the
branch it is applied to.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]