[PATCH v3 0/3] ARM: at91: USB Device Port fixes

[PATCH v3 0/3] ARM: at91: USB Device Port fixes

[Michael Grzeschik]

This series fixes the UDP (USB Device Port) on the
at91rm9200 and at91sam9g20.

Cc: nicolas.ferre@microchip.com
Cc: alexandre.belloni@bootlin.com
Cc: linux-clk@vger.kernel.org
Cc: kernel@pengutronix.de

Michael Grzeschik (3):
  clk: at91: rm9200: fix usb device clock id
  ARM: dts: at91: rm9200: fix usb device clk id
  ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl

 arch/arm/boot/dts/at91rm9200.dtsi           | 2 +-
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 9 +++++++++
 drivers/clk/at91/at91rm9200.c               | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v3 1/3] clk: at91: rm9200: fix usb device clock id

[Michael Grzeschik]

Referring to the datasheet the index 2 is the MCKUDP. When enabled, it
"Enables the automatic disable of the Master Clock of the USB Device
Port when a suspend condition occurs". We fix the index to the real UDP
id which "Enables the 48 MHz clock of the USB Device Port".

Cc: mturquette@baylibre.com
Cc: sboyd@kernel.org
Cc: nicolas.ferre@microchip.com
Cc: alexandre.belloni@bootlin.com
Cc: ludovic.desroches@microchip.com
Cc: claudiu.beznea@microchip.com
Cc: linux-clk@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: kernel@pengutronix.de
Fixes: 02ff48e4d7f7 ("clk: at91: add at91rm9200 pmc driver")
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

---
v1 -> v2: - removed ; from patch description
          - added fixes tag
v2 -> v3: - updated the fixes tag

 drivers/clk/at91/at91rm9200.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
index b174f727a8ef8d..16870943a13e54 100644
--- a/drivers/clk/at91/at91rm9200.c
+++ b/drivers/clk/at91/at91rm9200.c
@@ -40,7 +40,7 @@ static const struct clk_pll_characteristics rm9200_pll_characteristics = {
 };
 
 static const struct sck at91rm9200_systemck[] = {
-	{ .n = "udpck", .p = "usbck",    .id = 2 },
+	{ .n = "udpck", .p = "usbck",    .id = 1 },
 	{ .n = "uhpck", .p = "usbck",    .id = 4 },
 	{ .n = "pck0",  .p = "prog0",    .id = 8 },
 	{ .n = "pck1",  .p = "prog1",    .id = 9 },
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v3 2/3] ARM: dts: at91: rm9200: fix usb device clk id

[Michael Grzeschik]

Referring to the datasheet the index 2 is the MCKUDP. When enabled, it
"Enables the automatic disable of the Master Clock of the USB Device
Port when a suspend condition occurs". We fix the index to the real UDP
id which "Enables the 48 MHz clock of the USB Device Port".

Cc: nicolas.ferre@microchip.com
Cc: ludovic.desroches@microchip.com
Cc: alexandre.belloni@bootlin.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: kernel@pengutronix.de
Fixes: 0e0e528d8260 ("ARM: dts: at91: rm9200: switch to new clock bindings")
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

---
v1 -> v2: - removed ; from patch description
          - added fixes tag
v2 -> v3: - updated the fixes tag

 arch/arm/boot/dts/at91rm9200.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 7a113325abb9ed..6f9004ebf42456 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -666,7 +666,7 @@ usb1: gadget@fffb0000 {
 				compatible = "atmel,at91rm9200-udc";
 				reg = <0xfffb0000 0x4000>;
 				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
-				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 2>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 1>;
 				clock-names = "pclk", "hclk";
 				status = "disabled";
 			};
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v3 3/3] ARM: dts: at91: sam9g20ek: enable udc vbus gpio pinctrl

[Michael Grzeschik]

We set the PIOC to GPIO mode. This way the pin becomes an
input signal will be usable by the controller. Without
this change the udc on the 9g20ek does not work.

Cc: nicolas.ferre@microchip.com
Cc: ludovic.desroches@microchip.com
Cc: alexandre.belloni@bootlin.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: kernel@pengutronix.de
Fixes: 5cb4e73575e3 ("ARM: at91: add at91sam9g20ek boards dt support")
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

