drivers/usb/host/ohci-da8xx.c | 17 ----------------- include/linux/platform_data/usb-davinci.h | 22 ---------------------- 2 files changed, 39 deletions(-)
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
We no longer support any board files for DaVinci in mainline and so
struct da8xx_ohci_root_hub is no longer used. Remove it together with
all the code it's used for.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
drivers/usb/host/ohci-da8xx.c | 17 -----------------
include/linux/platform_data/usb-davinci.h | 22 ----------------------
2 files changed, 39 deletions(-)
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 3c5ca2d7c92ed786af41d98ed124926ae06d4025..0938c0e7a8b6d54cf1981298119d51a3bfe49148 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -18,7 +18,6 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/phy/phy.h>
-#include <linux/platform_data/usb-davinci.h>
#include <linux/regulator/consumer.h>
#include <linux/usb.h>
#include <linux/usb/hcd.h>
@@ -166,17 +165,6 @@ static int ohci_da8xx_has_oci(struct usb_hcd *hcd)
return 0;
}
-static int ohci_da8xx_has_potpgt(struct usb_hcd *hcd)
-{
- struct device *dev = hcd->self.controller;
- struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
-
- if (hub && hub->potpgt)
- return 1;
-
- return 0;
-}
-
static int ohci_da8xx_regulator_event(struct notifier_block *nb,
unsigned long event, void *data)
{
@@ -228,7 +216,6 @@ static int ohci_da8xx_register_notify(struct usb_hcd *hcd)
static int ohci_da8xx_reset(struct usb_hcd *hcd)
{
struct device *dev = hcd->self.controller;
- struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
int result;
u32 rh_a;
@@ -266,10 +253,6 @@ static int ohci_da8xx_reset(struct usb_hcd *hcd)
rh_a &= ~RH_A_NOCP;
rh_a |= RH_A_OCPM;
}
- if (ohci_da8xx_has_potpgt(hcd)) {
- rh_a &= ~RH_A_POTPGT;
- rh_a |= hub->potpgt << 24;
- }
ohci_writel(ohci, rh_a, &ohci->regs->roothub.a);
return result;
diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h
deleted file mode 100644
index 879f5c78b91a30fb05681668797a5f07c6bf43b9..0000000000000000000000000000000000000000
--- a/include/linux/platform_data/usb-davinci.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * USB related definitions
- *
- * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef __ASM_ARCH_USB_H
-#define __ASM_ARCH_USB_H
-
-/* Passed as the platform data to the OHCI driver */
-struct da8xx_ohci_root_hub {
- /* Time from power on to power good (in 2 ms units) */
- u8 potpgt;
-};
-
-void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);
-
-#endif /* ifndef __ASM_ARCH_USB_H */
---
base-commit: 0f2995693867bfb26197b117cd55624ddc57582f
change-id: 20251114-davinci-usb-a66b2b9798fc
Best regards,
--
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
On Fri, Nov 14, 2025 at 07:37:55PM +0100, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> We no longer support any board files for DaVinci in mainline and so
> struct da8xx_ohci_root_hub is no longer used. Remove it together with
> all the code it's used for.
>
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
Acked-by: Alan Stern <stern@rowland.harvard.edu>
> drivers/usb/host/ohci-da8xx.c | 17 -----------------
> include/linux/platform_data/usb-davinci.h | 22 ----------------------
> 2 files changed, 39 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
> index 3c5ca2d7c92ed786af41d98ed124926ae06d4025..0938c0e7a8b6d54cf1981298119d51a3bfe49148 100644
> --- a/drivers/usb/host/ohci-da8xx.c
> +++ b/drivers/usb/host/ohci-da8xx.c
> @@ -18,7 +18,6 @@
> #include <linux/of.h>
> #include <linux/platform_device.h>
> #include <linux/phy/phy.h>
> -#include <linux/platform_data/usb-davinci.h>
> #include <linux/regulator/consumer.h>
> #include <linux/usb.h>
> #include <linux/usb/hcd.h>
> @@ -166,17 +165,6 @@ static int ohci_da8xx_has_oci(struct usb_hcd *hcd)
> return 0;
> }
>
> -static int ohci_da8xx_has_potpgt(struct usb_hcd *hcd)
> -{
> - struct device *dev = hcd->self.controller;
> - struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
> -
> - if (hub && hub->potpgt)
> - return 1;
> -
> - return 0;
> -}
> -
> static int ohci_da8xx_regulator_event(struct notifier_block *nb,
> unsigned long event, void *data)
> {
> @@ -228,7 +216,6 @@ static int ohci_da8xx_register_notify(struct usb_hcd *hcd)
> static int ohci_da8xx_reset(struct usb_hcd *hcd)
> {
> struct device *dev = hcd->self.controller;
> - struct da8xx_ohci_root_hub *hub = dev_get_platdata(dev);
> struct ohci_hcd *ohci = hcd_to_ohci(hcd);
> int result;
> u32 rh_a;
> @@ -266,10 +253,6 @@ static int ohci_da8xx_reset(struct usb_hcd *hcd)
> rh_a &= ~RH_A_NOCP;
> rh_a |= RH_A_OCPM;
> }
> - if (ohci_da8xx_has_potpgt(hcd)) {
> - rh_a &= ~RH_A_POTPGT;
> - rh_a |= hub->potpgt << 24;
> - }
> ohci_writel(ohci, rh_a, &ohci->regs->roothub.a);
>
> return result;
> diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h
> deleted file mode 100644
> index 879f5c78b91a30fb05681668797a5f07c6bf43b9..0000000000000000000000000000000000000000
> --- a/include/linux/platform_data/usb-davinci.h
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -/*
> - * USB related definitions
> - *
> - * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com>
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
> - */
> -
> -#ifndef __ASM_ARCH_USB_H
> -#define __ASM_ARCH_USB_H
> -
> -/* Passed as the platform data to the OHCI driver */
> -struct da8xx_ohci_root_hub {
> - /* Time from power on to power good (in 2 ms units) */
> - u8 potpgt;
> -};
> -
> -void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);
> -
> -#endif /* ifndef __ASM_ARCH_USB_H */
>
> ---
> base-commit: 0f2995693867bfb26197b117cd55624ddc57582f
> change-id: 20251114-davinci-usb-a66b2b9798fc
>
> Best regards,
> --
> Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
© 2016 - 2026 Red Hat, Inc.