lkml.org 
[lkml]   [2023]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/27] ARM: pxa: remove unused pxa3xx-ulpi
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    This was only used by the cm-x300 board, which is now gone.

    Cc: Alan Stern <stern@rowland.harvard.edu>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: linux-usb@vger.kernel.org
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/arm/mach-pxa/Makefile | 2 +-
    arch/arm/mach-pxa/devices.c | 28 --
    arch/arm/mach-pxa/devices.h | 1 -
    arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 ------------------
    arch/arm/mach-pxa/regs-u2d.h | 199 ---------
    drivers/usb/host/ohci-pxa27x.c | 9 -
    include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 --
    7 files changed, 1 insertion(+), 655 deletions(-)
    delete mode 100644 arch/arm/mach-pxa/pxa3xx-ulpi.c
    delete mode 100644 arch/arm/mach-pxa/regs-u2d.h
    delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h

    diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
    index 4ca8cac2e60f..9624f90d9ef6 100644
    --- a/arch/arm/mach-pxa/Makefile
    +++ b/arch/arm/mach-pxa/Makefile
    @@ -12,7 +12,7 @@ obj-$(CONFIG_PM) += pm.o sleep.o standby.o
    # SoC-specific code
    obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o
    obj-$(CONFIG_PXA27x) += mfp-pxa2xx.o pxa2xx.o pxa27x.o
    -obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o pxa3xx-ulpi.o
    +obj-$(CONFIG_PXA3xx) += mfp-pxa3xx.o pxa3xx.o smemc.o
    obj-$(CONFIG_CPU_PXA300) += pxa300.o

    # NOTE: keep the order of boards in accordance to their order in Kconfig
    diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
    index 72adaac9f332..8e3bc56d2044 100644
    --- a/arch/arm/mach-pxa/devices.c
    +++ b/arch/arm/mach-pxa/devices.c
    @@ -12,7 +12,6 @@
    #include <linux/soc/pxa/cpu.h>

    #include "udc.h"
    -#include <linux/platform_data/usb-pxa3xx-ulpi.h>
    #include <linux/platform_data/video-pxafb.h>
    #include <linux/platform_data/mmc-pxamci.h>
    #include "irqs.h"
    @@ -130,33 +129,6 @@ struct platform_device pxa27x_device_udc = {
    }
    };

    -#ifdef CONFIG_PXA3xx
    -static struct resource pxa3xx_u2d_resources[] = {
    - [0] = {
    - .start = 0x54100000,
    - .end = 0x54100fff,
    - .flags = IORESOURCE_MEM,
    - },
    - [1] = {
    - .start = IRQ_USB2,
    - .end = IRQ_USB2,
    - .flags = IORESOURCE_IRQ,
    - },
    -};
    -
    -struct platform_device pxa3xx_device_u2d = {
    - .name = "pxa3xx-u2d",
    - .id = -1,
    - .resource = pxa3xx_u2d_resources,
    - .num_resources = ARRAY_SIZE(pxa3xx_u2d_resources),
    -};
    -
    -void __init pxa3xx_set_u2d_info(struct pxa3xx_u2d_platform_data *info)
    -{
    - pxa_register_device(&pxa3xx_device_u2d, info);
    -}
    -#endif /* CONFIG_PXA3xx */
    -
    static struct resource pxafb_resources[] = {
    [0] = {
    .start = 0x44000000,
    diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
    index 2828bea76cd7..82c83939017a 100644
    --- a/arch/arm/mach-pxa/devices.h
    +++ b/arch/arm/mach-pxa/devices.h
    @@ -9,7 +9,6 @@ extern struct platform_device pxa3xx_device_mci2;
    extern struct platform_device pxa3xx_device_mci3;
    extern struct platform_device pxa25x_device_udc;
    extern struct platform_device pxa27x_device_udc;
    -extern struct platform_device pxa3xx_device_u2d;
    extern struct platform_device pxa_device_fb;
    extern struct platform_device pxa_device_ffuart;
    extern struct platform_device pxa_device_btuart;
    diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c
    deleted file mode 100644
    index c29a7f0fa1b0..000000000000
    diff --git a/arch/arm/mach-pxa/regs-u2d.h b/arch/arm/mach-pxa/regs-u2d.h
    deleted file mode 100644
    index ab517ba62c9a..000000000000
    diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
    index a1dad8745622..0bc7e96bcc93 100644
    --- a/drivers/usb/host/ohci-pxa27x.c
    +++ b/drivers/usb/host/ohci-pxa27x.c
    @@ -29,7 +29,6 @@
    #include <linux/of_platform.h>
    #include <linux/of_gpio.h>
    #include <linux/platform_data/usb-ohci-pxa27x.h>
    -#include <linux/platform_data/usb-pxa3xx-ulpi.h>
    #include <linux/platform_device.h>
    #include <linux/regulator/consumer.h>
    #include <linux/signal.h>
    @@ -275,7 +274,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
    int retval;
    struct pxaohci_platform_data *inf;
    uint32_t uhchr;
    - struct usb_hcd *hcd = dev_get_drvdata(dev);

    inf = dev_get_platdata(dev);

    @@ -301,9 +299,6 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
    return retval;
    }

    - if (cpu_is_pxa3xx())
    - pxa3xx_u2d_start_hc(&hcd->self);
    -
    uhchr = __raw_readl(pxa_ohci->mmio_base + UHCHR) & ~UHCHR_SSE;
    __raw_writel(uhchr, pxa_ohci->mmio_base + UHCHR);
    __raw_writel(UHCHIE_UPRIE | UHCHIE_RWIE, pxa_ohci->mmio_base + UHCHIE);
    @@ -316,14 +311,10 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
    static void pxa27x_stop_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
    {
    struct pxaohci_platform_data *inf;
    - struct usb_hcd *hcd = dev_get_drvdata(dev);
    uint32_t uhccoms;

    inf = dev_get_platdata(dev);

    - if (cpu_is_pxa3xx())
    - pxa3xx_u2d_stop_hc(&hcd->self);
    -
    if (inf->exit)
    inf->exit(dev);

    diff --git a/include/linux/platform_data/usb-pxa3xx-ulpi.h b/include/linux/platform_data/usb-pxa3xx-ulpi.h
    deleted file mode 100644
    index 4d31a5cbdeb1..000000000000
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:28    [W:3.959 / U:0.464 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site