---
v1 -> v2: - aligned pinctrl-0 entry to one line
          - added fixes tag
v2 -> v3: - updated the fixes tag

 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 60d61291f34445..024af2db638ebe 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -39,6 +39,13 @@ pinctrl_pck0_as_mck: pck0_as_mck {
 
 				};
 
+				usb1 {
+					pinctrl_usb1_vbus_gpio: usb1_vbus_gpio {
+						atmel,pins =
+							<AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;	/* PC5 GPIO */
+					};
+				};
+
 				mmc0_slot1 {
 					pinctrl_board_mmc0_slot1: mmc0_slot1-board {
 						atmel,pins =
@@ -84,6 +91,8 @@ macb0: ethernet@fffc4000 {
 			};
 
 			usb1: gadget@fffa4000 {
+				pinctrl-0 = <&pinctrl_usb1_vbus_gpio>;
+				pinctrl-names = "default";
 				atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
 				status = "okay";
 			};
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v3 1/3] clk: at91: rm9200: fix usb device clock id

[Claudiu.Beznea]

On 09.11.2022 14:46, Michael Grzeschik wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Referring to the datasheet the index 2 is the MCKUDP. When enabled, it
> "Enables the automatic disable of the Master Clock of the USB Device
> Port when a suspend condition occurs". We fix the index to the real UDP
> id which "Enables the 48 MHz clock of the USB Device Port".
> 
> Cc: mturquette@baylibre.com
> Cc: sboyd@kernel.org
> Cc: nicolas.ferre@microchip.com
> Cc: alexandre.belloni@bootlin.com
> Cc: ludovic.desroches@microchip.com
> Cc: claudiu.beznea@microchip.com
> Cc: linux-clk@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: kernel@pengutronix.de
> Fixes: 02ff48e4d7f7 ("clk: at91: add at91rm9200 pmc driver")
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>


> 
> ---
> v1 -> v2: - removed ; from patch description
>           - added fixes tag
> v2 -> v3: - updated the fixes tag
> 
>  drivers/clk/at91/at91rm9200.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
> index b174f727a8ef8d..16870943a13e54 100644
> --- a/drivers/clk/at91/at91rm9200.c
> +++ b/drivers/clk/at91/at91rm9200.c
> @@ -40,7 +40,7 @@ static const struct clk_pll_characteristics rm9200_pll_characteristics = {
>  };
> 
>  static const struct sck at91rm9200_systemck[] = {
> -       { .n = "udpck", .p = "usbck",    .id = 2 },
> +       { .n = "udpck", .p = "usbck",    .id = 1 },
>         { .n = "uhpck", .p = "usbck",    .id = 4 },
>         { .n = "pck0",  .p = "prog0",    .id = 8 },
>         { .n = "pck1",  .p = "prog1",    .id = 9 },
> --
> 2.30.2
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v3 1/3] clk: at91: rm9200: fix usb device clock id

[Claudiu.Beznea]

On 10.11.2022 12:41, Claudiu Beznea - M18063 wrote:
> On 09.11.2022 14:46, Michael Grzeschik wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> Referring to the datasheet the index 2 is the MCKUDP. When enabled, it
>> "Enables the automatic disable of the Master Clock of the USB Device
>> Port when a suspend condition occurs". We fix the index to the real UDP
>> id which "Enables the 48 MHz clock of the USB Device Port".
>>
>> Cc: mturquette@baylibre.com
>> Cc: sboyd@kernel.org
>> Cc: nicolas.ferre@microchip.com
>> Cc: alexandre.belloni@bootlin.com
>> Cc: ludovic.desroches@microchip.com
>> Cc: claudiu.beznea@microchip.com
>> Cc: linux-clk@vger.kernel.org
>> Cc: linux-arm-kernel@lists.infradead.org
>> Cc: kernel@pengutronix.de
>> Fixes: 02ff48e4d7f7 ("clk: at91: add at91rm9200 pmc driver")
>> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> 
> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>

Actually, looking again at this... I think it is best to squash this patch
with path 2/3 from this series. Otherwise applying them independently will
lead to usb driver probe failure. Back porting them (with proper
dependency) to older kernel version may also lead to failures.

> 
> 
>>
>> ---
>> v1 -> v2: - removed ; from patch description
>>           - added fixes tag
>> v2 -> v3: - updated the fixes tag
>>
>>  drivers/clk/at91/at91rm9200.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
>> index b174f727a8ef8d..16870943a13e54 100644
>> --- a/drivers/clk/at91/at91rm9200.c
>> +++ b/drivers/clk/at91/at91rm9200.c
>> @@ -40,7 +40,7 @@ static const struct clk_pll_characteristics rm9200_pll_characteristics = {
>>  };
>>
>>  static const struct sck at91rm9200_systemck[] = {
>> -       { .n = "udpck", .p = "usbck",    .id = 2 },
>> +       { .n = "udpck", .p = "usbck",    .id = 1 },
>>         { .n = "uhpck", .p = "usbck",    .id = 4 },
>>         { .n = "pck0",  .p = "prog0",    .id = 8 },
>>         { .n = "pck1",  .p = "prog1",    .id = 9 },
>> --
>> 2.30.2
>>
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v3 1/3] clk: at91: rm9200: fix usb device clock id

[Michael Grzeschik]

[-- Attachment #1.1: Type: text/plain, Size: 2864 bytes --]

On Fri, Nov 11, 2022 at 11:00:53AM +0000, Claudiu.Beznea@microchip.com wrote:
>On 10.11.2022 12:41, Claudiu Beznea - M18063 wrote:
>> On 09.11.2022 14:46, Michael Grzeschik wrote:
>>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>>
>>> Referring to the datasheet the index 2 is the MCKUDP. When enabled, it
>>> "Enables the automatic disable of the Master Clock of the USB Device
>>> Port when a suspend condition occurs". We fix the index to the real UDP
>>> id which "Enables the 48 MHz clock of the USB Device Port".
>>>
>>> Cc: mturquette@baylibre.com
>>> Cc: sboyd@kernel.org
>>> Cc: nicolas.ferre@microchip.com
>>> Cc: alexandre.belloni@bootlin.com
>>> Cc: ludovic.desroches@microchip.com
>>> Cc: claudiu.beznea@microchip.com
>>> Cc: linux-clk@vger.kernel.org
>>> Cc: linux-arm-kernel@lists.infradead.org
>>> Cc: kernel@pengutronix.de
>>> Fixes: 02ff48e4d7f7 ("clk: at91: add at91rm9200 pmc driver")
>>> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
>>
>> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
>
>Actually, looking again at this... I think it is best to squash this patch
>with path 2/3 from this series. Otherwise applying them independently will
>lead to usb driver probe failure. Back porting them (with proper
>dependency) to older kernel version may also lead to failures.


I just send v4.


>>
>>
>>>
>>> ---
>>> v1 -> v2: - removed ; from patch description
>>>           - added fixes tag
>>> v2 -> v3: - updated the fixes tag
>>>
>>>  drivers/clk/at91/at91rm9200.c | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
>>> index b174f727a8ef8d..16870943a13e54 100644
>>> --- a/drivers/clk/at91/at91rm9200.c
>>> +++ b/drivers/clk/at91/at91rm9200.c
>>> @@ -40,7 +40,7 @@ static const struct clk_pll_characteristics rm9200_pll_characteristics = {
>>>  };
>>>
>>>  static const struct sck at91rm9200_systemck[] = {
>>> -       { .n = "udpck", .p = "usbck",    .id = 2 },
>>> +       { .n = "udpck", .p = "usbck",    .id = 1 },
>>>         { .n = "uhpck", .p = "usbck",    .id = 4 },
>>>         { .n = "pck0",  .p = "prog0",    .id = 8 },
>>>         { .n = "pck1",  .p = "prog1",    .id = 9 },
>>> --
>>> 2.30.2
>>>
>>
>
>_______________________________________________
>linux-arm-kernel mailing list
>linux-arm-kernel@lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel