diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-12-10 21:43:02 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 13:54:44 -0800 |
| commit | 5d3e11c4782156f529deac2afc066f28308d9a80 (patch) | |
| tree | f16682da9b1e408c5ffd9a020beb531b211f5af0 /arch/arm/mach-mmp | |
| parent | 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 (diff) | |
ARM: mmp: fix pxa168_device_usb_phy use on aspenite
This one ended up in the wrong header file, causing a build failure
on at least one platform:
arch/arm/mach-mmp/aspenite.c: In function 'common_init':
arch/arm/mach-mmp/aspenite.c:260:28: error: 'pxa168_device_usb_phy' undeclared (first use in this function); did you mean 'pxa168_device_ssp5'?
We can just include both the pxa168.h and pxa910.h headers to make
that work, which gets us to the next failure:
arch/arm/mach-mmp/aspenite.o: In function `common_init':
aspenite.c:(.init.text+0x1c0): undefined reference to `pxa168_device_usb_phy'
This is solved by using the matching ifdef check around the
USB device registration, enabling them only when either USB
host or gadget mode are enabled.
Fixes: a225daf72ee7 ("ARM: mmp: add a pxa-usb-phy device")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mmp')
| -rw-r--r-- | arch/arm/mach-mmp/aspenite.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 23f99976b5f5..75b2d7db643e 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c @@ -29,6 +29,7 @@ #include "addr-map.h" #include "mfp-pxa168.h" #include "pxa168.h" +#include "pxa910.h" #include "irqs.h" #include "common.h" @@ -256,6 +257,7 @@ static void __init common_init(void) /* off-chip devices */ platform_device_register(&smc91x_device); +#if IS_ENABLED(CONFIG_USB_SUPPORT) #if IS_ENABLED(CONFIG_PHY_PXA_USB) platform_device_register(&pxa168_device_usb_phy); #endif @@ -263,6 +265,7 @@ static void __init common_init(void) #if IS_ENABLED(CONFIG_USB_EHCI_MV) pxa168_add_usb_host(&pxa168_sph_pdata); #endif +#endif } MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 767dcb23ee1c..09b53ace08ac 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c @@ -282,6 +282,7 @@ static void __init ttc_dkb_init(void) sizeof(struct pxa_gpio_platform_data)); platform_add_devices(ARRAY_AND_SIZE(ttc_dkb_devices)); +#if IS_ENABLED(CONFIG_USB_SUPPORT) #if IS_ENABLED(CONFIG_PHY_PXA_USB) platform_device_register(&pxa168_device_usb_phy); #endif @@ -300,6 +301,7 @@ static void __init ttc_dkb_init(void) pxa168_device_u2ootg.dev.platform_data = &ttc_usb_pdata; platform_device_register(&pxa168_device_u2ootg); #endif +#endif #if IS_ENABLED(CONFIG_MMP_DISP) add_disp(); |