msm: 7x30: Add initial support for SDCC
Subsystems (3)
PATCH 1/1 msm: 7x30: Add initial support for SDCC
Add platform data and base address for SDCC on MSM7x30. This adds support for slot 2 and slot 4.
Signed-off-by Sahitya Tummala <[email protected]>
--- arch/arm/mach-msm/board-msm7x30.c | 218 +++++++++++++++++++++++ arch/arm/mach-msm/devices-msm7x30.c | 196 ++++++++++++++++++++ arch/arm/mach-msm/gpiomux-7x30.c | 103 +++++++++++ arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 12 ++ 4 files changed, 529 insertions(+), 0 deletions(-)
arch/arm/mach-msm/board-msm7x30.c +218 -0
@@ -22,6 +22,7 @@#include <linux/delay.h> #include <linux/io.h> #include <linux/smsc911x.h> +#include <linux/err.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -34,11 +35,225 @@#include <mach/dma.h> #include <mach/vreg.h> +#include <mach/mmc.h> #include "devices.h" #include "proc_comm.h" extern struct sys_timer msm_timer; +#if defined(CONFIG_MMC_MSM ) || defined(CONFIG_MMC_MSM_MODULE ) +struct vreg *vreg_s3; +struct vreg *vreg_mmc; + +struct sdcc_vreg { +struct vreg *vreg_data; +unsigned level; +}; + +static struct sdcc_vreg sdcc_vreg_data[4 ]; +static unsigned long vreg_sts; + +struct sdcc_gpio_data { +unsigned no; +const char *name; +}; + +static struct sdcc_gpio_data sdc2_gpio_cfg[] = { + {64 ,"sdc2_clk" }, + {65 ,"sdc2_cmd" }, + {66 ,"sdc2_dat_3" }, + {67 ,"sdc2_dat_2" }, + {68 ,"sdc2_dat_1" }, + {69 ,"sdc2_dat_0" } +}; + +static struct sdcc_gpio_data sdc3_gpio_cfg[] = { + {110 ,"sdc3_clk" }, + {111 ,"sdc3_cmd" }, + {116 ,"sdc3_dat_3" }, + {117 ,"sdc3_dat_2" }, + {118 ,"sdc3_dat_1" }, + {119 ,"sdc3_dat_0" }, +}; + +static struct sdcc_gpio_data sdc4_gpio_cfg[] = { + {58 ,"sdc4_clk" }, + {59 ,"sdc4_cmd" }, + {60 ,"sdc4_dat_3" }, + {61 ,"sdc4_dat_2" }, + {62 ,"sdc4_dat_1" }, + {63 ,"sdc4_dat_0" } +}; + +struct msm_sdcc_gpio { +struct sdcc_gpio_data *cfg_data; +uint32_t size; +uint32_t cfg_sts; +}; + +static struct msm_sdcc_gpio sdcc_cfg_data[] = { + { + .cfg_data =NULL , + }, + { + .cfg_data = sdc2_gpio_cfg, + .size =ARRAY_SIZE (sdc2_gpio_cfg), + }, + { + .cfg_data = sdc3_gpio_cfg, + .size =ARRAY_SIZE (sdc3_gpio_cfg), + }, + { + .cfg_data = sdc4_gpio_cfg, + .size =ARRAY_SIZE (sdc4_gpio_cfg), + }, +}; + +static uint32_t msm_sdcc_setup_gpio (int dev_id,unsigned int enable) +{ +int rc =0 ; +struct msm_sdcc_gpio *curr; +int n; + + curr = &sdcc_cfg_data[dev_id -1 ]; + +if (!curr->cfg_data) { +pr_err ("%s: gpio config data not defined for slot %d\n" , + __func__, dev_id); + rc = -EINVAL ; + goto out; + } + +if (curr->cfg_sts == enable) + goto out; + +for (n =0 ; n < curr->size; n++) { +if (enable) { + rc =gpio_request (curr->cfg_data[n].no, + curr->cfg_data[n].name); +if (rc) { +pr_err ("%s: gpio_request(%d, %s) failed %d\n" , + __func__, curr->cfg_data[n].no, + curr->cfg_data[n].name, rc); + goto free_gpios; + } +/* set direction as output for all GPIOs */ + rc =gpio_direction_output (curr->cfg_data[n].no,1 ); +if (rc) { +pr_err ("%s: gpio_direction_output" +"(%d, 1) failed (%d)\n" , __func__, + curr->cfg_data[n].no, rc); + goto free_gpios; + } + }else { +/* +* now free this GPIO which will put GPIO +* in low power mode and will also put GPIO +* in input mode +*/ +gpio_free (curr->cfg_data[n].no); + } + } + curr->cfg_sts = enable; + goto out; + +free_gpios: +for (; n >=0 ; n--) +gpio_free (curr->cfg_data[n].no); +out: +return rc; +} + +static uint32_t msm_sdcc_setup_vreg (int dev_id,unsigned int enable) +{ +int rc =0 ; +struct sdcc_vreg *curr; +static int enabled_once[] = {0 ,0 ,0 ,0 }; + + curr = &sdcc_vreg_data[dev_id -1 ]; + +if (!(test_bit (dev_id, &vreg_sts)^enable)) +return rc; + +if (!enable || enabled_once[dev_id -1 ]) +return 0 ; + +if (enable) { +set_bit (dev_id, &vreg_sts); + rc =vreg_set_level (curr->vreg_data, curr->level); +if (rc) { +printk (KERN_ERR "%s: vreg_set_level() = %d\n" , + __func__, rc); + } + rc =vreg_enable (curr->vreg_data); +if (rc) { +printk (KERN_ERR "%s: vreg_enable() = %d\n" , + __func__, rc); + } + enabled_once[dev_id -1 ] =1 ; + }else { +clear_bit (dev_id, &vreg_sts); + rc =vreg_disable (curr->vreg_data); +if (rc) { +printk (KERN_ERR "%s: vreg_disable() = %d\n" , + __func__, rc); + } + } +return rc; +} + +static uint32_t msm_sdcc_setup_power (struct device *dv,unsigned int vdd) +{ +int rc =0 ; +struct platform_device *pdev; + + pdev = container_of(dv, struct platform_device, dev); + rc =msm_sdcc_setup_gpio (pdev->id, (vdd ?1 :0 )); +if (rc) + goto out; + +if (pdev->id ==4 )/* S3 is always ON and cannot be disabled */ + rc =msm_sdcc_setup_vreg (pdev->id, (vdd ?1 :0 )); +out: +return rc; +} + +static struct msm_mmc_platform_data msm7x30_sdc2_data = { + .ocr_mask =MMC_VDD_165_195 |MMC_VDD_27_28 , + .translate_vdd = msm_sdcc_setup_power, +}; + +static struct msm_mmc_platform_data msm7x30_sdc4_data = { + .ocr_mask =MMC_VDD_27_28 |MMC_VDD_28_29 , + .translate_vdd = msm_sdcc_setup_power, +}; + +static void __init msm7x30_init_mmc (void ) +{ + vreg_s3 =vreg_get (NULL ,"s3" ); +if (IS_ERR (vreg_s3)) { +printk (KERN_ERR "%s: vreg get failed (%ld)\n" , + __func__,PTR_ERR (vreg_s3)); +return ; + } + + vreg_mmc =vreg_get (NULL ,"mmc" ); +if (IS_ERR (vreg_mmc)) { +printk (KERN_ERR "%s: vreg get failed (%ld)\n" , + __func__,PTR_ERR (vreg_mmc)); +return ; + } + + sdcc_vreg_data[1 ].vreg_data = vreg_s3; + sdcc_vreg_data[1 ].level =1800 ; +msm_add_sdcc (2 , &msm7x30_sdc2_data,0 ,0 ); + + sdcc_vreg_data[3 ].vreg_data = vreg_mmc; + sdcc_vreg_data[3 ].level =2850 ; +msm_add_sdcc (4 , &msm7x30_sdc4_data,0 ,0 ); +} +#endif + static struct platform_device *devices[] __initdata = {#if defined(CONFIG_SERIAL_MSM ) || defined(CONFIG_MSM_SERIAL_DEBUGGER ) &msm_device_uart2,
@@ -54,6 +269,9 @@ static void __init msm7x30_init_irq(void)static void __init msm7x30_init (void ) {platform_add_devices (devices,ARRAY_SIZE (devices)); +#if defined(CONFIG_MMC_MSM ) || defined(CONFIG_MMC_MSM_MODULE ) +msm7x30_init_mmc (); +#endif }static void __init msm7x30_map_io (void )
arch/arm/mach-msm/devices-msm7x30.c +196 -0
208 lines not on this page · raw message
arch/arm/mach-msm/gpiomux-7x30.c +103 -0
113 lines not on this page · raw message
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h +12 -0
@@ -119,4 +119,16 @@#define MSM_AD5_PHYS 0xA7000000#define MSM_AD5_SIZE (SZ_1M*13) +#define MSM_SDC1_PHYS 0xA0400000 +#define MSM_SDC1_SIZE SZ_4K + +#define MSM_SDC2_PHYS 0xA0500000 +#define MSM_SDC2_SIZE SZ_4K + +#define MSM_SDC3_PHYS 0xA3000000 +#define MSM_SDC3_SIZE SZ_4K + +#define MSM_SDC4_PHYS 0xA3100000 +#define MSM_SDC4_SIZE SZ_4K +#endif
Signature · 5 lines
1.7.1 -- Consultant for Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum.
PATCH 1/1 msm: 8x50: Add initial support for SDCC
Add platform data and base address for SDCC on QSD8x50. This adds support for slot 1, slot 2 and slot 3.
Signed-off-by Sahitya Tummala <[email protected]>
--- arch/arm/mach-msm/board-qsd8x50.c | 184 +++++++++++++++++++++- arch/arm/mach-msm/devices-qsd8x50.c | 196 +++++++++++++++++++++++ arch/arm/mach-msm/gpiomux-8x50.c | 107 ++++++++++++ arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 8 +- 4 files changed, 490 insertions(+), 5 deletions(-)
arch/arm/mach-msm/board-qsd8x50.c +183 -1
@@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved. +/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and
@@ -20,6 +20,7 @@#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/delay.h> +#include <linux/err.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -30,6 +31,8 @@#include <mach/irqs.h> #include <mach/sirc.h> #include <mach/gpio.h> +#include <mach/vreg.h> +#include <mach/mmc.h> #include "devices.h"
@@ -78,6 +81,182 @@ static struct platform_device *devices[] __initdata = { &msm_device_uart3, }; +#if defined(CONFIG_MMC_MSM ) || defined(CONFIG_MMC_MSM_MODULE ) +struct sdcc_gpio_data { +unsigned no; +const char *name; +}; + +static struct sdcc_gpio_data sdc1_gpio_cfg[] = { + {51 ,"sdc1_dat_3" }, + {52 ,"sdc1_dat_2" }, + {53 ,"sdc1_dat_1" }, + {54 ,"sdc1_dat_0" }, + {55 ,"sdc1_cmd" }, + {56 ,"sdc1_clk" } +}; + +static struct sdcc_gpio_data sdc2_gpio_cfg[] = { + {62 ,"sdc2_clk" }, + {63 ,"sdc2_cmd" }, + {64 ,"sdc2_dat_3" }, + {65 ,"sdc2_dat_2" }, + {66 ,"sdc2_dat_1" }, + {67 ,"sdc2_dat_0" } +}; + +static struct sdcc_gpio_data sdc3_gpio_cfg[] = { + {88 ,"sdc3_clk" }, + {89 ,"sdc3_cmd" }, + {90 ,"sdc3_dat_3" }, + {91 ,"sdc3_dat_2" }, + {92 ,"sdc3_dat_1" }, + {93 ,"sdc3_dat_0" }, +}; + +struct msm_sdcc_gpio { +struct sdcc_gpio_data *cfg_data; +uint32_t size; +uint32_t cfg_sts; +}; + +static struct msm_sdcc_gpio sdcc_cfg_data[] = { + { + .cfg_data = sdc1_gpio_cfg, + .size =ARRAY_SIZE (sdc1_gpio_cfg), + }, + { + .cfg_data = sdc2_gpio_cfg, + .size =ARRAY_SIZE (sdc2_gpio_cfg), + }, + { + .cfg_data = sdc3_gpio_cfg, + .size =ARRAY_SIZE (sdc3_gpio_cfg), + }, + { + .cfg_data =NULL , + }, +}; + +static void msm_sdcc_setup_gpio (int dev_id,unsigned int enable) +{ +int rc =0 ; +struct msm_sdcc_gpio *curr; +int n; + + curr = &sdcc_cfg_data[dev_id -1 ]; + +if (!curr->cfg_data) { +pr_err ("%s: gpio data is not defined for slot %d\n" , + __func__, dev_id); + rc = -EINVAL ; + goto out; + } + +if (curr->cfg_sts == enable) + goto out; + +for (n =0 ; n < curr->size; n++) { +if (enable) { + rc =gpio_request (curr->cfg_data[n].no, + curr->cfg_data[n].name); +if (rc) { +pr_err ("%s: gpio_request(%d, %s) failed %d\n" , + __func__, curr->cfg_data[n].no, + curr->cfg_data[n].name, rc); + goto free_gpios; + } +/* set direction as output for all GPIOs */ + rc =gpio_direction_output (curr->cfg_data[n].no,1 ); +if (rc) { +pr_err ("%s: gpio_direction_output" +"(%d, 1) failed (%d)\n" , __func__, + curr->cfg_data[n].no, rc); + goto free_gpios; + } + }else { +/* +* now free this GPIO which will put GPIO +* in low power mode and will also put GPIO +* in input mode +*/ +gpio_free (curr->cfg_data[n].no); + } + } + curr->cfg_sts = enable; + goto out; + +free_gpios: +for (; n >=0 ; n--) +gpio_free (curr->cfg_data[n].no); +out: +return ; +} + +static struct vreg *vreg_mmc; +static unsigned long vreg_sts; + +static uint32_t msm_sdcc_setup_power (struct device *dv,unsigned int vdd) +{ +int rc =0 ; +struct platform_device *pdev; + + pdev = container_of(dv, struct platform_device, dev); +msm_sdcc_setup_gpio (pdev->id, !!vdd); + +if (vdd ==0 ) { +if (!vreg_sts) +return 0 ; + +clear_bit (pdev->id, &vreg_sts); + +if (!vreg_sts) { + rc =vreg_disable (vreg_mmc); +if (rc) +printk (KERN_ERR "%s: return val: %d\n" , + __func__, rc); + } +return 0 ; + } + +if (!vreg_sts) { + rc =vreg_set_level (vreg_mmc,2900 ); +if (!rc) + rc =vreg_enable (vreg_mmc); +if (rc) +printk (KERN_ERR "%s: return val: %d\n" , + __func__, rc); + } +set_bit (pdev->id, &vreg_sts); +return 0 ; +} + +static struct msm_mmc_platform_data qsd8x50_sdcc_data = { + .ocr_mask =MMC_VDD_27_28 |MMC_VDD_28_29 , + .translate_vdd = msm_sdcc_setup_power, +}; + +static void __init qsd8x50_init_mmc (void ) +{ +if (machine_is_qsd8x50_ffa () ||machine_is_qsd8x50a_ffa ()) + vreg_mmc =vreg_get (NULL ,"gp6" ); +else + vreg_mmc =vreg_get (NULL ,"gp5" ); + +if (IS_ERR (vreg_mmc)) { +printk (KERN_ERR "%s: vreg get failed (%ld)\n" , + __func__,PTR_ERR (vreg_mmc)); +return ; + } + +msm_add_sdcc (1 , &qsd8x50_sdcc_data,0 ,0 ); +if (machine_is_qsd8x50_surf () ||machine_is_qsd8x50a_surf ()) { +msm_add_sdcc (2 , &qsd8x50_sdcc_data,0 ,0 ); +msm_add_sdcc (3 , &qsd8x50_sdcc_data,0 ,0 ); + } +} +#endif +static void __init qsd8x50_map_io (void ) {msm_map_qsd8x50_io ();
@@ -93,6 +272,9 @@ static void __init qsd8x50_init_irq(void)static void __init qsd8x50_init (void ) {platform_add_devices (devices,ARRAY_SIZE (devices)); +#if defined(CONFIG_MMC_MSM ) || defined(CONFIG_MMC_MSM_MODULE ) +qsd8x50_init_mmc (); +#endif }MACHINE_START (QSD8X50_SURF ,"QCT QSD8X50 SURF" )
arch/arm/mach-msm/devices-qsd8x50.c +196 -0
208 lines not on this page · raw message
arch/arm/mach-msm/gpiomux-8x50.c +107 -0
117 lines not on this page · raw message
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h +4 -4
@@ -132,16 +132,16 @@#define MSM_UART2DM_PHYS 0xA0900000 -#define MSM_SDC1_PHYS 0xA0400000 +#define MSM_SDC1_PHYS 0xA0300000#define MSM_SDC1_SIZE SZ_4K -#define MSM_SDC2_PHYS 0xA0500000 +#define MSM_SDC2_PHYS 0xA0400000#define MSM_SDC2_SIZE SZ_4K -#define MSM_SDC3_PHYS 0xA0600000 +#define MSM_SDC3_PHYS 0xA0500000#define MSM_SDC3_SIZE SZ_4K -#define MSM_SDC4_PHYS 0xA0700000 +#define MSM_SDC4_PHYS 0xA0600000#define MSM_SDC4_SIZE SZ_4K#endif
Signature · 5 lines
1.7.1 -- Consultant for Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum.