Merge pull request #1 from tobetter/odroidx-next

Odroidx next
hardkernel · Aug 13, 2012 · 5d0fd34 · 5d0fd34
2 parents 7cb1154 + bfc181d
commit 5d0fd34
Show file tree

Hide file tree

Showing 8 changed files with 252 additions and 90 deletions.
diff --git a/arch/arm/configs/odroidx_defconfig b/arch/arm/configs/odroidx_defconfig
@@ -377,13 +377,16 @@ CONFIG_EXYNOS_DEV_DMA=y
 CONFIG_EXYNOS_DEV_DRM=y
 CONFIG_EXYNOS4_SETUP_FIMD0=y
 CONFIG_EXYNOS_DEV_SYSMMU=y
+CONFIG_EXYNOS4_DEV_DWMCI=y
 CONFIG_EXYNOS4_DEV_USB_OHCI=y
 CONFIG_EXYNOS4_SETUP_I2C1=y
 CONFIG_EXYNOS4_SETUP_I2C3=y
 CONFIG_EXYNOS4_SETUP_I2C7=y
 CONFIG_EXYNOS4_SETUP_KEYPAD=y
 CONFIG_EXYNOS4_SETUP_SDHCI=y
 CONFIG_EXYNOS4_SETUP_SDHCI_GPIO=y
+CONFIG_EXYNOS4_SETUP_DWMCI=y
+CONFIG_EXYNOS4_SETUP_DWMCI_GPIO=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
 
 #
@@ -565,8 +568,31 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# ARM CPU frequency scaling drivers
+#
+CONFIG_ARM_EXYNOS_CPUFREQ=y
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
@@ -606,6 +632,8 @@ CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 # CONFIG_APM_EMULATION is not set
 CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
 CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM_CPU_SUSPEND=y
@@ -2369,7 +2397,9 @@ CONFIG_MMC_SDHCI_S3C=y
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_SDHCI_S3C_DMA is not set
-# CONFIG_MMC_DW is not set
+CONFIG_MMC_DW=y
+# CONFIG_MMC_DW_IDMAC is not set
+CONFIG_MMC_DW_PLTFM=y
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
@@ -162,6 +162,17 @@ config EXYNOS4_SETUP_SDHCI_GPIO
 	help
 	  Common setup code for SDHCI gpio.
 
+config EXYNOS4_SETUP_DWMCI
+       bool
+       select EXYNOS4_SETUP_DWMCI_GPIO
+       help
+         Internal helper functions for EXYNOS4 based DWMCI systems.
+
+config EXYNOS4_SETUP_DWMCI_GPIO
+       bool
+       help
+         Common setup code for DWMCI gpio.
+
 config EXYNOS4_SETUP_FIMC
 	bool
 	help
@@ -413,6 +424,8 @@ config MACH_HKDK4412
 	select S5P_DEV_TV
 	select S5P_GPIO_INT
 	select EXYNOS4_DEV_USB_OHCI
+	select EXYNOS4_DEV_DWMCI
+	select EXYNOS4_SETUP_DWMCI
 	select SAMSUNG_DEV_ADC
 	help
 	  Machine support for Odroid-X based on Samsung EXYNOS4412

diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
@@ -69,5 +69,6 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o
 obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o
 obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+obj-$(CONFIG_EXYNOS4_SETUP_DWMCI_GPIO)	+= setup-dwmci-gpio.o
 obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o
 obj-$(CONFIG_EXYNOS_SETUP_SPI)		+= setup-spi.o
diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
@@ -1205,6 +1205,17 @@ static struct clksrc_clk exynos4_clk_sclk_mmc3 = {
 	.reg_div = { .reg = EXYNOS4_CLKDIV_FSYS2, .shift = 24, .size = 8 },
 };
 
+static struct clksrc_clk exynos4_clk_sclk_dwmci = {
+       .clk    = {
+               .name           = "sclk_dwmci",
+               .devname        = "dw_mmc",
+               .parent         = &exynos4_clk_dout_mmc4.clk,
+               .enable         = exynos4_clksrc_mask_fsys_ctrl,
+               .ctrlbit        = (1 << 16),
+       },
+       .reg_div = { .reg = EXYNOS4_CLKDIV_FSYS3, .shift = 8, .size = 8 },
+};
+
 static struct clksrc_clk exynos4_clk_mdout_spi0 = {
 	.clk	= {
 		.name		= "mdout_spi",
@@ -1318,6 +1329,7 @@ static struct clksrc_clk *exynos4_clksrc_cdev[] = {
 	&exynos4_clk_sclk_mmc1,
 	&exynos4_clk_sclk_mmc2,
 	&exynos4_clk_sclk_mmc3,
+	&exynos4_clk_sclk_dwmci,
 	&exynos4_clk_sclk_spi0,
 	&exynos4_clk_sclk_spi1,
 	&exynos4_clk_sclk_spi2,