Chaithrika U S <[email protected]> writes:
> DA850/OMAP-L138 EVM can be connected to an UI card which has various
> peripherals on it.The UI card has TCA6416 expander which can be probed
> to check whether the UI card is connected or not. If the UI card is
> connected, setup NOR and NAND devices. This is done via the expander
> setup callback.
>
> Signed-off-by: Chaithrika U S <[email protected]>
Chaithrika,
Thanks for reworking this to do runtime detection, I like that much
better.
Also, Sergei's mux comments are valid but not specific to this patch
so they should be addressed in a separate patch.
I'll push this one today.
Kevin
> ---
> arch/arm/mach-davinci/board-da850-evm.c | 127
> ++++++++++++++++++++++++-------
> 1 files changed, 99 insertions(+), 28 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c
> b/arch/arm/mach-davinci/board-da850-evm.c
> index 25ae007..dd43644 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -17,6 +17,7 @@
> #include <linux/console.h>
> #include <linux/i2c.h>
> #include <linux/i2c/at24.h>
> +#include <linux/i2c/pca953x.h>
> #include <linux/gpio.h>
> #include <linux/platform_device.h>
> #include <linux/mtd/mtd.h>
> @@ -144,10 +145,85 @@ static struct platform_device
> da850_evm_nandflash_device = {
> .resource = da850_evm_nandflash_resource,
> };
>
> +static u32 ui_card_detected;
> +static void da850_evm_setup_nor_nand(void);
> +
> +static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned
> gpio,
> + unsigned ngpio, void *c)
> +{
> + int sel_a, sel_b, sel_c, ret;
> +
> + sel_a = gpio + 7;
> + sel_b = gpio + 6;
> + sel_c = gpio + 5;
> +
> + ret = gpio_request(sel_a, "sel_a");
> + if (ret) {
> + pr_warning("Cannot open UI expander pin %d\n", sel_a);
> + goto exp_setup_sela_fail;
> + }
> +
> + ret = gpio_request(sel_b, "sel_b");
> + if (ret) {
> + pr_warning("Cannot open UI expander pin %d\n", sel_b);
> + goto exp_setup_selb_fail;
> + }
> +
> + ret = gpio_request(sel_c, "sel_c");
> + if (ret) {
> + pr_warning("Cannot open UI expander pin %d\n", sel_c);
> + goto exp_setup_selc_fail;
> + }
> +
> + /* deselect all functionalities */
> + gpio_direction_output(sel_a, 1);
> + gpio_direction_output(sel_b, 1);
> + gpio_direction_output(sel_c, 1);
> +
> + ui_card_detected = 1;
> + pr_info("DA850/OMAP-L138 EVM UI card detected\n");
> +
> + da850_evm_setup_nor_nand();
> +
> + return 0;
> +
> +exp_setup_selc_fail:
> + gpio_free(sel_b);
> +exp_setup_selb_fail:
> + gpio_free(sel_a);
> +exp_setup_sela_fail:
> + return ret;
> +}
> +
> +static int da850_evm_ui_expander_teardown(struct i2c_client *client,
> + unsigned gpio, unsigned ngpio, void *c)
> +{
> + /* deselect all functionalities */
> + gpio_set_value(gpio + 5, 1);
> + gpio_set_value(gpio + 6, 1);
> + gpio_set_value(gpio + 7, 1);
> +
> + gpio_free(gpio + 5);
> + gpio_free(gpio + 6);
> + gpio_free(gpio + 7);
> +
> + return 0;
> +}
> +
> +static struct pca953x_platform_data da850_evm_ui_expander_info = {
> + .gpio_base = DAVINCI_N_GPIO,
> + .setup = da850_evm_ui_expander_setup,
> + .teardown = da850_evm_ui_expander_teardown,
> +};
> +
> static struct i2c_board_info __initdata da850_evm_i2c_devices[] = {
> {
> I2C_BOARD_INFO("tlv320aic3x", 0x18),
> - }
> + },
> + {
> + I2C_BOARD_INFO("tca6416", 0x20),
> + .platform_data = &da850_evm_ui_expander_info,
> + },
> };
>
> static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = {
> @@ -251,13 +327,6 @@ static void __init da850_evm_init_nor(void)
> iounmap(aemif_addr);
> }
>
> -#if defined(CONFIG_MTD_PHYSMAP) || \
> - defined(CONFIG_MTD_PHYSMAP_MODULE)
> -#define HAS_NOR 1
> -#else
> -#define HAS_NOR 0
> -#endif
> -
> #if defined(CONFIG_MMC_DAVINCI) || \
> defined(CONFIG_MMC_DAVINCI_MODULE)
> #define HAS_MMC 1
> @@ -265,6 +334,28 @@ static void __init da850_evm_init_nor(void)
> #define HAS_MMC 0
> #endif
>
> +static void da850_evm_setup_nor_nand(void)
> +{
> + int ret = 0;
> +
> + if (ui_card_detected & !HAS_MMC) {
> + ret = da8xx_pinmux_setup(da850_nand_pins);
> + if (ret)
> + pr_warning("da850_evm_init: nand mux setup failed: "
> + "%d\n", ret);
> +
> + ret = da8xx_pinmux_setup(da850_nor_pins);
> + if (ret)
> + pr_warning("da850_evm_init: nor mux setup failed: %d\n",
> + ret);
> +
> + da850_evm_init_nor();
> +
> + platform_add_devices(da850_evm_devices,
> + ARRAY_SIZE(da850_evm_devices));
> + }
> +}
> +
> static const short da850_evm_lcdc_pins[] = {
> DA850_GPIO2_8, DA850_GPIO2_15,
> -1
> @@ -275,21 +366,6 @@ static __init void da850_evm_init(void)
> struct davinci_soc_info *soc_info = &davinci_soc_info;
> int ret;
>
> - ret = da8xx_pinmux_setup(da850_nand_pins);
> - if (ret)
> - pr_warning("da850_evm_init: nand mux setup failed: %d\n",
> - ret);
> -
> - ret = da8xx_pinmux_setup(da850_nor_pins);
> - if (ret)
> - pr_warning("da850_evm_init: nor mux setup failed: %d\n",
> - ret);
> -
> - da850_evm_init_nor();
> -
> - platform_add_devices(da850_evm_devices,
> - ARRAY_SIZE(da850_evm_devices));
> -
> ret = da8xx_register_edma();
> if (ret)
> pr_warning("da850_evm_init: edma registration failed: %d\n",
> @@ -325,11 +401,6 @@ static __init void da850_evm_init(void)
> ret);
>
> if (HAS_MMC) {
> - if (HAS_NOR)
> - pr_warning("WARNING: both NOR Flash and MMC/SD are "
> - "enabled, but they share AEMIF pins.\n"
> - "\tDisable one of them.\n");
> -
> ret = da8xx_pinmux_setup(da850_mmcsd0_pins);
> if (ret)
> pr_warning("da850_evm_init: mmcsd0 mux setup failed:"
> --
> 1.5.6
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
