diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 14:47:02 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 14:47:02 (GMT) |
commit | 90793df938f11e676880338b94feb4d45cc3701e (patch) | |
tree | 0e3abe64246357a43b3ad96c023da5ad3fa2e94d /arch/arm/mach-imx/devices/devices-common.h | |
parent | 260caadebde754a3851803a17a8287478c090a80 (diff) | |
parent | 3481bdce6516a1872f3ac0af43ba56d0e1ee3afa (diff) | |
download | linux-90793df938f11e676880338b94feb4d45cc3701e.tar.xz |
Merge tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup
Pull "i.MX cleanup for 4.9" from Shawn Guo:
- Drop i.MX1 board files and make i.MX1 a DT only platform.
- Remove obsolete ENET initialization code for TX28 board, since FEC
driver handles those setup well now.
- A couple of cleanups on i.MX31 IOMUX headers to drop duplications
- A few other random and trivial cleanups
* tag 'imx-cleanup-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: (trivial) fix typo and grammar
ARM: imx: use IS_ENABLED() instead of checking for built-in or module
ARM: imx: remove platform-mxc_rnga
ARM: imx: no need to select SMP_ON_UP explicitly
ARM: i.MX: Move SOC_IMX1 into 'Device tree only'
ARM: i.MX: Remove i.MX1 non-DT support
ARM: i.MX: Remove i.MX1 Synertronixx SCB9328 board support
ARM: i.MX: Remove i.MX1 Armadeus APF9328 board support
ARM: mxs: remove obsolete startup code for TX28
ARM: i.MX31 iomux: remove duplicates with alternate name
ARM: i.MX31 iomux: remove plain duplicates
Diffstat (limited to 'arch/arm/mach-imx/devices/devices-common.h')
-rw-r--r-- | arch/arm/mach-imx/devices/devices-common.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 09cebd8..6920e35 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h @@ -154,18 +154,6 @@ struct platform_device *__init imx_add_imx_ssi( const struct imx_ssi_platform_data *pdata); #include <linux/platform_data/serial-imx.h> -struct imx_imx_uart_3irq_data { - int id; - resource_size_t iobase; - resource_size_t iosize; - resource_size_t irqrx; - resource_size_t irqtx; - resource_size_t irqrts; -}; -struct platform_device *__init imx_add_imx_uart_3irq( - const struct imx_imx_uart_3irq_data *data, - const struct imxuart_platform_data *pdata); - struct imx_imx_uart_1irq_data { int id; resource_size_t iobase; |