aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/platform_data/i2c-pxa.h (renamed from include/linux/i2c/pxa-i2c.h)11
-rw-r--r--include/linux/soc/mediatek/infracfg.h7
2 files changed, 4 insertions, 14 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 {
71 unsigned char master_code; 71 unsigned char master_code;
72 unsigned long rate; 72 unsigned long rate;
73}; 73};
74
75extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
76
77#ifdef CONFIG_PXA27x
78extern void pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info);
79#endif
80
81#ifdef CONFIG_PXA3xx
82extern void pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info);
83#endif
84
85#endif 74#endif
diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h
index e8d9f0d52933..b0a507d356ef 100644
--- a/include/linux/soc/mediatek/infracfg.h
+++ b/include/linux/soc/mediatek/infracfg.h
@@ -28,7 +28,8 @@
28#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \ 28#define MT7622_TOP_AXI_PROT_EN_WB (BIT(2) | BIT(6) | \
29 BIT(7) | BIT(8)) 29 BIT(7) | BIT(8))
30 30
31int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask); 31int mtk_infracfg_set_bus_protection(struct regmap *infracfg, u32 mask,
32int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask); 32 bool reg_update);
33 33int mtk_infracfg_clear_bus_protection(struct regmap *infracfg, u32 mask,
34 bool reg_update);
34#endif /* __SOC_MEDIATEK_INFRACFG_H */ 35#endif /* __SOC_MEDIATEK_INFRACFG_H */