Commit a2205cd2 authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C: Add SDHCI (HSMMC) channel 1 device definition 



Add device definition and support code for the Samsung
HSMMC channel 1 device.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 5cc7fd88

arch/arm/mach-s3c6410/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ void __init s3c6410_map_io(void) 


	/* initialise device information early */

	s3c6410_default_sdhci0();

	s3c6410_default_sdhci1();

}



void __init s3c6410_init_clocks(int xtal)

arch/arm/plat-s3c/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -154,3 +154,9 @@ config S3C_DEV_HSMMC 
	depends on PLAT_S3C

	help

	  Compile in platform device definitions for HSMMC code



config S3C_DEV_HSMMC1

	bool

	depends on PLAT_S3C

	help

	  Compile in platform device definitions for HSMMC channel 1

arch/arm/plat-s3c/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,3 +21,4 @@ obj-y += gpio-config.o 
# devices



obj-$(CONFIG_S3C_DEV_HSMMC)	+= dev-hsmmc.o

obj-$(CONFIG_S3C_DEV_HSMMC1)	+= dev-hsmmc1.o

arch/arm/plat-s3c/dev-hsmmc1.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c/dev-hsmmc1.c

 *

 * Copyright (c) 2008 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * S3C series device definition for hsmmc device 1

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/mmc/host.h>



#include <mach/map.h>

#include <plat/sdhci.h>

#include <plat/devs.h>

#include <plat/cpu.h>



#define S3C_SZ_HSMMC	(0x1000)



static struct resource s3c_hsmmc1_resource[] = {

	[0] = {

		.start = S3C_PA_HSMMC1,

		.end   = S3C_PA_HSMMC1 + S3C_SZ_HSMMC - 1,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_HSMMC1,

		.end   = IRQ_HSMMC1,

		.flags = IORESOURCE_IRQ,

	}

};



static u64 s3c_device_hsmmc1_dmamask = 0xffffffffUL;



struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata = {

	.max_width	= 4,

	.host_caps	= (MMC_CAP_4_BIT_DATA |

			   MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),

};



struct platform_device s3c_device_hsmmc1 = {

	.name		= "s3c-sdhci",

	.id		= 1,

	.num_resources	= ARRAY_SIZE(s3c_hsmmc1_resource),

	.resource	= s3c_hsmmc1_resource,

	.dev		= {

		.dma_mask		= &s3c_device_hsmmc1_dmamask,

		.coherent_dma_mask	= 0xffffffffUL,

		.platform_data		= &s3c_hsmmc1_def_platdata,

	},

};



void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd)

{

	struct s3c_sdhci_platdata *set = &s3c_hsmmc1_def_platdata;



	set->max_width = pd->max_width;



	if (pd->cfg_gpio)

		set->cfg_gpio = pd->cfg_gpio;

	if (pd->cfg_card)

		set->cfg_card = pd->cfg_card;

}

arch/arm/plat-s3c/include/plat/sdhci.h

+13 −1
Original line number Diff line number Diff line
@@ -56,12 +56,14 @@ struct s3c_sdhci_platdata { 
 * make the structure itself __initdata.

 */

extern void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd);

extern void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd);



/* Default platform data, exported so that per-cpu initialisation can

 * set the correct one when there are more than one cpu type selected.

*/



extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platata;

extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platdata;

extern struct s3c_sdhci_platdata s3c_hsmmc1_def_platdata;



/* Helper function availablity */
@@ -69,6 +71,8 @@ extern struct s3c_sdhci_platdata s3c_hsmmc0_def_platata; 
extern char *s3c6410_hsmmc_clksrcs[4];



extern void s3c6410_setup_sdhci0_cfg_gpio(struct platform_device *, int w);

extern void s3c6410_setup_sdhci1_cfg_gpio(struct platform_device *, int w);



extern void s3c6410_setup_sdhci0_cfg_card(struct platform_device *dev,

					   void __iomem *r,

					   struct mmc_ios *ios,
@@ -80,8 +84,16 @@ static inline void s3c6410_default_sdhci0(void) 
	s3c_hsmmc0_def_platdata.cfg_gpio = s3c6410_setup_sdhci0_cfg_gpio;

	s3c_hsmmc0_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;

}



static inline void s3c6410_default_sdhci1(void)

{

	s3c_hsmmc1_def_platdata.clocks = s3c6410_hsmmc_clksrcs;

	s3c_hsmmc1_def_platdata.cfg_gpio = s3c6410_setup_sdhci0_cfg_gpio;

	s3c_hsmmc1_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;

}

#else

static inline void s3c6410_default_sdhci0(void) { }

static inline void s3c6410_default_sdhci1(void) { }

#endif /* CONFIG_S3C6410_SETUP_SDHCI */



#endif /* __PLAT_S3C_SDHCI_H */