diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-04 23:10:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 23:10:08 -0800 |
| commit | add49f7835ccd92b4b0759694fabfd04f685596f (patch) | |
| tree | 9c5c927eaac667c8940bf149d6596d0cd3595cca /include/linux | |
| parent | 34c1baec7d013e2a4166fc20a8a7d8ba260969fa (diff) | |
| parent | 9c66638412cd2162f02f9beb12f5495bfe650d03 (diff) | |
| download | cachepc-linux-add49f7835ccd92b4b0759694fabfd04f685596f.tar.gz cachepc-linux-add49f7835ccd92b4b0759694fabfd04f685596f.zip | |
Merge tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for v4.16 cycle.
It is :
- the conversion to the new parser sharpslpart parser
for the Sharp variants
- an I2C platform data cleanup for PXA
- a gpioreg switch of one register for lubbock
* tag 'pxa-for-4.16' of https://github.com/rjarzmik/linux:
ARM: pxa/lubbock: add GPIO driver for LUB_MISC_WR register
ARM: pxa/poodle: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/tosa: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser
ARM: pxa: move header file out of I2C realm
ARM: pxa: move declarations to proper place
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/i2c-pxa.h (renamed from include/linux/i2c/pxa-i2c.h) | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/platform_data/i2c-pxa.h index 53aab243cbd8..5236f216dfae 100644 --- a/include/linux/i2c/pxa-i2c.h +++ b/include/linux/platform_data/i2c-pxa.h @@ -71,15 +71,4 @@ struct i2c_pxa_platform_data { unsigned char master_code; unsigned long rate; }; - -extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info); - -#ifdef CONFIG_PXA27x -extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info); -#endif - -#ifdef CONFIG_PXA3xx -extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info); -#endif - #endif |