[PATCH linux dev-5.15 0/3] Support PL2303 on AST2600

[PATCH linux dev-5.15 0/3] Support PL2303 on AST2600

[Eddie James]

This series provides support for the PL2303 serial-to-USB converter
on the AST2600-based systems, Everest and Rainier.

Eddie James (3):
  USB: serial: pl2303: Add IBM device IDs
  USB: uhci: Add ast2600 compatible
  arm: dts: Aspeed: Rainier and Everest: Enable UHCI

 arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 ++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 ++++
 drivers/usb/host/uhci-platform.c             | 3 ++-
 drivers/usb/serial/pl2303.c                  | 1 +
 drivers/usb/serial/pl2303.h                  | 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)

-- 
2.27.0

[PATCH linux dev-5.15 1/3] USB: serial: pl2303: Add IBM device IDs

[Eddie James]

IBM manufactures a PL2303 device for UPS communications. Add the vendor
and product IDs so that the PL2303 driver binds to the device.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 drivers/usb/serial/pl2303.c | 1 +
 drivers/usb/serial/pl2303.h | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index a70fd86f735c..e2ef761ed39c 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -116,6 +116,7 @@ static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },
 	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
 	{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },
+	{ USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) },
 	{ }					/* Terminating entry */
 };
 
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 6097ee8fccb2..c5406452b774 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -35,6 +35,9 @@
 #define ATEN_PRODUCT_UC232B	0x2022
 #define ATEN_PRODUCT_ID2	0x2118
 
+#define IBM_VENDOR_ID		0x04b3
+#define IBM_PRODUCT_ID		0x4016
+
 #define IODATA_VENDOR_ID	0x04bb
 #define IODATA_PRODUCT_ID	0x0a03
 #define IODATA_PRODUCT_ID_RSAQ5	0x0a0e
-- 
2.27.0

[PATCH linux dev-5.15 2/3] USB: uhci: Add ast2600 compatible

[Eddie James]

Add the ast2600 compatible string to enable the Aspeed workarounds
on the UHCI.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 drivers/usb/host/uhci-platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
index 70dbd95c3f06..be9e9db7cad1 100644
--- a/drivers/usb/host/uhci-platform.c
+++ b/drivers/usb/host/uhci-platform.c
@@ -113,7 +113,8 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
 				num_ports);
 		}
 		if (of_device_is_compatible(np, "aspeed,ast2400-uhci") ||
-		    of_device_is_compatible(np, "aspeed,ast2500-uhci")) {
+		    of_device_is_compatible(np, "aspeed,ast2500-uhci") ||
+		    of_device_is_compatible(np, "aspeed,ast2600-uhci")) {
 			uhci->is_aspeed = 1;
 			dev_info(&pdev->dev,
 				 "Enabled Aspeed implementation workarounds\n");
-- 
2.27.0

[PATCH linux dev-5.15 3/3] arm: dts: Aspeed: Rainier and Everest: Enable UHCI

[Eddie James]

The UHCI controller is necessary to talk to slower, USB1.1 devices, so
enable the UHCI controller in the device tree.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 ++++
 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index 7256b8cbd552..547c71bfdfa7 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -2394,6 +2394,10 @@ &ehci1 {
 	status = "okay";
 };
 
+&uhci {
+	status = "okay";
+};
+
 &emmc_controller {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 652c866c14dc..b0fad1153e76 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -239,6 +239,10 @@ &ehci1 {
 	status = "okay";
 };
 
+&uhci {
+	status = "okay";
+};
+
 &gpio0 {
 	gpio-line-names =
 	/*A0-A7*/	"","","","","","","","",
-- 
2.27.0

Re: [PATCH linux dev-5.15 2/3] USB: uhci: Add ast2600 compatible

[Joel Stanley]

On Fri, 28 Jan 2022 at 21:49, Eddie James <eajames@linux.ibm.com> wrote:
>
> Add the ast2600 compatible string to enable the Aspeed workarounds
> on the UHCI.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>

This one has just popped up in the stable backports (v5.15.18) so I
will skip it.

> ---
>  drivers/usb/host/uhci-platform.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
> index 70dbd95c3f06..be9e9db7cad1 100644
> --- a/drivers/usb/host/uhci-platform.c
> +++ b/drivers/usb/host/uhci-platform.c
> @@ -113,7 +113,8 @@ static int uhci_hcd_platform_probe(struct platform_device *pdev)
>                                 num_ports);
>                 }
>                 if (of_device_is_compatible(np, "aspeed,ast2400-uhci") ||
> -                   of_device_is_compatible(np, "aspeed,ast2500-uhci")) {
> +                   of_device_is_compatible(np, "aspeed,ast2500-uhci") ||
> +                   of_device_is_compatible(np, "aspeed,ast2600-uhci")) {
>                         uhci->is_aspeed = 1;
>                         dev_info(&pdev->dev,
>                                  "Enabled Aspeed implementation workarounds\n");
> --
> 2.27.0
>

Re: [PATCH linux dev-5.15 1/3] USB: serial: pl2303: Add IBM device IDs

[Joel Stanley]

On Fri, 28 Jan 2022 at 21:49, Eddie James <eajames@linux.ibm.com> wrote:
>
> IBM manufactures a PL2303 device for UPS communications. Add the vendor
> and product IDs so that the PL2303 driver binds to the device.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>

Please send this one upstream.

> ---
>  drivers/usb/serial/pl2303.c | 1 +
>  drivers/usb/serial/pl2303.h | 3 +++
>  2 files changed, 4 insertions(+)
>
> diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
> index a70fd86f735c..e2ef761ed39c 100644
> --- a/drivers/usb/serial/pl2303.c
> +++ b/drivers/usb/serial/pl2303.c
> @@ -116,6 +116,7 @@ static const struct usb_device_id id_table[] = {
>         { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },
>         { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
>         { USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },
> +       { USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) },
>         { }                                     /* Terminating entry */
>  };
>
> diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
> index 6097ee8fccb2..c5406452b774 100644
> --- a/drivers/usb/serial/pl2303.h
> +++ b/drivers/usb/serial/pl2303.h
> @@ -35,6 +35,9 @@
>  #define ATEN_PRODUCT_UC232B    0x2022
>  #define ATEN_PRODUCT_ID2       0x2118
>
> +#define IBM_VENDOR_ID          0x04b3
> +#define IBM_PRODUCT_ID         0x4016
> +
>  #define IODATA_VENDOR_ID       0x04bb
>  #define IODATA_PRODUCT_ID      0x0a03
>  #define IODATA_PRODUCT_ID_RSAQ5        0x0a0e
> --
> 2.27.0
>

Re: [PATCH linux dev-5.15 0/3] Support PL2303 on AST2600

[Joel Stanley]

On Fri, 28 Jan 2022 at 21:49, Eddie James <eajames@linux.ibm.com> wrote:
>
> This series provides support for the PL2303 serial-to-USB converter
> on the AST2600-based systems, Everest and Rainier.
>
> Eddie James (3):
>   USB: serial: pl2303: Add IBM device IDs
>   USB: uhci: Add ast2600 compatible
>   arm: dts: Aspeed: Rainier and Everest: Enable UHCI

I merged the device ID and the device tree change, and added the
driver to the defconfig.

Cheers,

Joel

>
>  arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 4 ++++
>  arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 4 ++++
>  drivers/usb/host/uhci-platform.c             | 3 ++-
>  drivers/usb/serial/pl2303.c                  | 1 +
>  drivers/usb/serial/pl2303.h                  | 3 +++
>  5 files changed, 14 insertions(+), 1 deletion(-)
>
> --
> 2.27.0
>