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/platform-spi_imx.c | |
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/platform-spi_imx.c')
-rw-r--r-- | arch/arm/mach-imx/devices/platform-spi_imx.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/devices/platform-spi_imx.c b/arch/arm/mach-imx/devices/platform-spi_imx.c index 5e9707b..d93c446 100644 --- a/arch/arm/mach-imx/devices/platform-spi_imx.c +++ b/arch/arm/mach-imx/devices/platform-spi_imx.c @@ -21,15 +21,6 @@ #define imx_spi_imx_data_entry(soc, type, devid, id, hwid, size) \ [id] = imx_spi_imx_data_entry_single(soc, type, devid, id, hwid, size) -#ifdef CONFIG_SOC_IMX1 -const struct imx_spi_imx_data imx1_cspi_data[] __initconst = { -#define imx1_cspi_data_entry(_id, _hwid) \ - imx_spi_imx_data_entry(MX1, CSPI, "imx1-cspi", _id, _hwid, SZ_4K) - imx1_cspi_data_entry(0, 1), - imx1_cspi_data_entry(1, 2), -}; -#endif - #ifdef CONFIG_SOC_IMX21 const struct imx_spi_imx_data imx21_cspi_data[] __initconst = { #define imx21_cspi_data_entry(_id, _hwid) \ |