[PATCH v2 1/3] usb: gadget: atmel: Add SAM9X60 support

[PATCH v2 1/3] usb: gadget: atmel: Add SAM9X60 support

[Zixun LI]

Compared to SAM9X5 the only difference is the DPRAM memory from the
USB High Speed Device Port (UDPHS) hardware block was increased,
so we can reuse the same endpoint data.

Also add compatible "microchip,sam9x60-udc".

Signed-off-by: Zixun LI <admin@hifiphile.com>
---
 arch/arm/mach-at91/include/mach/atmel_usba_udc.h | 2 +-
 drivers/usb/gadget/atmel_usba_udc.c              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
index 835b47d91ba..23c71985c90 100644
--- a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
+++ b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
@@ -20,7 +20,7 @@
 	}
 
 #if defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
-	defined(CONFIG_AT91SAM9X5)
+	defined(CONFIG_AT91SAM9X5) || defined(CONFIG_SAM9X60)
 static struct usba_ep_data usba_udc_ep[] = {
 	EP("ep0", 0, 64, 1, 0, 0),
 	EP("ep1", 1, 1024, 2, 1, 1),
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index a77037a7094..f9326f0a7e7 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1443,6 +1443,7 @@ static const struct udevice_id usba_udc_ids[] = {
 	{ .compatible = "atmel,at91sam9rl-udc" },
 	{ .compatible = "atmel,at91sam9g45-udc" },
 	{ .compatible = "atmel,sama5d3-udc" },
+	{ .compatible = "microchip,sam9x60-udc" },
 	{}
 };
 
-- 
2.49.0

Re: [PATCH v2 1/3] usb: gadget: atmel: Add SAM9X60 support

[Mattijs Korpershoek]

Hi Zixun,

Thank you for the patch.

On lun., mars 31, 2025 at 18:26, Zixun LI <admin@hifiphile.com> wrote:

> Compared to SAM9X5 the only difference is the DPRAM memory from the
> USB High Speed Device Port (UDPHS) hardware block was increased,
> so we can reuse the same endpoint data.
>
> Also add compatible "microchip,sam9x60-udc".
>
> Signed-off-by: Zixun LI <admin@hifiphile.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

> ---
>  arch/arm/mach-at91/include/mach/atmel_usba_udc.h | 2 +-
>  drivers/usb/gadget/atmel_usba_udc.c              | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
> index 835b47d91ba..23c71985c90 100644
> --- a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
> +++ b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h
> @@ -20,7 +20,7 @@
>  	}
>  
>  #if defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
> -	defined(CONFIG_AT91SAM9X5)
> +	defined(CONFIG_AT91SAM9X5) || defined(CONFIG_SAM9X60)
>  static struct usba_ep_data usba_udc_ep[] = {
>  	EP("ep0", 0, 64, 1, 0, 0),
>  	EP("ep1", 1, 1024, 2, 1, 1),
> diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
> index a77037a7094..f9326f0a7e7 100644
> --- a/drivers/usb/gadget/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/atmel_usba_udc.c
> @@ -1443,6 +1443,7 @@ static const struct udevice_id usba_udc_ids[] = {
>  	{ .compatible = "atmel,at91sam9rl-udc" },
>  	{ .compatible = "atmel,at91sam9g45-udc" },
>  	{ .compatible = "atmel,sama5d3-udc" },
> +	{ .compatible = "microchip,sam9x60-udc" },
>  	{}
>  };
>  
> -- 
> 2.49.0

Re: (subset) [PATCH v2 1/3] usb: gadget: atmel: Add SAM9X60 support

[Mattijs Korpershoek]

Hi,

On Mon, 31 Mar 2025 18:26:07 +0200, Zixun LI wrote:
> Compared to SAM9X5 the only difference is the DPRAM memory from the
> USB High Speed Device Port (UDPHS) hardware block was increased,
> so we can reuse the same endpoint data.
> 
> Also add compatible "microchip,sam9x60-udc".
> 
> 
> [...]

Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-dfu (u-boot-dfu)

[1/3] usb: gadget: atmel: Add SAM9X60 support
      https://source.denx.de/u-boot/custodians/u-boot-dfu/-/commit/dc22cf37af6d604513f8c6f02d4cb551d5a59435

--
Mattijs

Re: (subset) [PATCH v2 1/3] usb: gadget: atmel: Add SAM9X60 support

[Eugen Hristev]

On 4/10/25 11:49, Mattijs Korpershoek wrote:
> Hi,
> 
> On Mon, 31 Mar 2025 18:26:07 +0200, Zixun LI wrote:
>> Compared to SAM9X5 the only difference is the DPRAM memory from the
>> USB High Speed Device Port (UDPHS) hardware block was increased,
>> so we can reuse the same endpoint data.
>>
>> Also add compatible "microchip,sam9x60-udc".
>>
>>
>> [...]
> 
> Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-dfu (u-boot-dfu)
> 
> [1/3] usb: gadget: atmel: Add SAM9X60 support
>       https://source.denx.de/u-boot/custodians/u-boot-dfu/-/commit/dc22cf37af6d604513f8c6f02d4cb551d5a59435
> 
> --
> Mattijs

Applied 2 and 3 to u-boot-at91/master, thanks !

[PATCH v2 2/3] ARM: dts: sam9x60: Add USB gadget DT node.

[Zixun LI]

Add the USB gadget DT node for the sam9x60 SoC's.

Signed-off-by: Zixun LI <admin@hifiphile.com>
---
 arch/arm/dts/sam9x60.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
index 3b684fc63d5..ea2647e5fc9 100644
--- a/arch/arm/dts/sam9x60.dtsi
+++ b/arch/arm/dts/sam9x60.dtsi
@@ -69,6 +69,19 @@
 		#size-cells = <1>;
 		ranges;
 
+		usb0: gadget@500000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "microchip,sam9x60-udc";
+			reg = <0x500000 0x100000>,
+				<0xf803c000 0x400>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_CORE 8>;
+			clock-names = "pclk", "hclk";
+			assigned-clocks = <&pmc PMC_TYPE_CORE 8>;
+			assigned-clock-rates = <480000000>;
+			status = "disabled";
+		};
+
 		usb1: usb@600000 {
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00600000 0x100000>;
-- 
2.49.0

Re: [PATCH v2 2/3] ARM: dts: sam9x60: Add USB gadget DT node.

[Eugen Hristev]

On 3/31/25 19:26, Zixun LI wrote:
> Add the USB gadget DT node for the sam9x60 SoC's.
> 
> Signed-off-by: Zixun LI <admin@hifiphile.com>

Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>

> ---
>  arch/arm/dts/sam9x60.dtsi | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
> index 3b684fc63d5..ea2647e5fc9 100644
> --- a/arch/arm/dts/sam9x60.dtsi
> +++ b/arch/arm/dts/sam9x60.dtsi
> @@ -69,6 +69,19 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> +		usb0: gadget@500000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "microchip,sam9x60-udc";
> +			reg = <0x500000 0x100000>,
> +				<0xf803c000 0x400>;
> +			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_CORE 8>;
> +			clock-names = "pclk", "hclk";
> +			assigned-clocks = <&pmc PMC_TYPE_CORE 8>;
> +			assigned-clock-rates = <480000000>;
> +			status = "disabled";
> +		};
> +
>  		usb1: usb@600000 {
>  			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
>  			reg = <0x00600000 0x100000>;

Re: [PATCH v2 2/3] ARM: dts: sam9x60: Add USB gadget DT node.

[Mattijs Korpershoek]

Hi Zixun,

Thank you for the patch.

On lun., mars 31, 2025 at 18:26, Zixun LI <admin@hifiphile.com> wrote:

> Add the USB gadget DT node for the sam9x60 SoC's.
>
> Signed-off-by: Zixun LI <admin@hifiphile.com>

Nitpick: title (subject) should not finish with a period (.)

This can be fixed up by the maintainer that will apply the patches.

Eugen, This is assigned to me on patchwork:
https://patchwork.ozlabs.org/project/uboot/list/?series=450655

Can I pick up all 3 patches or do you prefer to pick up [2/3] and [3/3] ?

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

> ---
>  arch/arm/dts/sam9x60.dtsi | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
> index 3b684fc63d5..ea2647e5fc9 100644
> --- a/arch/arm/dts/sam9x60.dtsi
> +++ b/arch/arm/dts/sam9x60.dtsi
> @@ -69,6 +69,19 @@
>  		#size-cells = <1>;
>  		ranges;
>  
> +		usb0: gadget@500000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "microchip,sam9x60-udc";
> +			reg = <0x500000 0x100000>,
> +				<0xf803c000 0x400>;
> +			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_CORE 8>;
> +			clock-names = "pclk", "hclk";
> +			assigned-clocks = <&pmc PMC_TYPE_CORE 8>;
> +			assigned-clock-rates = <480000000>;
> +			status = "disabled";
> +		};
> +
>  		usb1: usb@600000 {
>  			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
>  			reg = <0x00600000 0x100000>;
> -- 
> 2.49.0

Re: [PATCH v2 2/3] ARM: dts: sam9x60: Add USB gadget DT node.

[Eugen Hristev]

On 4/1/25 13:10, Mattijs Korpershoek wrote:
> Hi Zixun,
> 
> Thank you for the patch.
> 
> On lun., mars 31, 2025 at 18:26, Zixun LI <admin@hifiphile.com> wrote:
> 
>> Add the USB gadget DT node for the sam9x60 SoC's.
>>
>> Signed-off-by: Zixun LI <admin@hifiphile.com>
> 
> Nitpick: title (subject) should not finish with a period (.)
> 
> This can be fixed up by the maintainer that will apply the patches.
> 
> Eugen, This is assigned to me on patchwork:
> https://patchwork.ozlabs.org/project/uboot/list/?series=450655
> 
> Can I pick up all 3 patches or do you prefer to pick up [2/3] and [3/3] ?

It is better that I take these two, because there are some pending
changes on the same DT for the next merge window, so it would avoid
conflicts.
Reassign them to me in patchwork please.

> 
> Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
> 
>> ---
>>  arch/arm/dts/sam9x60.dtsi | 13 +++++++++++++
>>  1 file changed, 13 insertions(+)
>>
>> diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi
>> index 3b684fc63d5..ea2647e5fc9 100644
>> --- a/arch/arm/dts/sam9x60.dtsi
>> +++ b/arch/arm/dts/sam9x60.dtsi
>> @@ -69,6 +69,19 @@
>>  		#size-cells = <1>;
>>  		ranges;
>>  
>> +		usb0: gadget@500000 {
>> +			#address-cells = <1>;
>> +			#size-cells = <0>;
>> +			compatible = "microchip,sam9x60-udc";
>> +			reg = <0x500000 0x100000>,
>> +				<0xf803c000 0x400>;
>> +			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_CORE 8>;
>> +			clock-names = "pclk", "hclk";
>> +			assigned-clocks = <&pmc PMC_TYPE_CORE 8>;
>> +			assigned-clock-rates = <480000000>;
>> +			status = "disabled";
>> +		};
>> +
>>  		usb1: usb@600000 {
>>  			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
>>  			reg = <0x00600000 0x100000>;
>> -- 
>> 2.49.0

Re: [PATCH v2 2/3] ARM: dts: sam9x60: Add USB gadget DT node.

[Mattijs Korpershoek]

On mar., avril 01, 2025 at 13:40, Eugen Hristev <eugen.hristev@linaro.org> wrote:

> On 4/1/25 13:10, Mattijs Korpershoek wrote:
>> Hi Zixun,
>> 
>> Thank you for the patch.
>> 
>> On lun., mars 31, 2025 at 18:26, Zixun LI <admin@hifiphile.com> wrote:
>> 
>>> Add the USB gadget DT node for the sam9x60 SoC's.
>>>
>>> Signed-off-by: Zixun LI <admin@hifiphile.com>
>> 
>> Nitpick: title (subject) should not finish with a period (.)
>> 
>> This can be fixed up by the maintainer that will apply the patches.
>> 
>> Eugen, This is assigned to me on patchwork:
>> https://patchwork.ozlabs.org/project/uboot/list/?series=450655
>> 
>> Can I pick up all 3 patches or do you prefer to pick up [2/3] and [3/3] ?
>
> It is better that I take these two, because there are some pending
> changes on the same DT for the next merge window, so it would avoid
> conflicts.
> Reassign them to me in patchwork please.

Sure, that works. Assigned to you.
Thanks !

>
>> 
>> Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
>> 
>>> ---

[PATCH v2 3/3] ARM: dts: at91: sam9x60-curiosity: Enable USB gadget node

[Zixun LI]

Enable USB gadget usb0 node support.

Signed-off-by: Zixun LI <admin@hifiphile.com>
---
 arch/arm/dts/at91-sam9x60_curiosity.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
index 99867d2bf8e..08480df88c6 100644
--- a/arch/arm/dts/at91-sam9x60_curiosity.dts
+++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
@@ -248,6 +248,10 @@
 	};
 };
 
