Skip to content

Commit c021f24

Browse files
David R. Piegdontmlind
authored andcommitted
ARM: OMAP2+: Fix parser-bug in platform muxing code
Fix a parser-bug in the omap2 muxing code where muxtable-entries will be wrongly selected if the requested muxname is a *prefix* of their m0-entry and they have a matching mN-entry. Fix by additionally checking that the length of the m0_entry is equal. For example muxing of "dss_data2.dss_data2" on omap32xx will fail because the prefix "dss_data2" will match the mux-entries "dss_data2" as well as "dss_data20", with the suffix "dss_data2" matching m0 (for dss_data2) and m4 (for dss_data20). Thus both are recognized as signal path candidates: Relevant muxentries from mux34xx.c: _OMAP3_MUXENTRY(DSS_DATA20, 90, "dss_data20", NULL, "mcspi3_somi", "dss_data2", "gpio_90", NULL, NULL, "safe_mode"), _OMAP3_MUXENTRY(DSS_DATA2, 72, "dss_data2", NULL, NULL, NULL, "gpio_72", NULL, NULL, "safe_mode"), This will result in a failure to mux the pin at all: _omap_mux_get_by_name: Multiple signal paths (2) for dss_data2.dss_data2 Patch should apply to linus' latest master down to rather old linux-2.6 trees. Signed-off-by: David R. Piegdon <[email protected]> Cc: [email protected] [[email protected]: updated description to include full description] Signed-off-by: Tony Lindgren <[email protected]>
1 parent 2ca0945 commit c021f24

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

arch/arm/mach-omap2/mux.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,10 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition,
183183
m0_entry = mux->muxnames[0];
184184

185185
/* First check for full name in mode0.muxmode format */
186-
if (mode0_len && strncmp(muxname, m0_entry, mode0_len))
187-
continue;
186+
if (mode0_len)
187+
if (strncmp(muxname, m0_entry, mode0_len) ||
188+
(strlen(m0_entry) != mode0_len))
189+
continue;
188190

189191
/* Then check for muxmode only */
190192
for (i = 0; i < OMAP_MUX_NR_MODES; i++) {

0 commit comments

Comments
 (0)