Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 21a42c92750446008dc0847a78aba5459e3b6b5a

Authored by Colin Cross
Committed by Tony Lindgren
1 parent d4ff6121b4
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init 

OMAP4 contains two separate instances of the padconf registers,
one in the core system config and one in the wakeup system config.
Pass in two tables to apply the correct values to each instance.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 4 changed files with 9 additions and 6 deletions Side-by-side Diff

arch/arm/mach-omap2/board-4430sdp.c
Diff comments   View file @ 21a42c9
... ... @@ -729,7 +729,7 @@
729 729  
730 730 if (omap_rev() == OMAP4430_REV_ES1_0)
731 731 package = OMAP_PACKAGE_CBL;
732   - omap4_mux_init(board_mux, package);
  732 + omap4_mux_init(board_mux, NULL, package);
733 733  
734 734 omap_board_config = sdp4430_config;
735 735 omap_board_config_size = ARRAY_SIZE(sdp4430_config);
arch/arm/mach-omap2/board-omap4panda.c
Diff comments   View file @ 21a42c9
... ... @@ -687,7 +687,7 @@
687 687  
688 688 if (omap_rev() == OMAP4430_REV_ES1_0)
689 689 package = OMAP_PACKAGE_CBL;
690   - omap4_mux_init(board_mux, package);
  690 + omap4_mux_init(board_mux, NULL, package);
691 691  
692 692 if (wl12xx_set_platform_data(&omap_panda_wlan_data))
693 693 pr_err("error setting wl12xx data\n");
arch/arm/mach-omap2/mux.h
Diff comments   View file @ 21a42c9
... ... @@ -323,10 +323,12 @@
323 323  
324 324 /**
325 325 * omap4_mux_init() - initialize mux system with board specific set
326   - * @board_mux: Board specific mux table
  326 + * @board_subset: Board specific mux table
  327 + * @board_wkup_subset: Board specific mux table for wakeup instance
327 328 * @flags: OMAP package type used for the board
328 329 */
329   -int omap4_mux_init(struct omap_board_mux *board_mux, int flags);
  330 +int omap4_mux_init(struct omap_board_mux *board_subset,
  331 + struct omap_board_mux *board_wkup_subset, int flags);
330 332  
331 333 /**
332 334 * omap_mux_init - private mux init function, do not call
arch/arm/mach-omap2/mux44xx.c
Diff comments   View file @ 21a42c9
... ... @@ -1309,7 +1309,8 @@
1309 1309 #define omap4_wkup_cbl_cbs_ball NULL
1310 1310 #endif
1311 1311  
1312   -int __init omap4_mux_init(struct omap_board_mux *board_subset, int flags)
  1312 +int __init omap4_mux_init(struct omap_board_mux *board_subset,
  1313 + struct omap_board_mux *board_wkup_subset, int flags)
1313 1314 {
1314 1315 struct omap_ball *package_balls_core;
1315 1316 struct omap_ball *package_balls_wkup = omap4_wkup_cbl_cbs_ball;
... ... @@ -1347,7 +1348,7 @@
1347 1348 OMAP_MUX_GPIO_IN_MODE3,
1348 1349 OMAP4_CTRL_MODULE_PAD_WKUP_MUX_PBASE,
1349 1350 OMAP4_CTRL_MODULE_PAD_WKUP_MUX_SIZE,
1350   - omap4_wkup_muxmodes, NULL, board_subset,
  1351 + omap4_wkup_muxmodes, NULL, board_wkup_subset,
1351 1352 package_balls_wkup);
1352 1353  
1353 1354 return ret;