openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  omap: Remove DEBUG_FS dependency for mux name checking
This commit is contained in:
Linus Torvalds 2010-02-20 16:55:41 -08:00
parent cf7ad04300 b72c7d5435
commit c52042ba5c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-omap2/mux.c
View File

@ -961,16 +961,14 @@ static void __init omap_mux_init_list(struct omap_mux *superset)
while (superset->reg_offset != OMAP_MUX_TERMINATOR) { while (superset->reg_offset != OMAP_MUX_TERMINATOR) {
struct omap_mux *entry; struct omap_mux *entry;
#ifndef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
/* Skip pins that are not muxed as GPIO by bootloader */ if (!superset->muxnames || !superset->muxnames[0]) {
if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
superset++; superset++;
continue; continue;
} }
#endif #else
/* Skip pins that are not muxed as GPIO by bootloader */
#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
if (!superset->muxnames || !superset->muxnames[0]) {
superset++; superset++;
continue; continue;
} }