diff options
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/dev-dwmci.c | 75 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/dwmci.h | 20 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
5 files changed, 0 insertions, 102 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index da55107033dd..69d10373a410 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig | |||
| @@ -98,11 +98,6 @@ config EXYNOS_DEV_SYSMMU | |||
| 98 | help | 98 | help |
| 99 | Common setup code for SYSTEM MMU in EXYNOS platforms | 99 | Common setup code for SYSTEM MMU in EXYNOS platforms |
| 100 | 100 | ||
| 101 | config EXYNOS4_DEV_DWMCI | ||
| 102 | bool | ||
| 103 | help | ||
| 104 | Compile in platform device definitions for DWMCI | ||
| 105 | |||
| 106 | config EXYNOS4_DEV_USB_OHCI | 101 | config EXYNOS4_DEV_USB_OHCI |
| 107 | bool | 102 | bool |
| 108 | help | 103 | help |
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 9b58024f7d43..0c74bdc6b698 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile | |||
| @@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o | |||
| 50 | obj-y += dev-uart.o | 50 | obj-y += dev-uart.o |
| 51 | obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o | 51 | obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o |
| 52 | obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o | 52 | obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o |
| 53 | obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o | ||
| 54 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o | 53 | obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o |
| 55 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o | 54 | obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o |
| 56 | obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o | 55 | obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o |
diff --git a/arch/arm/mach-exynos/dev-dwmci.c b/arch/arm/mach-exynos/dev-dwmci.c deleted file mode 100644 index 79035018fb74..000000000000 --- a/arch/arm/mach-exynos/dev-dwmci.c +++ /dev/null | |||
| @@ -1,75 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/arch/arm/mach-exynos4/dev-dwmci.c | ||
| 3 | * | ||
| 4 | * Copyright (c) 2011 Samsung Electronics Co., Ltd. | ||
| 5 | * http://www.samsung.com | ||
| 6 | * | ||
| 7 | * Platform device for Synopsys DesignWare Mobile Storage IP | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/dma-mapping.h> | ||
| 17 | #include <linux/platform_device.h> | ||
| 18 | #include <linux/interrupt.h> | ||
| 19 | #include <linux/ioport.h> | ||
| 20 | #include <linux/mmc/dw_mmc.h> | ||
| 21 | |||
| 22 | #include <plat/devs.h> | ||
| 23 | |||
| 24 | #include <mach/map.h> | ||
| 25 | |||
| 26 | static int exynos4_dwmci_get_bus_wd(u32 slot_id) | ||
| 27 | { | ||
| 28 | return 4; | ||
| 29 | } | ||
| 30 | |||
| 31 | static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void *data) | ||
| 32 | { | ||
| 33 | return 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | static struct resource exynos4_dwmci_resource[] = { | ||
| 37 | [0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K), | ||
| 38 | [1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI), | ||
| 39 | }; | ||
| 40 | |||
| 41 | static struct dw_mci_board exynos4_dwci_pdata = { | ||
| 42 | .num_slots = 1, | ||
| 43 | .quirks = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, | ||
| 44 | .bus_hz = 80 * 1000 * 1000, | ||
| 45 | .detect_delay_ms = 200, | ||
| 46 | .init = exynos4_dwmci_init, | ||
| 47 | .get_bus_wd = exynos4_dwmci_get_bus_wd, | ||
| 48 | }; | ||
| 49 | |||
| 50 | static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32); | ||
| 51 | |||
| 52 | struct platform_device exynos4_device_dwmci = { | ||
| 53 | .name = "dw_mmc", | ||
| 54 | .id = -1, | ||
| 55 | .num_resources = ARRAY_SIZE(exynos4_dwmci_resource), | ||
| 56 | .resource = exynos4_dwmci_resource, | ||
| 57 | .dev = { | ||
| 58 | .dma_mask = &exynos4_dwmci_dmamask, | ||
| 59 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
| 60 | .platform_data = &exynos4_dwci_pdata, | ||
| 61 | }, | ||
| 62 | }; | ||
| 63 | |||
| 64 | void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd) | ||
| 65 | { | ||
| 66 | struct dw_mci_board *npd; | ||
| 67 | |||
| 68 | npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board), | ||
| 69 | &exynos4_device_dwmci); | ||
| 70 | |||
| 71 | if (!npd->init) | ||
| 72 | npd->init = exynos4_dwmci_init; | ||
| 73 | if (!npd->get_bus_wd) | ||
| 74 | npd->get_bus_wd = exynos4_dwmci_get_bus_wd; | ||
| 75 | } | ||
diff --git a/arch/arm/mach-exynos/include/mach/dwmci.h b/arch/arm/mach-exynos/include/mach/dwmci.h deleted file mode 100644 index 7ce657459cc0..000000000000 --- a/arch/arm/mach-exynos/include/mach/dwmci.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* linux/arch/arm/mach-exynos4/include/mach/dwmci.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2011 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * Synopsys DesignWare Mobile Storage for EXYNOS4210 | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARM_ARCH_DWMCI_H | ||
| 14 | #define __ASM_ARM_ARCH_DWMCI_H __FILE__ | ||
| 15 | |||
| 16 | #include <linux/mmc/dw_mmc.h> | ||
| 17 | |||
| 18 | extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd); | ||
| 19 | |||
| 20 | #endif /* __ASM_ARM_ARCH_DWMCI_H */ | ||
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 5da4b4f38f40..a9b8096b8252 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -123,7 +123,6 @@ extern struct platform_device s5pv210_device_spdif; | |||
| 123 | 123 | ||
| 124 | extern struct platform_device exynos4_device_ac97; | 124 | extern struct platform_device exynos4_device_ac97; |
| 125 | extern struct platform_device exynos4_device_ahci; | 125 | extern struct platform_device exynos4_device_ahci; |
| 126 | extern struct platform_device exynos4_device_dwmci; | ||
| 127 | extern struct platform_device exynos4_device_i2s0; | 126 | extern struct platform_device exynos4_device_i2s0; |
| 128 | extern struct platform_device exynos4_device_i2s1; | 127 | extern struct platform_device exynos4_device_i2s1; |
| 129 | extern struct platform_device exynos4_device_i2s2; | 128 | extern struct platform_device exynos4_device_i2s2; |
