ARM: EXYNOS4: Add SPDIF for SMDKV310

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-exynos4 / mach-smdkv310.c

diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c b/arch/arm/mach-exynos4/mach-smdkv310.c
index 152676471b67d4fb7f219c3bedf1eaa5de560ca5..40b0a53891bd05c369257ac9365e510f772b79f2 100644 (file)
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -78,9 +78,7 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = {
 };
 
 static struct s3c_sdhci_platdata smdkv310_hsmmc0_pdata __initdata = {
-       .cd_type                = S3C_SDHCI_CD_GPIO,
-       .ext_cd_gpio            = EXYNOS4_GPK0(2),
-       .ext_cd_gpio_invert     = 1,
+       .cd_type                = S3C_SDHCI_CD_INTERNAL,
        .clk_type               = S3C_SDHCI_CLK_DIV_EXTERNAL,
 #ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT
        .max_width              = 8,
@@ -96,9 +94,7 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc1_pdata __initdata = {
 };
 
 static struct s3c_sdhci_platdata smdkv310_hsmmc2_pdata __initdata = {
-       .cd_type                = S3C_SDHCI_CD_GPIO,
-       .ext_cd_gpio            = EXYNOS4_GPK2(2),
-       .ext_cd_gpio_invert     = 1,
+       .cd_type                = S3C_SDHCI_CD_INTERNAL,
        .clk_type               = S3C_SDHCI_CLK_DIV_EXTERNAL,
 #ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT
        .max_width              = 8,
@@ -185,9 +181,11 @@ static struct platform_device *smdkv310_devices[] __initdata = {
        &exynos4_device_pd[PD_CAM],
        &exynos4_device_pd[PD_TV],
        &exynos4_device_pd[PD_GPS],
+       &exynos4_device_spdif,
        &exynos4_device_sysmmu,
        &samsung_asoc_dma,
        &smdkv310_smsc911x,
+       &exynos4_device_ahci,
 };
 
 static void __init smdkv310_smsc911x_init(void)