Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4faf6867 authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C64XX: Add S3C6400 SDHCI setup support 



Add support for S3C6400 SDHCI channels 0 and 1, making
the GPIO code common to both S3C6400 and S3C6410.

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

arch/arm/mach-s3c6400/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -14,11 +14,18 @@ config CPU_S3C6400 
	help

	help

	  Enable S3C6400 CPU support

	  Enable S3C6400 CPU support





config S3C6400_SETUP_SDHCI

	bool

	help

	  Internal configuration for default SDHCI

	  setup for S3C6400.



# S36400 Macchine support

# S36400 Macchine support





config MACH_SMDK6400

config MACH_SMDK6400

       bool "SMDK6400"

       bool "SMDK6400"

	select CPU_S3C6400

	select CPU_S3C6400

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC

	select S3C6400_SETUP_SDHCI

	help

	help

	  Machine support for the Samsung SMDK6400
 
	  Machine support for the Samsung SMDK6400

arch/arm/mach-s3c6400/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,10 @@ obj- := 




obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o

obj-$(CONFIG_CPU_S3C6400)	+= s3c6400.o





# setup support



obj-$(CONFIG_S3C6400_SETUP_SDHCI) += setup-sdhci.o



# Machine support

# Machine support





obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o
 
obj-$(CONFIG_MACH_SMDK6400)	+= mach-smdk6400.o

arch/arm/mach-s3c6400/s3c6400.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,12 @@ 




void __init s3c6400_map_io(void)

void __init s3c6400_map_io(void)

{

{

	/* the i2c device is directly compatible with s3c2440 */

	/* setup SDHCI */



	s3c6400_default_sdhci0();

	s3c6400_default_sdhci1();



	/* the i2c devices are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c0_setname("s3c2440-i2c");

}

}

arch/arm/mach-s3c6400/setup-sdhci.c

0 → 100644
+63 −0
Original line number Original line Diff line number Diff line 
/* linux/arch/arm/mach-s3c6410/setup-sdhci.c

 *

 * Copyright 2008 Simtec Electronics

 * Copyright 2008 Simtec Electronics

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

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

 *

 * S3C6410 - Helper functions for settign up SDHCI device(s) (HSMMC)

 *

 * 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/types.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/io.h>



#include <linux/mmc/card.h>

#include <linux/mmc/host.h>



#include <plat/regs-sdhci.h>

#include <plat/sdhci.h>



/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */



char *s3c6400_hsmmc_clksrcs[4] = {

	[0] = "hsmmc",

	[1] = "hsmmc",

	[2] = "mmc_bus",

	/* [3] = "48m", - note not succesfully used yet */

};



void s3c6400_setup_sdhci_cfg_card(struct platform_device *dev,

				  void __iomem *r,

				  struct mmc_ios *ios,

				  struct mmc_card *card)

{

	u32 ctrl2, ctrl3;



	ctrl2 = readl(r + S3C_SDHCI_CONTROL2);

	ctrl2 &= S3C_SDHCI_CTRL2_SELBASECLK_MASK;

	ctrl2 |= (S3C64XX_SDHCI_CTRL2_ENSTAASYNCCLR |

		  S3C64XX_SDHCI_CTRL2_ENCMDCNFMSK |

		  S3C_SDHCI_CTRL2_ENFBCLKRX |

		  S3C_SDHCI_CTRL2_DFCNT_NONE |

		  S3C_SDHCI_CTRL2_ENCLKOUTHOLD);



	if (ios->clock < 25 * 1000000)

		ctrl3 = (S3C_SDHCI_CTRL3_FCSEL3 |

			 S3C_SDHCI_CTRL3_FCSEL2 |

			 S3C_SDHCI_CTRL3_FCSEL1 |

			 S3C_SDHCI_CTRL3_FCSEL0);

	else

		ctrl3 = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0);



	printk(KERN_INFO "%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3);

	writel(ctrl2, r + S3C_SDHCI_CONTROL2);

	writel(ctrl3, r + S3C_SDHCI_CONTROL3);

}

arch/arm/mach-s3c6410/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ config CPU_S3C6410 




config S3C6410_SETUP_SDHCI

config S3C6410_SETUP_SDHCI

	bool

	bool

	select S3C64XX_SETUP_SDHCI_GPIO

	help

	help

	  Internal helper functions for S3C6410 based SDHCI systems

	  Internal helper functions for S3C6410 based SDHCI systems