forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/mach-omap2/common.h
....@@ -111,7 +111,14 @@
111111 #define OMAP_L2C_AUX_CTRL 0
112112 #define omap4_l2c310_write_sec NULL
113113 #endif
114
+
115
+#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
114116 extern void omap5_realtime_timer_init(void);
117
+#else
118
+static inline void omap5_realtime_timer_init(void)
119
+{
120
+}
121
+#endif
115122
116123 void omap2420_init_early(void);
117124 void omap2430_init_early(void);
....@@ -255,7 +262,7 @@
255262 extern void gic_dist_enable(void);
256263 extern bool gic_dist_disabled(void);
257264 extern void gic_timer_retrigger(void);
258
-extern void omap_smc1(u32 fn, u32 arg);
265
+extern void _omap_smc1(u32 fn, u32 arg);
259266 extern void omap4_sar_ram_init(void);
260267 extern void __iomem *omap4_get_sar_ram_base(void);
261268 extern void omap4_mpuss_early_init(void);
....@@ -336,14 +343,25 @@
336343 }
337344 #endif
338345
346
+#ifdef CONFIG_SOC_DRA7XX
347
+extern int dra7xx_pciess_reset(struct omap_hwmod *oh);
348
+#else
349
+static inline int dra7xx_pciess_reset(struct omap_hwmod *oh)
350
+{
351
+ return 0;
352
+}
353
+#endif
354
+
355
+struct omap_system_dma_plat_info;
356
+
339357 void pdata_quirks_init(const struct of_device_id *);
340358 void omap_auxdata_legacy_init(struct device *dev);
341359 void omap_pcs_legacy_init(int irq, void (*rearm)(void));
360
+extern struct omap_system_dma_plat_info dma_plat_info;
342361
343362 struct omap_sdrc_params;
344363 extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
345364 struct omap_sdrc_params *sdrc_cs1);
346
-struct omap2_hsmmc_info;
347365 extern void omap_reserve(void);
348366
349367 struct omap_hwmod;