Re: [PATCH 2/3] ARM: OMAP2+: Remove legacy USB initialization code
On 11/09/18 18:06, Laurent Pinchart wrote:
> Several legacy USB-related functions, structures and macros are not used
> anymore after conversion to DT. Remove them.
>
> Signed-off-by: Laurent Pinchart
Acked-by: Roger Quadros
cheers,
-roger
> ---
> arch/arm/mach-omap2/common.h| 2 -
> arch/arm/mach-omap2/omap_phy_internal.c | 96
> +
> arch/arm/mach-omap2/usb.h | 71
> 3 files changed, 2 insertions(+), 167 deletions(-)
> delete mode 100644 arch/arm/mach-omap2/usb.h
>
> diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
> index 129455e822e4..7b561e07571e 100644
> --- a/arch/arm/mach-omap2/common.h
> +++ b/arch/arm/mach-omap2/common.h
> @@ -40,8 +40,6 @@
> #include "i2c.h"
> #include "serial.h"
>
> -#include "usb.h"
> -
> #define OMAP_INTC_START NR_IRQS
>
> extern int (*omap_pm_soc_init)(void);
> diff --git a/arch/arm/mach-omap2/omap_phy_internal.c
> b/arch/arm/mach-omap2/omap_phy_internal.c
> index 8e903564ede2..456a883bbbda 100644
> --- a/arch/arm/mach-omap2/omap_phy_internal.c
> +++ b/arch/arm/mach-omap2/omap_phy_internal.c
> @@ -23,17 +23,11 @@
>
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> -#include
> -#include
> -#include
> -#include
> #include
> -#include
> -#include
> +#include
> +#include
>
> #include "soc.h"
> -#include "control.h"
> -#include "usb.h"
>
> #define CONTROL_DEV_CONF 0x300
> #define PHY_PD 0x1
> @@ -66,89 +60,3 @@ static int __init omap4430_phy_power_down(void)
> return 0;
> }
> omap_early_initcall(omap4430_phy_power_down);
> -
> -void am35x_musb_reset(void)
> -{
> - u32 regval;
> -
> - /* Reset the musb interface */
> - regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
> -
> - regval |= AM35XX_USBOTGSS_SW_RST;
> - omap_ctrl_writel(regval, AM35XX_CONTROL_IP_SW_RESET);
> -
> - regval &= ~AM35XX_USBOTGSS_SW_RST;
> - omap_ctrl_writel(regval, AM35XX_CONTROL_IP_SW_RESET);
> -
> - regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
> -}
> -
> -void am35x_musb_phy_power(u8 on)
> -{
> - unsigned long timeout = jiffies + msecs_to_jiffies(100);
> - u32 devconf2;
> -
> - if (on) {
> - /*
> - * Start the on-chip PHY and its PLL.
> - */
> - devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
> -
> - devconf2 &= ~(CONF2_RESET | CONF2_PHYPWRDN | CONF2_OTGPWRDN);
> - devconf2 |= CONF2_PHY_PLLON;
> -
> - omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
> -
> - pr_info("Waiting for PHY clock good...\n");
> - while (!(omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2)
> - & CONF2_PHYCLKGD)) {
> - cpu_relax();
> -
> - if (time_after(jiffies, timeout)) {
> - pr_err("musb PHY clock good timed out\n");
> - break;
> - }
> - }
> - } else {
> - /*
> - * Power down the on-chip PHY.
> - */
> - devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
> -
> - devconf2 &= ~CONF2_PHY_PLLON;
> - devconf2 |= CONF2_PHYPWRDN | CONF2_OTGPWRDN;
> - omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
> - }
> -}
> -
> -void am35x_musb_clear_irq(void)
> -{
> - u32 regval;
> -
> - regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
> - regval |= AM35XX_USBOTGSS_INT_CLR;
> - omap_ctrl_writel(regval, AM35XX_CONTROL_LVL_INTR_CLEAR);
> - regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
> -}
> -
> -void am35x_set_mode(u8 musb_mode)
> -{
> - u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
> -
> - devconf2 &= ~CONF2_OTGMODE;
> - switch (musb_mode) {
> - case MUSB_HOST: /* Force VBUS valid, ID = 0 */
> - devconf2 |= CONF2_FORCE_HOST;
> - break;
> - case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */
> - devconf2 |= CONF2_FORCE_DEVICE;
> - break;
> - case MUSB_OTG: /* Don't override the VBUS/ID comparators */
> - devconf2 |= CONF2_NO_OVERRIDE;
> - break;
> - default:
> - pr_info("Unsupported mode %u\n", musb_mode);
> - }
> -
> - omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
> -}
> diff --git a/arch/arm/mach-omap2/usb.h b/arch/arm/mach-omap2/usb.h
> deleted file mode 100644
> index 740a499befce..
> --- a/arch/arm/mach-omap2/usb.h
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#include
> -
> -/* AM35x */
> -/* USB 2.0 PHY Control */
> -#define CONF2_PHY_GPIOMODE (1 << 23)
> -#define CONF2_OTGMODE(3 << 14)
> -#define CONF2_NO_OVERRIDE(0 << 14)
> -#define CONF2_FORCE_HOST
[PATCH 2/3] ARM: OMAP2+: Remove legacy USB initialization code
Several legacy USB-related functions, structures and macros are not used
anymore after conversion to DT. Remove them.
Signed-off-by: Laurent Pinchart
---
arch/arm/mach-omap2/common.h| 2 -
arch/arm/mach-omap2/omap_phy_internal.c | 96 +
arch/arm/mach-omap2/usb.h | 71
3 files changed, 2 insertions(+), 167 deletions(-)
delete mode 100644 arch/arm/mach-omap2/usb.h
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 129455e822e4..7b561e07571e 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -40,8 +40,6 @@
#include "i2c.h"
#include "serial.h"
-#include "usb.h"
-
#define OMAP_INTC_STARTNR_IRQS
extern int (*omap_pm_soc_init)(void);
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c
b/arch/arm/mach-omap2/omap_phy_internal.c
index 8e903564ede2..456a883bbbda 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -23,17 +23,11 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include
-#include
-#include
-#include
#include
-#include
-#include
+#include
+#include
#include "soc.h"
-#include "control.h"
-#include "usb.h"
#define CONTROL_DEV_CONF 0x300
#define PHY_PD 0x1
@@ -66,89 +60,3 @@ static int __init omap4430_phy_power_down(void)
return 0;
}
omap_early_initcall(omap4430_phy_power_down);
-
-void am35x_musb_reset(void)
-{
- u32 regval;
-
- /* Reset the musb interface */
- regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
-
- regval |= AM35XX_USBOTGSS_SW_RST;
- omap_ctrl_writel(regval, AM35XX_CONTROL_IP_SW_RESET);
-
- regval &= ~AM35XX_USBOTGSS_SW_RST;
- omap_ctrl_writel(regval, AM35XX_CONTROL_IP_SW_RESET);
-
- regval = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
-}
-
-void am35x_musb_phy_power(u8 on)
-{
- unsigned long timeout = jiffies + msecs_to_jiffies(100);
- u32 devconf2;
-
- if (on) {
- /*
-* Start the on-chip PHY and its PLL.
-*/
- devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
-
- devconf2 &= ~(CONF2_RESET | CONF2_PHYPWRDN | CONF2_OTGPWRDN);
- devconf2 |= CONF2_PHY_PLLON;
-
- omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
-
- pr_info("Waiting for PHY clock good...\n");
- while (!(omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2)
- & CONF2_PHYCLKGD)) {
- cpu_relax();
-
- if (time_after(jiffies, timeout)) {
- pr_err("musb PHY clock good timed out\n");
- break;
- }
- }
- } else {
- /*
-* Power down the on-chip PHY.
-*/
- devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
-
- devconf2 &= ~CONF2_PHY_PLLON;
- devconf2 |= CONF2_PHYPWRDN | CONF2_OTGPWRDN;
- omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
- }
-}
-
-void am35x_musb_clear_irq(void)
-{
- u32 regval;
-
- regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
- regval |= AM35XX_USBOTGSS_INT_CLR;
- omap_ctrl_writel(regval, AM35XX_CONTROL_LVL_INTR_CLEAR);
- regval = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
-}
-
-void am35x_set_mode(u8 musb_mode)
-{
- u32 devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
-
- devconf2 &= ~CONF2_OTGMODE;
- switch (musb_mode) {
- case MUSB_HOST: /* Force VBUS valid, ID = 0 */
- devconf2 |= CONF2_FORCE_HOST;
- break;
- case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */
- devconf2 |= CONF2_FORCE_DEVICE;
- break;
- case MUSB_OTG: /* Don't override the VBUS/ID comparators */
- devconf2 |= CONF2_NO_OVERRIDE;
- break;
- default:
- pr_info("Unsupported mode %u\n", musb_mode);
- }
-
- omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
-}
diff --git a/arch/arm/mach-omap2/usb.h b/arch/arm/mach-omap2/usb.h
deleted file mode 100644
index 740a499befce..
--- a/arch/arm/mach-omap2/usb.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#include
-
-/* AM35x */
-/* USB 2.0 PHY Control */
-#define CONF2_PHY_GPIOMODE (1 << 23)
-#define CONF2_OTGMODE (3 << 14)
-#define CONF2_NO_OVERRIDE (0 << 14)
-#define CONF2_FORCE_HOST (1 << 14)
-#define CONF2_FORCE_DEVICE (2 << 14)
-#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
-#define CONF2_SESENDEN (1 << 13)
-#define CONF2_VBDTCTEN (1 << 12)
-#define CONF2_REFFREQ_24MHZ(2 << 8)
-#define CONF2_REFFREQ_26MHZ(7 << 8)
-#define
