Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f

Authored by Jonas Bonn
1 parent f1ecc69838
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

iomap: make IOPORT/PCI mapping functions conditional 

Use the CONFIG_HAS_IOPORT and CONFIG_PCI options to decide whether or
not functions for mapping these areas are provided.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Acked-by: Arnd Bergmann <arnd@arndb.de>

Showing 3 changed files with 10 additions and 0 deletions Side-by-side Diff

include/asm-generic/io.h
Diff comments   View file @ 82ed223
... ... @@ -332,6 +332,7 @@
332 332 }
333 333 #endif /* CONFIG_MMU */
334 334  
  335 +#ifdef CONFIG_HAS_IOPORT
335 336 #ifndef CONFIG_GENERIC_IOMAP
336 337 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
337 338 {
... ... @@ -345,6 +346,7 @@
345 346 extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
346 347 extern void ioport_unmap(void __iomem *p);
347 348 #endif /* CONFIG_GENERIC_IOMAP */
  349 +#endif /* CONFIG_HAS_IOPORT */
348 350  
349 351 #define xlate_dev_kmem_ptr(p) p
350 352 #define xlate_dev_mem_ptr(p) __va(p)
include/asm-generic/iomap.h
Diff comments   View file @ 82ed223
... ... @@ -56,18 +56,22 @@
56 56 extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
57 57 extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
58 58  
  59 +#ifdef CONFIG_HAS_IOPORT
59 60 /* Create a virtual mapping cookie for an IO port range */
60 61 extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
61 62 extern void ioport_unmap(void __iomem *);
  63 +#endif
62 64  
63 65 #ifndef ARCH_HAS_IOREMAP_WC
64 66 #define ioremap_wc ioremap_nocache
65 67 #endif
66 68  
  69 +#ifdef CONFIG_PCI
67 70 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
68 71 struct pci_dev;
69 72 extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
70 73 extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
  74 +#endif
71 75  
72 76 #endif
... ... @@ -224,6 +224,7 @@
224 224 EXPORT_SYMBOL(iowrite16_rep);
225 225 EXPORT_SYMBOL(iowrite32_rep);
226 226  
  227 +#ifdef CONFIG_HAS_IOPORT
227 228 /* Create a virtual mapping cookie for an IO port range */
228 229 void __iomem *ioport_map(unsigned long port, unsigned int nr)
229 230 {
230 231  
... ... @@ -238,7 +239,9 @@
238 239 }
239 240 EXPORT_SYMBOL(ioport_map);
240 241 EXPORT_SYMBOL(ioport_unmap);
  242 +#endif /* CONFIG_HAS_IOPORT */
241 243  
  244 +#ifdef CONFIG_PCI
242 245 /**
243 246 * pci_iomap - create a virtual mapping cookie for a PCI BAR
244 247 * @dev: PCI device that owns the BAR
... ... @@ -280,4 +283,5 @@
280 283 }
281 284 EXPORT_SYMBOL(pci_iomap);
282 285 EXPORT_SYMBOL(pci_iounmap);
  286 +#endif /* CONFIG_PCI */