+&usb0 {
+	status = "okay";
+};
+
 &usb1 {
 	num-ports = <3>;
 	atmel,vbus-gpio = <0
-- 
2.49.0

Re: [PATCH v2 3/3] ARM: dts: at91: sam9x60-curiosity: Enable USB gadget node

[Eugen Hristev]

On 3/31/25 19:26, Zixun LI wrote:
> Enable USB gadget usb0 node support.
> 
> Signed-off-by: Zixun LI <admin@hifiphile.com>

Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>

> ---
>  arch/arm/dts/at91-sam9x60_curiosity.dts | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
> index 99867d2bf8e..08480df88c6 100644
> --- a/arch/arm/dts/at91-sam9x60_curiosity.dts
> +++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
> @@ -248,6 +248,10 @@
>  	};
>  };
>  
> +&usb0 {
> +	status = "okay";
> +};
> +
>  &usb1 {
>  	num-ports = <3>;
>  	atmel,vbus-gpio = <0

Re: [PATCH v2 3/3] ARM: dts: at91: sam9x60-curiosity: Enable USB gadget node

[Mattijs Korpershoek]

Hi Zixun,

Thank you for the patch.

On lun., mars 31, 2025 at 18:26, Zixun LI <admin@hifiphile.com> wrote:

> Enable USB gadget usb0 node support.
>
> Signed-off-by: Zixun LI <admin@hifiphile.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>

> ---
>  arch/arm/dts/at91-sam9x60_curiosity.dts | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts
> index 99867d2bf8e..08480df88c6 100644
> --- a/arch/arm/dts/at91-sam9x60_curiosity.dts
> +++ b/arch/arm/dts/at91-sam9x60_curiosity.dts
> @@ -248,6 +248,10 @@
>  	};
>  };
>  
> +&usb0 {
> +	status = "okay";
> +};
> +
>  &usb1 {
>  	num-ports = <3>;
>  	atmel,vbus-gpio = <0
> -- 
> 2.49.0