diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-06-18 22:53:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 22:53:20 -0700 |
| commit | 5a55029f46d636ffed430d47c7fc1bfa0e64a3b6 (patch) | |
| tree | 4e0dddf9172190dd778164c5c23ef9ccd0c73d7f /include/linux/platform_data | |
| parent | Merge tag 'renesas-soc-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc (diff) | |
| parent | ARM: at91: remove atmel_nand_data (diff) | |
Merge tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc
SoC for 4.13:
- New suspend/resume mode for sama5d2
- Initial support for armv7m based SoCs
* tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91: remove atmel_nand_data
ARM: at91: fix at91_suspend_entering_slow_clock link error
ARM: at91: debug: add samv7x support
ARM: at91: add armv7m SoC detection
ARM: at91: handle CONFIG_PM for armv7m configurations
ARM: at91: Add armv7m support
ARM: at91: Document armv7m compatibles
ARM: at91: Documentation: add armv7m families
ARM: at91: pm: fallback to slowclock when backup mode fails
ARM: at91: pm: allow selecting standby and suspend modes
ARM: at91: pm: Add sama5d2 backup mode
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/atmel.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 3c8825b67298..70c5c766628e 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -7,8 +7,6 @@ #ifndef __ATMEL_H__ #define __ATMEL_H__ -#include <linux/mtd/nand.h> -#include <linux/mtd/partitions.h> #include <linux/serial.h> /* Compact Flash */ @@ -23,25 +21,6 @@ struct at91_cf_data { #define AT91_IDE_SWAP_A0_A2 0x02 }; - /* NAND / SmartMedia */ -struct atmel_nand_data { - int enable_pin; /* chip enable */ - int det_pin; /* card detect */ - int rdy_pin; /* ready/busy */ - u8 rdy_pin_active_low; /* rdy_pin value is inverted */ - u8 ale; /* address line number connected to ALE */ - u8 cle; /* address line number connected to CLE */ - u8 bus_width_16; /* buswidth is 16 bit */ - u8 ecc_mode; /* ecc mode */ - u8 on_flash_bbt; /* bbt on flash */ - struct mtd_partition *parts; - unsigned int num_parts; - bool has_dma; /* support dma transfer */ - - /* default is false, only for at32ap7000 chip is true */ - bool need_reset_workaround; -}; - /* Serial */ struct atmel_uart_data { int num; /* port num */ @@ -52,6 +31,13 @@ struct atmel_uart_data { }; /* FIXME: this needs a better location, but gets stuff building again */ +#ifdef CONFIG_ATMEL_PM extern int at91_suspend_entering_slow_clock(void); +#else +static inline int at91_suspend_entering_slow_clock(void) +{ + return 0; +} +#endif #endif /* __ATMEL_H__ */ |