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

Commit 4fabb633 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-samsung-3' of... 

Merge branch 'next/cleanup-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim:
* 'next/cleanup-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Remove unused regs-mem.h file
  ARM: EXYNOS: Remove unused non-dt support for dwmci controller
parents 73f14f6d 8aca8dbe

arch/arm/mach-exynos/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -98,11 +98,6 @@ config EXYNOS_DEV_SYSMMU 
	help

	  Common setup code for SYSTEM MMU in EXYNOS platforms



config EXYNOS4_DEV_DWMCI

	bool

	help

	  Compile in platform device definitions for DWMCI



config EXYNOS4_DEV_USB_OHCI

	bool

	help

arch/arm/mach-exynos/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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_DRM)		+= dev-drm.o

arch/arm/mach-exynos/dev-dwmci.c

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
/*

 * 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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* 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 */

arch/arm/mach-exynos/include/mach/regs-mem.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/regs-mem.h

 *

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS4 - SROMC and DMC register definitions

 *

 * 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_ARCH_REGS_MEM_H

#define __ASM_ARCH_REGS_MEM_H __FILE__



#include <mach/map.h>



#define S5P_DMC0_MEMCON_OFFSET		0x04



#define S5P_DMC0_MEMTYPE_SHIFT		8

#define S5P_DMC0_MEMTYPE_MASK		0xF



#endif /* __ASM_ARCH_REGS_MEM_H */