diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
| commit | 2a17e75a976d11c1712972d29813094b8020ac35 (patch) | |
| tree | ea0e991c927752937803d72a5411f7159365aa83 /arch/arm/mach-omap | |
| parent | a5f75fe8175aefec5b7cefaadc5359096c8eb22c (diff) | |
| parent | 7185b353c96e1e831533eeaaada06ad9bebf84a2 (diff) | |
| download | barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.gz barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/mach-omap')
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap/include/mach/am33xx-devices.h | 80 |
2 files changed, 0 insertions, 81 deletions
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index e793175f38..49ca0ee157 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -186,7 +186,6 @@ config MACH_VSCOM_BALTOS config MACH_WAGO_PFC_AM35XX bool "Wago PFC200 Fieldbus Controller" select ARCH_AM35XX - select HAVE_DEFAULT_ENVIRONMENT_NEW select HAVE_PBL_MULTI_IMAGES select HAVE_CONFIGURABLE_MEMORY_LAYOUT help diff --git a/arch/arm/mach-omap/include/mach/am33xx-devices.h b/arch/arm/mach-omap/include/mach/am33xx-devices.h deleted file mode 100644 index 4790071c98..0000000000 --- a/arch/arm/mach-omap/include/mach/am33xx-devices.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef __MACH_OMAP3_DEVICES_H -#define __MACH_OMAP3_DEVICES_H - -#include <driver.h> -#include <linux/sizes.h> -#include <mach/am33xx-silicon.h> -#include <mach/devices.h> -#include <mach/omap_hsmmc.h> -#include <mach/cpsw.h> - -/* the device numbering is the same as in the TRM memory map (SPRUH73G) */ - -static inline struct device_d *am33xx_add_uart0(void) -{ - return omap_add_uart(0, AM33XX_UART0_BASE); -} - -static inline struct device_d *am33xx_add_uart1(void) -{ - return omap_add_uart(1, AM33XX_UART1_BASE); -} - -static inline struct device_d *am33xx_add_uart2(void) -{ - return omap_add_uart(2, AM33XX_UART2_BASE); -} - -static inline struct device_d *am33xx_add_mmc0(struct omap_hsmmc_platform_data *pdata) -{ - return add_generic_device("omap4-hsmmc", 0, NULL, - AM33XX_MMCHS0_BASE, SZ_4K, IORESOURCE_MEM, pdata); -} - -static inline struct device_d *am33xx_add_mmc1(struct omap_hsmmc_platform_data *pdata) -{ - return add_generic_device("omap4-hsmmc", 1, NULL, - AM33XX_MMC1_BASE, SZ_4K, IORESOURCE_MEM, pdata); -} - -static inline struct device_d *am33xx_add_cpsw(struct cpsw_platform_data *cpsw_data) -{ - return add_generic_device("cpsw", 0, NULL, - AM335X_CPSW_BASE, SZ_32K, IORESOURCE_MEM, cpsw_data); -} - -static inline struct device_d *am33xx_add_spi(int id, resource_size_t start) -{ - return add_generic_device("omap4-spi", id, NULL, start, SZ_4K, - IORESOURCE_MEM, NULL); -} - -static inline struct device_d *am33xx_add_spi0(void) -{ - return am33xx_add_spi(0, AM33XX_MCSPI0_BASE); -} - -static inline struct device_d *am33xx_add_spi1(void) -{ - return am33xx_add_spi(1, AM33XX_MCSPI1_BASE); -} - -static inline struct device_d *am33xx_add_i2c0(void *pdata) -{ - return add_generic_device("i2c-am33xx", 0, NULL, AM33XX_I2C0_BASE, - SZ_4K, IORESOURCE_MEM, pdata); -} - -static inline struct device_d *am33xx_add_i2c1(void *pdata) -{ - return add_generic_device("i2c-am33xx", 1, NULL, AM33XX_I2C1_BASE, - SZ_4K, IORESOURCE_MEM, pdata); -} - -static inline struct device_d *am33xx_add_i2c2(void *pdata) -{ - return add_generic_device("i2c-am33xx", 2, NULL, AM33XX_I2C2_BASE, - SZ_4K, IORESOURCE_MEM, pdata); -} - -#endif /* __MACH_OMAP3_DEVICES_H */ |