I'm attaching the patch used to configure the pinmux and the spidev driver. Any suggestions would be great, we are pretty confused at this point.
Thanks, Philip
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index fe97bab..ed7fee6 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -23,6 +23,7 @@ #include <linux/gpio.h> #include <linux/input.h> #include <linux/gpio_keys.h> +#include <linux/spi/spi.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -311,6 +312,27 @@ static struct platform_device *omap3_beagle_devices[] __initdata = { &keys_gpio, }; +static struct spi_board_info beagle_spi_board_info[] = { + { + .modalias = "spidev", + .max_speed_hz = 48000000, //48 Mbps + .bus_num = 3, + .chip_select = 0, + .mode = SPI_MODE_1, + }, +}; + +static struct spi_board_info beagle_spi_board_info2[] = { + { + .modalias = "spidev", + .max_speed_hz = 48000000, //48 Mbps + .bus_num = 4, + .chip_select = 0, + .mode = SPI_MODE_1, + }, +}; + + static void __init omap3beagle_flash_init(void) { u8 cs = 0; @@ -358,6 +380,63 @@ static void __init omap3_beagle_init(void) omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); omap_serial_init(); + +/* + printk("Debug ================> MMC2 >>> start\n"); + omap_cfg_reg(XXX_3430_MMC2_CLK); + omap_cfg_reg(XXX_3430_MMC2_cmd); + omap_cfg_reg(XXX_3430_MMC2_dat0); + omap_cfg_reg(XXX_3430_MMC2_dat1); + omap_cfg_reg(XXX_3430_MMC2_dat2); + omap_cfg_reg(XXX_3430_MMC2_dat3); + omap_cfg_reg(XXX_3430_MMC2_dat4); + omap_cfg_reg(XXX_3430_MMC2_dat5); + omap_cfg_reg(XXX_3430_MMC2_dat6); + omap_cfg_reg(XXX_3430_MMC2_dat7); + printk("Debug ================> MMC2 >>> end\n"); + printk("Debug ================> UART2 >>> start\n"); + omap_cfg_reg(XXX_3430_UART2_cts); + omap_cfg_reg(XXX_3430_UART2_rts); + omap_cfg_reg(XXX_3430_UART2_tx); + omap_cfg_reg(XXX_3430_UART2_rx); + printk("Debug ================> UART2 >>> end\n"); +*/ + + printk("Debug ================> MCSPI >>> start\n"); + + omap_cfg_reg(XXX_3430_MCSPI3_CLK); + omap_cfg_reg(XXX_3430_MCSPI3_SIMO); + omap_cfg_reg(XXX_3430_MCSPI3_SOMI); + omap_cfg_reg(XXX_3430_MCSPI3_CS0); + omap_cfg_reg(XXX_3430_MCSPI3_CS1); + //avoid other pins/balls with McSPI function + omap_cfg_reg(XXX_3430_gpio_88); + omap_cfg_reg(XXX_3430_gpio_89); + omap_cfg_reg(XXX_3430_gpio_90); + omap_cfg_reg(XXX_3430_gpio_91); + omap_cfg_reg(XXX_3430_gpio_92); + omap_cfg_reg(XXX_3430_gpio_14); + omap_cfg_reg(XXX_3430_gpio_15); + omap_cfg_reg(XXX_3430_gpio_16); + omap_cfg_reg(XXX_3430_gpio_17); + omap_cfg_reg(XXX_3430_gpio_21); + + omap_cfg_reg(XXX_3430_MCSPI4_CLK); + omap_cfg_reg(XXX_3430_MCSPI4_SIMO); + omap_cfg_reg(XXX_3430_MCSPI4_SOMI); + omap_cfg_reg(XXX_3430_MCSPI4_CS0); + //avoid other pins/balls with McSPI function + omap_cfg_reg(XXX_3430_gpio_151); + printk("Debug ================> MCSPI >>> end\n"); + + + printk("Debug ================> register SLAVE DEVICES using [spidev] protocol driver >>> start\n"); + spi_register_board_info(beagle_spi_board_info, ARRAY_SIZE(beagle_spi_board_info)); + spi_register_board_info(beagle_spi_board_info2, ARRAY_SIZE(beagle_spi_board_info2)); + printk("Debug ================> register SLAVE DEVICES using [spidev] protocol driver >>> end\n"); + omap_cfg_reg(XXX_3430_gpio_157); //add by yuchih + + omap_cfg_reg(J25_34XX_GPIO170); gpio_request(170, "DVI_nPD"); /* REVISIT leave DVI powered down until it's needed ... */ diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 1556688..9b55cf8 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -472,6 +472,87 @@ MUX_CFG_34XX("AF5_34XX_GPIO142", 0x170, MUX_CFG_34XX("AE5_34XX_GPIO143", 0x172, OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT) +/* UART2 */ +MUX_CFG_34XX("XXX_3430_UART2_cts", 0x16c, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_UART2_rts", 0x16e, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_UART2_tx", 0x170, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_UART2_rx", 0x172, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLUP) + +/* MMC2 */ +MUX_CFG_34XX("XXX_3430_MMC2_CLK", 0x158, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_cmd", 0x15a, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat0", 0x15c, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat1", 0x15e, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat2", 0x160, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat3", 0x162, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat4", 0x164, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat5", 0x166, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat6", 0x168, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_MMC2_dat7", 0x16a, + OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT) + +/* MCSPI3 */ +MUX_CFG_34XX("XXX_3430_MCSPI3_CLK", 0x158, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_MCSPI3_SIMO", 0x15a, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_MCSPI3_SOMI", 0x15c, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLUP) +MUX_CFG_34XX("XXX_3430_MCSPI3_CS0", 0x162, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_MCSPI3_CS1", 0x160, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) + +MUX_CFG_34XX("XXX_3430_gpio_88", 0x100, //mcspi3_clk + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_89", 0x102, //mcspi3_simo + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_90", 0x104, //mcspi3_somi + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_91", 0x106, //mcspi3_cs0 + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_92", 0x108, //mcspi3_cs1 + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) + +MUX_CFG_34XX("XXX_3430_gpio_14", 0x5dc, //mcspi3_simo + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_15", 0x5de, //mcspi3_somi + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_16", 0x5e0, //mcspi3_cs0 + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_17", 0x5e2, //mcspi3_clk + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +MUX_CFG_34XX("XXX_3430_gpio_21", 0x5ea, //mcspi3_cs1 + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) +/* MCSPI4 */ +MUX_CFG_34XX("XXX_3430_MCSPI4_CLK", 0x18c, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_MCSPI4_SIMO", 0x190, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_MCSPI4_SOMI", 0x192, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLUP) +MUX_CFG_34XX("XXX_3430_MCSPI4_CS0", 0x196, + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_OUTPUT) +MUX_CFG_34XX("XXX_3430_gpio_151", 0x182, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) + +/* GPIO */ +MUX_CFG_34XX("XXX_3430_gpio_157", 0x18e, + OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT) + }; #define OMAP34XX_PINS_SZ ARRAY_SIZE(omap34xx_pins) @@ -494,6 +575,7 @@ static void __init_or_module omap2_cfg_debug(const struct pin_config *cfg, u16 r #ifdef CONFIG_OMAP_MUX_DEBUG debug = cfg->debug; + debug = 1; //add by yuchih #endif warn = (orig != reg); if (debug || warn) @@ -540,6 +622,9 @@ static int __init_or_module omap34xx_cfg_reg(const struct pin_config *cfg) reg |= cfg->mux_val; omap2_cfg_debug(cfg, reg); omap_ctrl_writew(reg, cfg->mux_reg); + + omap2_cfg_debug(cfg, reg); //add by yuchih + spin_unlock_irqrestore(&mux_spin_lock, flags); return 0; diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h index 67fddec..3dea82e 100644 --- a/arch/arm/plat-omap/include/mach/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h @@ -795,7 +795,54 @@ enum omap34xx_index { AF6_34XX_GPIO140_UP, AE6_34XX_GPIO141, AF5_34XX_GPIO142, - AE5_34XX_GPIO143 + AE5_34XX_GPIO143, + + + /* UART2 */ + XXX_3430_UART2_cts, + XXX_3430_UART2_rts, + XXX_3430_UART2_tx, + XXX_3430_UART2_rx, + + /* MMC2 */ + XXX_3430_MMC2_CLK, + XXX_3430_MMC2_cmd, + XXX_3430_MMC2_dat0, + XXX_3430_MMC2_dat1, + XXX_3430_MMC2_dat2, + XXX_3430_MMC2_dat3, + XXX_3430_MMC2_dat4, + XXX_3430_MMC2_dat5, + XXX_3430_MMC2_dat6, + XXX_3430_MMC2_dat7, + + /* MCSPI3 */ + XXX_3430_MCSPI3_CLK, + XXX_3430_MCSPI3_SIMO, + XXX_3430_MCSPI3_SOMI, + XXX_3430_MCSPI3_CS0, + XXX_3430_MCSPI3_CS1, + XXX_3430_gpio_88, + XXX_3430_gpio_89, + XXX_3430_gpio_90, + XXX_3430_gpio_91, + XXX_3430_gpio_92, + XXX_3430_gpio_14, + XXX_3430_gpio_15, + XXX_3430_gpio_16, + XXX_3430_gpio_17, + XXX_3430_gpio_21, + + /* MCSPI4 */ + XXX_3430_MCSPI4_CLK, + XXX_3430_MCSPI4_SIMO, + XXX_3430_MCSPI4_SOMI, + XXX_3430_MCSPI4_CS0, + XXX_3430_gpio_151, //mcspi_clk + + /* GPIO*/ + XXX_3430_gpio_157 + }; struct omap_mux_cfg {
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature