ARM: Exynos: Remove unused non-dt support for dwmci controller

PATCH New Thomas Abraham 4 participants 8 messages Nov 26, 2012 – Nov 27, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Thomas Abraham

author

2012-11-26 06:46 UTC #0 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

With device tree support enabled for dwmci controller, the unused non-dt support for dwmci controller can be removed.

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75 -----------------------------
 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

arch/arm/mach-exynos/Makefile +0 -1

index c12ed6a..b189881 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 obj-y					+= dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
 obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
-obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-75~~

75 lines not on this page · raw message

arch/arm/mach-exynos/include/mach/dwmci.h deleted +0 ~~-20~~

deleted file mode 100644
index 7ce6574..0000000
@@ -1,20 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * Synopsys DesignWare Mobile Storage for EXYNOS4210
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_DWMCI_H
-#define __ASM_ARM_ARCH_DWMCI_H __FILE__
-
-#include <linux/mmc/dw_mmc.h>
-
-extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd);
-
-#endif /* __ASM_ARM_ARCH_DWMCI_H */

Signature · 1 line

1.7.5.4

Kyungmin Park

2012-11-26 11:27 UTC #1 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

Quoted 3 lines · Thomas Abraham

With device tree support enabled for dwmci controller, the unused non-dt support
for dwmci controller can be removed.

Are there no problem to use legacy board? e.g., universal_c210.

Quoted 142 lines

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75
-----------------------------
 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

arch/arm/mach-exynos/Makefile +0 -1

index c12ed6a..b189881 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 obj-y					+= dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
 obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
-obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-31~~

deleted file mode 100644
index 7903501..0000000
@@ -1,75 +0,0 @@
-/*
- * linux/arch/arm/mach-exynos4/dev-dwmci.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Platform device for Synopsys DesignWare Mobile Storage IP
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/mmc/dw_mmc.h>
-
-#include <plat/devs.h>
-
-#include <mach/map.h>
-
-static int exynos4_dwmci_get_bus_wd(u32 slot_id)
-{
-	return 4;
-}
-
-static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void

*data)

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-44~~

-{
-	return 0;
-}
-
-static struct resource exynos4_dwmci_resource[] = {
-	[0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K),
-	[1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI),
-};
-
-static struct dw_mci_board exynos4_dwci_pdata = {
-	.num_slots			= 1,
-	.quirks				= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
-	.bus_hz				= 80 * 1000 * 1000,
-	.detect_delay_ms	= 200,
-	.init				= exynos4_dwmci_init,
-	.get_bus_wd			= exynos4_dwmci_get_bus_wd,
-};
-
-static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device exynos4_device_dwmci = {
-	.name		= "dw_mmc",
-	.id		= -1,
-	.num_resources	= ARRAY_SIZE(exynos4_dwmci_resource),
-	.resource	= exynos4_dwmci_resource,
-	.dev		= {
-		.dma_mask		= &exynos4_dwmci_dmamask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data	= &exynos4_dwci_pdata,
-	},
-};
-
-void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd)
-{
-	struct dw_mci_board *npd;
-
-	npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board),
-			&exynos4_device_dwmci);
-
-	if (!npd->init)
-		npd->init = exynos4_dwmci_init;
-	if (!npd->get_bus_wd)
-		npd->get_bus_wd = exynos4_dwmci_get_bus_wd;
-}

arch/arm/mach-exynos/include/mach/dwmci.h deleted +0 ~~-21~~

deleted file mode 100644
index 7ce6574..0000000
@@ -1,20 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * Synopsys DesignWare Mobile Storage for EXYNOS4210
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_DWMCI_H
-#define __ASM_ARM_ARCH_DWMCI_H __FILE__
-
-#include <linux/mmc/dw_mmc.h>
-
-extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd);
-
-#endif /* __ASM_ARM_ARCH_DWMCI_H */
--

1.7.5.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Kukjin Kim

2012-11-27 01:01 UTC #2 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

Quoted 8 lines · Kyungmin Park

Quoted 3 lines · Thomas Abraham
With device tree support enabled for dwmci controller, the unused non-dt support
for dwmci controller can be removed.
Are there no problem to use legacy board? e.g., universal_c210.

I cannot find anywhere the exynos4_dwmci_set_platdata() and exynos4_device_dwmci are used.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Thomas Abraham

author

2012-11-27 05:07 UTC #3 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

