few omap randconfig fixes for v3.10
Subsystems (3)
Tony Lindgren
maintainercover few omap randconfig fixes for v3.10
Few trivial fixes for randconfig found issues.
Regards,
Tony
---
Tony Lindgren (3):
ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
ARM: OMAP2+: Fix unused variable warning for am3517 crane
ARM: OMAP2+: Fix is_gpmc_muxed warning for H4
arch/arm/configs/omap2plus_defconfig | 2 ++ arch/arm/mach-omap2/Kconfig | 2 -- arch/arm/mach-omap2/board-am3517crane.c | 2 -- arch/arm/mach-omap2/board-h4.c | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
Signature
Tony Lindgren
maintainerPATCH 1/3 ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
Commit 8a6201b9 (ARM: OMAP2+: Fix unmet direct dependencies for zoom for 8250 serial) fixed unmet direct dependencies for 8250, but failed to do the same for omap serial. This can cause the following warning:
warning: (ARCH_OMAP2PLUS_TYPICAL) selects SERIAL_OMAP which has unmet direct dependencies (TTY && HAS_IOMEM && GENERIC_HARDIRQS && ARCH_OMAP2PLUS).
We should not select drivers, they should be selected by the user. Fix the issue by removing the select and adding them to omap2plus_defconfig instead.
--- arch/arm/configs/omap2plus_defconfig | 2 ++ arch/arm/mach-omap2/Kconfig | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/configs/omap2plus_defconfig +2 -0
@@ -137,6 +137,8 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C_CHARDEV=y CONFIG_SPI=y
arch/arm/mach-omap2/Kconfig +0 -2
@@ -37,8 +37,6 @@ config ARCH_OMAP2PLUS_TYPICAL select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 select PM_RUNTIME select REGULATOR - select SERIAL_OMAP - select SERIAL_OMAP_CONSOLE select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4 select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4 select VFP
Tony Lindgren
maintainerPATCH 2/3 ARM: OMAP2+: Fix unused variable warning for am3517 crane
In reply to Tony LindgrenFix the following by removing the unused variable:
arch/arm/mach-omap2/board-am3517crane.c: In function ?am3517_crane_init?:arch/arm/mach-omap2/board-am3517crane.c:113: warning: unused variable ?ret?
--- arch/arm/mach-omap2/board-am3517crane.c | 2 -- 1 file changed, 2 deletions(-)
arch/arm/mach-omap2/board-am3517crane.c +0 -2
@@ -110,8 +110,6 @@ static void __init am3517_crane_i2c_init(void)static void __init am3517_crane_init (void ) { -int ret; -omap3_mux_init (board_mux,OMAP_PACKAGE_CBB );omap_serial_init ();omap_sdrc_init (NULL ,NULL );
Tony Lindgren
maintainerPATCH 3/3 ARM: OMAP2+: Fix is_gpmc_muxed warning for H4
In reply to Tony LindgrenFix the following error by moving the function to be within the smc91x related ifdef as that's the only user:
arch/arm/mach-omap2/board-h4.c:238: warning: ?is_gpmc_muxed? defined but not used
--- arch/arm/mach-omap2/board-h4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-h4.c +2 -2
@@ -229,6 +229,8 @@ static u32 get_sysboot_value(void) OMAP2_SYSBOOT_1_MASK | OMAP2_SYSBOOT_0_MASK)); } +#if IS_ENABLED (CONFIG_SMC91X ) +/* H4-2420's always used muxed mode, H4-2422's always use non-muxed * * Note: OMAP-GIT doesn't correctly do is_cpu_omap2422 and is_cpu_omap2423
@@ -246,8 +248,6 @@ static u32 is_gpmc_muxed(void)return 0 ; } -#if IS_ENABLED (CONFIG_SMC91X ) -static struct omap_smc91x_platform_data board_smc91x_data = { .cs =1 , .gpio_irq =92 ,