aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/include/mach
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/include/mach')
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h4
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h10
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 0af3fb6077a3..0af141ffc3b4 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -16,6 +16,7 @@
16#include <mach/i2c.h> 16#include <mach/i2c.h>
17#include <mach/emac.h> 17#include <mach/emac.h>
18#include <mach/asp.h> 18#include <mach/asp.h>
19#include <mach/mmc.h>
19 20
20/* 21/*
21 * The cp_intc interrupt controller for the da8xx isn't in the same 22 * The cp_intc interrupt controller for the da8xx isn't in the same
@@ -38,6 +39,7 @@
38#define DA8XX_GPIO_BASE 0x01e26000 39#define DA8XX_GPIO_BASE 0x01e26000
39#define DA8XX_PSC1_BASE 0x01e27000 40#define DA8XX_PSC1_BASE 0x01e27000
40#define DA8XX_LCD_CNTRL_BASE 0x01e13000 41#define DA8XX_LCD_CNTRL_BASE 0x01e13000
42#define DA8XX_MMCSD0_BASE 0x01c40000
41 43
42#define PINMUX0 0x00 44#define PINMUX0 0x00
43#define PINMUX1 0x04 45#define PINMUX1 0x04
@@ -68,6 +70,7 @@ int da8xx_register_i2c(int instance, struct davinci_i2c_platform_data *pdata);
68int da8xx_register_watchdog(void); 70int da8xx_register_watchdog(void);
69int da8xx_register_emac(void); 71int da8xx_register_emac(void);
70int da8xx_register_lcdc(void); 72int da8xx_register_lcdc(void);
73int da8xx_register_mmcsd0(struct davinci_mmc_config *config);
71void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata); 74void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata);
72 75
73extern struct platform_device da8xx_serial_device; 76extern struct platform_device da8xx_serial_device;
@@ -106,6 +109,7 @@ extern const short da850_i2c1_pins[];
106extern const short da850_cpgmac_pins[]; 109extern const short da850_cpgmac_pins[];
107extern const short da850_mcasp_pins[]; 110extern const short da850_mcasp_pins[];
108extern const short da850_lcdcntl_pins[]; 111extern const short da850_lcdcntl_pins[];
112extern const short da850_mmcsd0_pins[];
109 113
110int da8xx_pinmux_setup(const short pins[]); 114int da8xx_pinmux_setup(const short pins[]);
111 115
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 30bf329d5373..b2335640c222 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -798,9 +798,19 @@ enum davinci_da850_index {
798 DA850_LCD_VSYNC, 798 DA850_LCD_VSYNC,
799 DA850_NLCD_AC_ENB_CS, 799 DA850_NLCD_AC_ENB_CS,
800 800
801 /* MMC/SD0 function */
802 DA850_MMCSD0_DAT_0,
803 DA850_MMCSD0_DAT_1,
804 DA850_MMCSD0_DAT_2,
805 DA850_MMCSD0_DAT_3,
806 DA850_MMCSD0_CLK,
807 DA850_MMCSD0_CMD,
808
801 /* GPIO function */ 809 /* GPIO function */
802 DA850_GPIO2_15, 810 DA850_GPIO2_15,
803 DA850_GPIO8_10, 811 DA850_GPIO8_10,
812 DA850_GPIO4_0,
813 DA850_GPIO4_1,
804}; 814};
805 815
806#ifdef CONFIG_DAVINCI_MUX 816#ifdef CONFIG_DAVINCI_MUX