diff options
| author | Alejandro Sierra <b18039@freescale.com> | 2012-04-30 15:17:08 -0500 |
|---|---|---|
| committer | Alejandro Sierra <b18039@freescale.com> | 2012-04-30 15:18:54 -0500 |
| commit | 2b607fd0a1a5059a4b9cdf341d95a91c4c999446 (patch) | |
| tree | 3446546d869c56aa31097a18d2abd7ca7854883e | |
| parent | 320b47fc3c7ecddedac7a096a2c6c3b1dc998caa (diff) | |
ENGR00181070 Enable SPI NOR on kernel command line
SPI NOR will be enable through spi-nor
command line as a kernel argument
Signed-off-by: Alejandro Sierra <b18039@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index b46f5971c8af..99a7c868c490 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -138,8 +138,16 @@ static int mipi_sensor; static int can0_enable; static int uart3_en; static int tuner_en; +static int spinor_en; extern volatile int num_cpu_idle_lock; +static int __init spinor_enable(char *p) +{ + spinor_en = 1; + return 0; +} +early_param("spi-nor", spinor_enable); + static int __init uart3_enable(char *p) { uart3_en = 1; @@ -1325,8 +1333,10 @@ static void __init mx6_board_init(void) BUG_ON(!common_pads); mxc_iomux_v3_setup_multiple_pads(common_pads, common_pads_cnt); - BUG_ON(!i2c3_pads); - mxc_iomux_v3_setup_multiple_pads(i2c3_pads, i2c3_pads_cnt); + if (!spinor_en) { + BUG_ON(!i2c3_pads); + mxc_iomux_v3_setup_multiple_pads(i2c3_pads, i2c3_pads_cnt); + } if (can0_enable) { BUG_ON(!can0_pads); @@ -1349,7 +1359,10 @@ static void __init mx6_board_init(void) if (!board_is_mx6_reva()) { /* enable i2c3_sda route path */ gpio_request(SABREAUTO_I2C3_STEER, "i2c3-steer"); - gpio_direction_output(SABREAUTO_I2C3_STEER, 1); + if (spinor_en) + gpio_direction_output(SABREAUTO_I2C3_STEER, 0); + else + gpio_direction_output(SABREAUTO_I2C3_STEER, 1); /* Set GPIO_16 input for IEEE-1588 ts_clk and * RMII reference clk * For MX6 GPR1 bit21 meaning: |