In reply to Kyungmin Park

Hi Mr. Park,

Quoted 6 lines · Kyungmin Park

Quoted 3 lines · Thomas Abraham
With device tree support enabled for dwmci controller, the unused non-dt support
for dwmci controller can be removed.
Are there no problem to use legacy board? e.g., universal_c210.

The objective of this patch was to reduce the gap that mach-exynos has to participate in multi-platform kernel builds. It is difficult to reduce this gap if we continue to add further non-dt support to existing not-dt (legacy) board files. Exynos5 is fully dt-enabled now and all further additions to mach-exynos will be/should be dt-only code.

So what is currently holding us back in letting mach-exynos participate in multi-platform kernel builds is the mainly the four legacy board files (origen, smdkv310, nuri and universal) and hopefully there will be some efforts towards getting them dt-enabled. I understand that there is lot of work here to do but we have to start somewhere.

Thanks,
Thomas.

Quoted 143 lines

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75
-----------------------------
 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

arch/arm/mach-exynos/Makefile +0 -1

index c12ed6a..b189881 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)               += mach-exynos5-dt.o
 obj-y                                        += dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)           += dev-audio.o
 obj-$(CONFIG_EXYNOS4_DEV_AHCI)               += dev-ahci.o
-obj-$(CONFIG_EXYNOS4_DEV_DWMCI)              += dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)         += dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)   += dev-ohci.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)              += dev-sysmmu.o

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-31~~

deleted file mode 100644
index 7903501..0000000
@@ -1,75 +0,0 @@
-/*
- * linux/arch/arm/mach-exynos4/dev-dwmci.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *           http://www.samsung.com
- *
- * Platform device for Synopsys DesignWare Mobile Storage IP
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/mmc/dw_mmc.h>
-
-#include <plat/devs.h>
-
-#include <mach/map.h>
-
-static int exynos4_dwmci_get_bus_wd(u32 slot_id)
-{
-     return 4;
-}
-
-static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void

*data)

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-44~~

-{
-     return 0;
-}
-
-static struct resource exynos4_dwmci_resource[] = {
-     [0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K),
-     [1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI),
-};
-
-static struct dw_mci_board exynos4_dwci_pdata = {
-     .num_slots                      = 1,
-     .quirks                         = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
-     .bus_hz                         = 80 * 1000 * 1000,
-     .detect_delay_ms        = 200,
-     .init                           = exynos4_dwmci_init,
-     .get_bus_wd                     = exynos4_dwmci_get_bus_wd,
-};
-
-static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device exynos4_device_dwmci = {
-     .name           = "dw_mmc",
-     .id             = -1,
-     .num_resources  = ARRAY_SIZE(exynos4_dwmci_resource),
-     .resource       = exynos4_dwmci_resource,
-     .dev            = {
-             .dma_mask               = &exynos4_dwmci_dmamask,
-             .coherent_dma_mask      = DMA_BIT_MASK(32),
-             .platform_data  = &exynos4_dwci_pdata,
-     },
-};
-
-void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd)
-{
-     struct dw_mci_board *npd;
-
-     npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board),
-                     &exynos4_device_dwmci);
-
-     if (!npd->init)
-             npd->init = exynos4_dwmci_init;
-     if (!npd->get_bus_wd)
-             npd->get_bus_wd = exynos4_dwmci_get_bus_wd;
-}

arch/arm/mach-exynos/include/mach/dwmci.h deleted +0 ~~-21~~

deleted file mode 100644
index 7ce6574..0000000
@@ -1,20 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *           http://www.samsung.com/
- *
- * Synopsys DesignWare Mobile Storage for EXYNOS4210
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_DWMCI_H
-#define __ASM_ARM_ARCH_DWMCI_H __FILE__
-
-#include <linux/mmc/dw_mmc.h>
-
-extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd);
-
-#endif /* __ASM_ARM_ARCH_DWMCI_H */
--

1.7.5.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Kukjin Kim

2012-11-27 00:53 UTC #4 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

In reply to Thomas Abraham

Quoted 9 lines · Thomas Abraham

With device tree support enabled for dwmci controller, the unused non-dt support
for dwmci controller can be removed.
Signed-off-by Thomas Abraham <[email protected]>
---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75

---------------------------

Quoted 131 lines

 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

arch/arm/mach-exynos/Makefile +0 -0

index c12ed6a..b189881 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-

exynos5-dt.o
obj-y += dev-uart.o
obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o
obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o

arch/arm/mach-exynos/Makefile +0 -1

-obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o

arch/arm/mach-exynos/dev- renamed from arch/arm/mach-exynos/dev-dwmci.c +0 -0

dwmci.c
deleted file mode 100644
index 7903501..0000000

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-31~~

@@ -1,75 +0,0 @@
-/*
- * linux/arch/arm/mach-exynos4/dev-dwmci.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Platform device for Synopsys DesignWare Mobile Storage IP
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/mmc/dw_mmc.h>
-
-#include <plat/devs.h>
-
-#include <mach/map.h>
-
-static int exynos4_dwmci_get_bus_wd(u32 slot_id)
-{
-	return 4;
-}
-
-static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void

*data)

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-12~~

-{
-	return 0;
-}
-
-static struct resource exynos4_dwmci_resource[] = {
-	[0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K),
-	[1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI),
-};
-
-static struct dw_mci_board exynos4_dwci_pdata = {
-	.num_slots			= 1,
-	.quirks				=

DW_MCI_QUIRK_BROKEN_CARD_DETECTION,

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-32~~

-	.bus_hz				= 80 * 1000 * 1000,
-	.detect_delay_ms	= 200,
-	.init				= exynos4_dwmci_init,
-	.get_bus_wd			= exynos4_dwmci_get_bus_wd,
-};
-
-static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device exynos4_device_dwmci = {
-	.name		= "dw_mmc",
-	.id		= -1,
-	.num_resources	= ARRAY_SIZE(exynos4_dwmci_resource),
-	.resource	= exynos4_dwmci_resource,
-	.dev		= {
-		.dma_mask		= &exynos4_dwmci_dmamask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data	= &exynos4_dwci_pdata,
-	},
-};
-
-void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd)
-{
-	struct dw_mci_board *npd;
-
-	npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board),
-			&exynos4_device_dwmci);
-
-	if (!npd->init)
-		npd->init = exynos4_dwmci_init;
-	if (!npd->get_bus_wd)
-		npd->get_bus_wd = exynos4_dwmci_get_bus_wd;
-}

arch/arm/mach- renamed from arch/arm/mach-exynos/include/mach/dwmci.h +0 -0

exynos/include/mach/dwmci.h
deleted file mode 100644
index 7ce6574..0000000

arch/arm/mach-exynos/include/mach/dwmci.h deleted +0 ~~-21~~

@@ -1,20 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * Synopsys DesignWare Mobile Storage for EXYNOS4210
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_DWMCI_H
-#define __ASM_ARM_ARCH_DWMCI_H __FILE__
-
-#include <linux/mmc/dw_mmc.h>
-
-extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd);
-
-#endif /* __ASM_ARM_ARCH_DWMCI_H */
--

Quoted 1 line

1.7.5.4

Looks good to me, applied.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Seungwon Jeon

2012-11-27 05:01 UTC #5 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

In reply to Thomas Abraham

Quoted 11 lines · Thomas Abraham

With device tree support enabled for dwmci controller, the unused non-dt support for dwmci controller can be removed.
Signed-off-by Thomas Abraham <[email protected]>
---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75 -----------------------------
 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

Hi Thomas,

The following parts are remained. Also, no used code. Could you check it?

./plat-samsung/include/plat/devs.h:126:extern struct platform_device exynos4_device_dwmci; ./Kconfig:111:config EXYNOS4_DEV_DWMCI

Thanks,
Seungwon Jeon

Quoted 122 lines

arch/arm/mach-exynos/Makefile +0 -1

index c12ed6a..b189881 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 obj-y					+= dev-uart.o
 obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
 obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
-obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 obj-$(CONFIG_EXYNOS_DEV_SYSMMU)		+= dev-sysmmu.o

arch/arm/mach-exynos/dev-dwmci.c deleted +0 ~~-75~~

deleted file mode 100644
index 7903501..0000000
@@ -1,75 +0,0 @@
-/*
- * linux/arch/arm/mach-exynos4/dev-dwmci.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com
- *
- * Platform device for Synopsys DesignWare Mobile Storage IP
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/mmc/dw_mmc.h>
-
-#include <plat/devs.h>
-
-#include <mach/map.h>
-
-static int exynos4_dwmci_get_bus_wd(u32 slot_id)
-{
-	return 4;
-}
-
-static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void *data)
-{
-	return 0;
-}
-
-static struct resource exynos4_dwmci_resource[] = {
-	[0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K),
-	[1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI),
-};
-
-static struct dw_mci_board exynos4_dwci_pdata = {
-	.num_slots			= 1,
-	.quirks				= DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
-	.bus_hz				= 80 * 1000 * 1000,
-	.detect_delay_ms	= 200,
-	.init				= exynos4_dwmci_init,
-	.get_bus_wd			= exynos4_dwmci_get_bus_wd,
-};
-
-static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device exynos4_device_dwmci = {
-	.name		= "dw_mmc",
-	.id		= -1,
-	.num_resources	= ARRAY_SIZE(exynos4_dwmci_resource),
-	.resource	= exynos4_dwmci_resource,
-	.dev		= {
-		.dma_mask		= &exynos4_dwmci_dmamask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data	= &exynos4_dwci_pdata,
-	},
-};
-
-void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd)
-{
-	struct dw_mci_board *npd;
-
-	npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board),
-			&exynos4_device_dwmci);
-
-	if (!npd->init)
-		npd->init = exynos4_dwmci_init;
-	if (!npd->get_bus_wd)
-		npd->get_bus_wd = exynos4_dwmci_get_bus_wd;
-}

arch/arm/mach-exynos/include/mach/dwmci.h deleted +0 ~~-21~~

deleted file mode 100644
index 7ce6574..0000000
@@ -1,20 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *		http://www.samsung.com/
- *
- * Synopsys DesignWare Mobile Storage for EXYNOS4210
- *
- * 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.
- */
-
-#ifndef __ASM_ARM_ARCH_DWMCI_H
-#define __ASM_ARM_ARCH_DWMCI_H __FILE__
-
-#include <linux/mmc/dw_mmc.h>
-
-extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd);
-
-#endif /* __ASM_ARM_ARCH_DWMCI_H */
--

1.7.5.4

Thomas Abraham

author

2012-11-27 08:50 UTC #6 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

Quoted 13 lines · Seungwon Jeon

Quoted 11 lines · Thomas Abraham
With device tree support enabled for dwmci controller, the unused non-dt support for dwmci controller can be removed.
Signed-off-by Thomas Abraham <[email protected]>
---
 arch/arm/mach-exynos/Makefile             |    1 -
 arch/arm/mach-exynos/dev-dwmci.c          |   75 -----------------------------
 arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
 3 files changed, 0 insertions(+), 96 deletions(-)
 delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c
 delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h

Quoted 7 lines

Hi Thomas,
The following parts are remained. Also, no used code. Could you check it?
./plat-samsung/include/plat/devs.h:126:extern struct platform_device exynos4_device_dwmci; ./Kconfig:111:config EXYNOS4_DEV_DWMCI

Hi Seungwon,

Yes, I have missed that. Thanks for pointing this out. I will take care of this.

Thanks,
Thomas.

Kukjin Kim

2012-11-27 23:31 UTC #7 lore raw

PATCH 1/1 ARM: Exynos: Remove unused non-dt support for dwmci controller

Quoted 19 lines · Thomas Abraham

Quoted 18 lines · Seungwon Jeon
Quoted 11 lines · Thomas Abraham
With device tree support enabled for dwmci controller, the unused non-dt support for dwmci controller can be removed.
Signed-off-by Thomas Abraham<[email protected]>
---
  arch/arm/mach-exynos/Makefile             |    1 -
  arch/arm/mach-exynos/dev-dwmci.c          |   75 -----------------------------
  arch/arm/mach-exynos/include/mach/dwmci.h |   20 --------
  3 files changed, 0 insertions(+), 96 deletions(-)
delete mode 100644 arch/arm/mach-exynos/dev-dwmci.c delete mode 100644 arch/arm/mach-exynos/include/mach/dwmci.h
Hi Thomas,
The following parts are remained. Also, no used code. Could you check it?

Quoted 7 lines

Quoted 2 lines
./plat-samsung/include/plat/devs.h:126:extern struct platform_device exynos4_device_dwmci; ./Kconfig:111:config EXYNOS4_DEV_DWMCI
Hi Seungwon,
Yes, I have missed that. Thanks for pointing this out. I will take care of this.

I amended the commit as per Seungwon's pointing out.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.