aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/include')
-rw-r--r--arch/arm/mach-davinci/include/mach/mmc.h3
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h10
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/arch/arm/mach-davinci/include/mach/mmc.h
index d4f1e9675069..5ba6b22ce338 100644
--- a/arch/arm/mach-davinci/include/mach/mmc.h
+++ b/arch/arm/mach-davinci/include/mach/mmc.h
@@ -12,6 +12,9 @@ struct davinci_mmc_config {
12 /* get_cd()/get_wp() may sleep */ 12 /* get_cd()/get_wp() may sleep */
13 int (*get_cd)(int module); 13 int (*get_cd)(int module);
14 int (*get_ro)(int module); 14 int (*get_ro)(int module);
15
16 void (*set_power)(int module, bool on);
17
15 /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */ 18 /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */
16 u8 wires; 19 u8 wires;
17 20
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 5d4e0fed828a..a7e92fca32e6 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -857,6 +857,14 @@ enum davinci_da850_index {
857 DA850_MMCSD0_CLK, 857 DA850_MMCSD0_CLK,
858 DA850_MMCSD0_CMD, 858 DA850_MMCSD0_CMD,
859 859
860 /* MMC/SD1 function */
861 DA850_MMCSD1_DAT_0,
862 DA850_MMCSD1_DAT_1,
863 DA850_MMCSD1_DAT_2,
864 DA850_MMCSD1_DAT_3,
865 DA850_MMCSD1_CLK,
866 DA850_MMCSD1_CMD,
867
860 /* EMIF2.5/EMIFA function */ 868 /* EMIF2.5/EMIFA function */
861 DA850_EMA_D_7, 869 DA850_EMA_D_7,
862 DA850_EMA_D_6, 870 DA850_EMA_D_6,
@@ -916,6 +924,8 @@ enum davinci_da850_index {
916 DA850_GPIO3_13, 924 DA850_GPIO3_13,
917 DA850_GPIO4_0, 925 DA850_GPIO4_0,
918 DA850_GPIO4_1, 926 DA850_GPIO4_1,
927 DA850_GPIO6_9,
928 DA850_GPIO6_10,
919 DA850_GPIO6_13, 929 DA850_GPIO6_13,
920 DA850_RTC_ALARM, 930 DA850_RTC_ALARM,
921}; 931};