Hi Tomi, do you see the same error as I do:
arch/arm/mach-omap2/display.c: In function 'omap5_dsi_mux_pads': arch/arm/mach-omap2/display.c:161:2: error: implicit declaration of function 'omap4_ctrl_pad_readl' [-Werror=implicit-function-declaration] arch/arm/mach-omap2/display.c:164:2: error: implicit declaration of function 'omap4_ctrl_pad_writel' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors
hns$ git blame arch/arm/mach-omap2/display.c … ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 159) enable_mask = 0x1f << enable_shift; ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 160) ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 161) reg = omap4_ctrl_pad_readl(OMAP5_CONTROL_DSIPHY); ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 162) reg &= ~enable_mask; ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 163) reg |= (lanes << enable_shift) & enable_mask; ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 164) omap4_ctrl_pad_writel(reg, OMAP5_CONTROL_DSIPHY); ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 165) ddac6605 (Tomi Valkeinen 2014-03-07 12:45:14 +0200 166) return 0; …
iMac:master hns$ fgrep omap4_ctrl_pad_readl -R * System.map:c0022e18 T omap4_ctrl_pad_readl Binary file arch/arm/mach-omap2/built-in.o matches arch/arm/mach-omap2/control.h:#define omap4_ctrl_pad_readl(x) 0 arch/arm/mach-omap2/display.c: reg = omap4_ctrl_pad_readl(OMAP5_CONTROL_DSIPHY);
iMac:master hns$ git blame arch/arm/mach-omap2/control.h … 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 443) #ifndef __ASSEMBLY__ 140455fa0 arch/arm/plat-omap/include/plat/control.h (Tony Lindgren 2010-02-12 12:26:48 -0800 444) #ifdef CONFIG_ARCH_OMAP2PLUS 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 445) extern u8 omap_ctrl_readb(u16 offset); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 446) extern u16 omap_ctrl_readw(u16 offset); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 447) extern u32 omap_ctrl_readl(u16 offset); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 448) extern void omap_ctrl_writeb(u8 val, u16 offset); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 449) extern void omap_ctrl_writew(u16 val, u16 offset); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 450) extern void omap_ctrl_writel(u32 val, u16 offset); 801407868 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:48:46 +0530 451) 801407868 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:48:46 +0530 452) extern void omap3_save_scratchpad_contents(void); 801407868 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:48:46 +0530 453) extern void omap3_clear_scratchpad_contents(void); 14c79bbed arch/arm/mach-omap2/control.h (Kevin Hilman 2011-06-23 17:16:14 -0700 454) extern void omap3_restore(void); 14c79bbed arch/arm/mach-omap2/control.h (Kevin Hilman 2011-06-23 17:16:14 -0700 455) extern void omap3_restore_es3(void); 14c79bbed arch/arm/mach-omap2/control.h (Kevin Hilman 2011-06-23 17:16:14 -0700 456) extern void omap3_restore_3630(void); 801407868 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:48:46 +0530 457) extern u32 omap3_arm_context[128]; c96631e13 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:49:02 +0530 458) extern void omap3_control_save_context(void); c96631e13 arch/arm/plat-omap/include/plat/control.h (Rajendra Nayak 2008-09-26 17:49:02 +0530 459) extern void omap3_control_restore_context(void); 166353bd7 arch/arm/mach-omap2/control.h (Paul Walmsley 2010-12-21 20:01:21 -0700 460) extern void omap3_ctrl_write_boot_mode(u8 bootmode); 90f1380ef arch/arm/mach-omap2/control.h (Omar Ramirez Luna 2012-06-18 16:18:09 -0600 461) extern void omap_ctrl_write_dsp_boot_addr(u32 bootaddr); 90f1380ef arch/arm/mach-omap2/control.h (Omar Ramirez Luna 2012-06-18 16:18:09 -0600 462) extern void omap_ctrl_write_dsp_boot_mode(u8 bootmode); 458e999eb arch/arm/mach-omap2/control.h (Nishanth Menon 2010-12-20 14:05:06 -0600 463) extern void omap3630_ctrl_disable_rta(void); 596efe479 arch/arm/mach-omap2/control.h (Paul Walmsley 2010-12-21 21:05:16 -0700 464) extern int omap3_ctrl_save_padconf(void); ba12c2428 arch/arm/mach-omap2/control.h (Tero Kristo 2014-03-04 17:43:04 +0200 465) void omap3_ctrl_init(void); 2208bf115 arch/arm/mach-omap2/control.h (Tero Kristo 2014-11-13 19:17:34 +0200 466) int omap2_control_base_init(void); fe87414f7 arch/arm/mach-omap2/control.h (Tero Kristo 2014-03-12 18:33:45 +0200 467) int omap_control_init(void); efde23467 arch/arm/mach-omap2/control.h (Tero Kristo 2015-02-20 10:08:52 +0200 468) void omap2_set_globals_control(void __iomem *ctrl); 2208bf115 arch/arm/mach-omap2/control.h (Tero Kristo 2014-11-13 19:17:34 +0200 469) void __init omap3_control_legacy_iomap_init(void); 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 470) #else 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 471) #define omap_ctrl_readb(x) 0 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 472) #define omap_ctrl_readw(x) 0 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 473) #define omap_ctrl_readl(x) 0 70ba71a25 arch/arm/plat-omap/include/plat/control.h (Santosh Shilimkar 2010-09-27 14:02:57 -0600 474) #define omap4_ctrl_pad_readl(x) 0 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 475) #define omap_ctrl_writeb(x, y) WARN_ON(1) 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 476) #define omap_ctrl_writew(x, y) WARN_ON(1) 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 477) #define omap_ctrl_writel(x, y) WARN_ON(1) 70ba71a25 arch/arm/plat-omap/include/plat/control.h (Santosh Shilimkar 2010-09-27 14:02:57 -0600 478) #define omap4_ctrl_pad_writel(x, y) WARN_ON(1) 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 479) #endif 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 480) #endif /* __ASSEMBLY__ */ 69d88a00a include/asm-arm/arch-omap/control.h (Paul Walmsley 2008-03-18 10:02:50 +0200 481) 4814ced51 arch/arm/mach-omap2/control.h (Paul Walmsley 2010-10-08 11:40:20 -0600 482) #endif /* __ARCH_ARM_MACH_OMAP2_CONTROL_H */
So it does not exist if CONFIG_ARCH_OMAP2PLUS
How can I fix it?
BR, Nikolaus