Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fc63de829bbfa3945ffd6327bd3dc88f4e643642

Authored by sricharan
Committed by Benoit Cousson
1 parent 6fea7b0a7a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

OMAP4: pandaboard: Select CBL & CBS package and initialize mux 

The mux framework allows the change of pad configuration by drivers
when needed. Prior to this the mux framework has to be initialised
with all the mux parameters specific to the board. The mux init is
already present in the board file for SDP. Adding the mux init
for panda boards.

Signed-off-by: sricharan <r.sricharan@ti.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>

Showing 2 changed files with 18 additions and 0 deletions Side-by-side Diff

arch/arm/mach-omap2/Kconfig
Diff comments   View file @ fc63de8
... ... @@ -290,6 +290,8 @@
290 290 bool "OMAP4 Panda Board"
291 291 default y
292 292 depends on ARCH_OMAP4
  293 + select OMAP_PACKAGE_CBL
  294 + select OMAP_PACKAGE_CBS
293 295  
294 296 config OMAP3_EMU
295 297 bool "OMAP3 debugging peripherals"
arch/arm/mach-omap2/board-omap4panda.c
Diff comments   View file @ fc63de8
... ... @@ -40,6 +40,7 @@
40 40  
41 41 #include "hsmmc.h"
42 42 #include "control.h"
  43 +#include "mux.h"
43 44  
44 45 #define GPIO_HUB_POWER 1
45 46 #define GPIO_HUB_NRESET 62
46 47  
... ... @@ -368,8 +369,23 @@
368 369 omap_register_i2c_bus(4, 400, NULL, 0);
369 370 return 0;
370 371 }
  372 +
  373 +#ifdef CONFIG_OMAP_MUX
  374 +static struct omap_board_mux board_mux[] __initdata = {
  375 + { .reg_offset = OMAP_MUX_TERMINATOR },
  376 +};
  377 +#else
  378 +#define board_mux NULL
  379 +#endif
  380 +
371 381 static void __init omap4_panda_init(void)
372 382 {
  383 + int package = OMAP_PACKAGE_CBS;
  384 +
  385 + if (omap_rev() == OMAP4430_REV_ES1_0)
  386 + package = OMAP_PACKAGE_CBL;
  387 + omap4_mux_init(board_mux, package);
  388 +
373 389 omap4_panda_i2c_init();
374 390 platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
375 391 omap_serial_init();