SoC changes for omaps for v4.17
This series is mostly a series from Suman Anna to remove now unused platform data that is now coming from device tree. This also make it a bit simpler to move the timer code to live under drivers in a separate series of patches. There are also few minor clean-ups for omap4 PM code. -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlqddVYRHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXMy3BAAvhomxzjCQeIAaKJpMT0FQIKHYyk8mNB3 twuIqRAw+HPLTR+GXQlZc4ejR5ZicY+rrghhXgZ6q8pLNpra94qEAmulY+6t8VEt KMoAWQyxfLuXiGPxrdUDKMhimS2pzoCY4jZPfeOwTQV4nW5gyIlHEA204VVdWyCk Xli7OCEFRtccCbk605rDDRC1CYVCya59iqnUPywhQ3lFt0Ja93Z6ozLSSzmvLjyO D08e7E3TrgNQq9QtxxItG5+I49vu34Qnxcf/zda4oL+Tk13awgGTeoYAIkcgvepJ GX9SpRMss7A+k+usIVv+o3//bdeyLWSfWkyycVeBtdQtFJszC4SNYXsUUdDvoRh9 vkxnGA2JKKqdP+pPuNHnRBHZMaQCDpt7oTQjg7EZoHHyLqJKfWpnpUOCJznMvF5m doODYlwq99tytD/D6HzIHejU+0RGr6Zb3MhuZ2KVtz91OuDC15PIJb8A0+UWzElR HHc+eAj9hUoVSrtxoLCuoeKe7tAWB1rUTbIYQX+juMd7QmfgukRojeIIKVkTDzHF WRCyfeaUce1Mqy1AIxvUHTgE7pGXE8+4h6197nQro602HBMFAOSbrt3XNESWHlth 1XIYI8E9KgDsTyvDoYUoS1jWEx2qFImjB20zLhm6oiFgl/vygBVB214H+AAJqCEr mnlDRfSuafY= =ivau -----END PGP SIGNATURE----- Merge tag 'omap-for-v4.17/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "SoC changes for omaps for v4.17" from Tony Lindgren: This series is mostly a series from Suman Anna to remove now unused platform data that is now coming from device tree. This also make it a bit simpler to move the timer code to live under drivers in a separate series of patches. There are also few minor clean-ups for omap4 PM code. * tag 'omap-for-v4.17/soc-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix typo for wakeup_ns_pa_addr ARM: OMAP2+: Use v7_invalidate_l1 in omap4_finish_suspend ARM: OMAP2+: Remove unused gpio header file references ARM: OMAP: Move plat/i2c.h into mach-omap1 folder ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data ARM: OMAP2+: Cleanup omap_timer_capability_dev_attr usage ARM: OMAP2+: Cleanup omap_i2c_dev_attr usage ARM: OMAP2+: Cleanup omap_gpio_dev_attr usage ARM: OMAP2+: Include types.h directly for hwmod data
This commit is contained in:
commit
7b80bd2948
26 changed files with 13 additions and 519 deletions
|
|
@ -25,10 +25,6 @@
|
|||
#include <linux/spinlock.h>
|
||||
#include <linux/clk.h>
|
||||
|
||||
#define MCBSP_CONFIG_TYPE2 0x2
|
||||
#define MCBSP_CONFIG_TYPE3 0x3
|
||||
#define MCBSP_CONFIG_TYPE4 0x4
|
||||
|
||||
/* Platform specific configuration */
|
||||
struct omap_mcbsp_ops {
|
||||
void (*request)(unsigned int);
|
||||
|
|
@ -47,14 +43,6 @@ struct omap_mcbsp_platform_data {
|
|||
int (*force_ick_on)(struct clk *clk, bool force_on);
|
||||
};
|
||||
|
||||
/**
|
||||
* omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod
|
||||
* @sidetone: name of the sidetone device
|
||||
*/
|
||||
struct omap_mcbsp_dev_attr {
|
||||
const char *sidetone;
|
||||
};
|
||||
|
||||
void omap3_mcbsp_init_pdata_callback(struct omap_mcbsp_platform_data *pdata);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -157,11 +157,6 @@
|
|||
#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr))
|
||||
#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES)
|
||||
|
||||
struct omap_gpio_dev_attr {
|
||||
int bank_width; /* GPIO bank width */
|
||||
bool dbck_flag; /* dbck required or not - True for OMAP3&4 */
|
||||
};
|
||||
|
||||
struct omap_gpio_reg_offs {
|
||||
u16 revision;
|
||||
u16 direction;
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
#ifndef _OMAP2_MCSPI_H
|
||||
#define _OMAP2_MCSPI_H
|
||||
|
||||
#define OMAP2_MCSPI_REV 0
|
||||
#define OMAP3_MCSPI_REV 1
|
||||
#define OMAP4_MCSPI_REV 2
|
||||
|
||||
#define OMAP4_MCSPI_REG_OFFSET 0x100
|
||||
|
||||
#define MCSPI_PINDIR_D0_IN_D1_OUT 0
|
||||
|
|
@ -17,10 +13,6 @@ struct omap2_mcspi_platform_config {
|
|||
unsigned int pin_dir:1;
|
||||
};
|
||||
|
||||
struct omap2_mcspi_dev_attr {
|
||||
unsigned short num_chipselect;
|
||||
};
|
||||
|
||||
struct omap2_mcspi_device_config {
|
||||
unsigned turbo_mode:1;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue