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

Commit 6ef297f8 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 5720/1: Move MMCI header to amba include dir 



This moves the mmci platform data definition struct away from
arch/arm/include/asm/mach/mmc.h into the more proper place among
the other primecells in include/linux/amba/mmci.h and at the same
time renames it to "mmci.h", and also the struct in this file
confusingly named mmc_platform_data has been renamed
mmci_platform_data for clarity.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4321532c

arch/arm/mach-integrator/integrator_cp.c

+2 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/amba/bus.h>

#include <linux/amba/kmi.h>

#include <linux/amba/clcd.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>



#include <asm/clkdev.h>
@@ -35,7 +36,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/flash.h>

#include <asm/mach/irq.h>

#include <asm/mach/mmc.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>
@@ -400,7 +400,7 @@ static unsigned int mmc_status(struct device *dev) 
	return status & 8;

}



static struct mmc_platform_data mmc_data = {

static struct mmci_platform_data mmc_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= mmc_status,

	.gpio_wp	= -1,

arch/arm/mach-realview/core.c

+3 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/io.h>

#include <linux/smsc911x.h>

#include <linux/ata_platform.h>

#include <linux/amba/mmci.h>



#include <asm/clkdev.h>

#include <asm/system.h>
@@ -44,7 +45,6 @@ 
#include <asm/mach/flash.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <asm/mach/mmc.h>



#include <asm/hardware/gic.h>
@@ -237,14 +237,14 @@ static unsigned int realview_mmc_status(struct device *dev) 
	return readl(REALVIEW_SYSMCI) & mask;

}



struct mmc_platform_data realview_mmc0_plat_data = {

struct mmci_platform_data realview_mmc0_plat_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= realview_mmc_status,

	.gpio_wp	= 17,

	.gpio_cd	= 16,

};



struct mmc_platform_data realview_mmc1_plat_data = {

struct mmci_platform_data realview_mmc1_plat_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= realview_mmc_status,

	.gpio_wp	= 19,

arch/arm/mach-realview/core.h

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ static struct amba_device name##_device = { \ 
extern struct platform_device realview_flash_device;

extern struct platform_device realview_cf_device;

extern struct platform_device realview_i2c_device;

extern struct mmc_platform_data realview_mmc0_plat_data;

extern struct mmc_platform_data realview_mmc1_plat_data;

extern struct mmci_platform_data realview_mmc0_plat_data;

extern struct mmci_platform_data realview_mmc1_plat_data;

extern struct clcd_board clcd_plat_data;

extern void __iomem *gic_cpu_base_addr;

extern void __iomem *timer0_va_base;

arch/arm/mach-realview/realview_eb.c

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/sysdev.h>

#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>



#include <mach/hardware.h>
@@ -37,7 +38,6 @@ 


#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/mmc.h>

#include <asm/mach/time.h>



#include <mach/board-eb.h>

arch/arm/mach-realview/realview_pb1176.c

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/sysdev.h>

#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>



#include <mach/hardware.h>
@@ -37,7 +38,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/flash.h>

#include <asm/mach/map.h>

#include <asm/mach/mmc.h>

#include <asm/mach/time.h>



#include <mach/board-pb1176.h>