Move MMCI header to amba include dir
Subsystems (6)
PATCH 1/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.
---
This patch is against the devel branch in Russells git, and was compiled with no errors against realview_defconfig, versatile_defconfig, integrator_defconfig and u300_defconfig. Some minor tweaks were needed to compile, since devel is not yet rebased to master (vic.c #include <linux/device.h> patch and the new clocksource code are the culprits).
--- arch/arm/include/asm/mach/mmc.h | 18 ------------------ arch/arm/mach-integrator/integrator_cp.c | 4 ++-- arch/arm/mach-realview/core.c | 6 +++--- arch/arm/mach-realview/core.h | 4 ++-- arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-realview/realview_pb1176.c | 2 +- arch/arm/mach-realview/realview_pb11mp.c | 2 +- arch/arm/mach-realview/realview_pba8.c | 2 +- arch/arm/mach-realview/realview_pbx.c | 2 +- arch/arm/mach-u300/mmc.c | 4 ++-- arch/arm/mach-versatile/core.c | 4 ++-- arch/arm/mach-versatile/versatile_pb.c | 4 ++-- drivers/mmc/host/mmci.c | 4 ++-- drivers/mmc/host/mmci.h | 2 +- include/linux/amba/mmci.h | 18 ++++++++++++++++++ 15 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 arch/arm/include/asm/mach/mmc.h create mode 100644 include/linux/amba/mmci.h
arch/arm/include/asm/mach/mmc.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* -* arch/arm/include/asm/mach/mmc.h -*/ -#ifndef ASMARM_MACH_MMC_H -#define ASMARM_MACH_MMC_H - -#include <linux/mmc/host.h> - -struct mmc_platform_data { -unsigned int ocr_mask;/* available voltages */ -u32 (*translate_vdd)(struct device *,unsigned int ); -unsigned int (*status)(struct device *); -int gpio_wp; -int gpio_cd; -unsigned long capabilities; -}; - -#endif
arch/arm/mach-integrator/integrator_cp.c +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
arch/arm/mach-realview/realview_pb11mp.c +1 -1
@@ -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>
@@ -38,7 +39,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-pb11mp.h>
arch/arm/mach-realview/realview_pba8.c +1 -1
@@ -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 <asm/irq.h>
@@ -34,7 +35,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include <asm/mach/time.h> #include <mach/hardware.h>
arch/arm/mach-realview/realview_pbx.c +1 -1
@@ -23,6 +23,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 <asm/irq.h>
@@ -34,7 +35,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include <asm/mach/time.h> #include <mach/hardware.h>
arch/arm/mach-u300/mmc.c +2 -2
@@ -19,8 +19,8 @@#include <linux/regulator/consumer.h> #include <linux/regulator/machine.h> #include <linux/gpio.h> +#include <linux/amba/mmci.h> -#include <asm/mach/mmc.h> #include "mmc.h" #include "padmux.h"
@@ -28,7 +28,7 @@ struct mmci_card_event {struct input_dev *mmc_input;int mmc_inserted;struct work_struct workq; -struct mmc_platform_data mmc0_plat_data; +struct mmci_platform_data mmc0_plat_data; };static unsigned int mmc_status (struct device *dev)
arch/arm/mach-versatile/core.c +2 -2
@@ -27,6 +27,7 @@#include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/amba/pl061.h> +#include <linux/amba/mmci.h> #include <linux/clocksource.h> #include <linux/clockchips.h> #include <linux/cnt32_to_63.h>
@@ -47,7 +48,6 @@#include <asm/mach/irq.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include "core.h" #include "clock.h"
@@ -369,7 +369,7 @@ unsigned int mmc_status(struct device *dev)return readl (VERSATILE_SYSMCI ) & mask; } -static struct mmc_platform_data mmc0_plat_data = { +static struct mmci_platform_data mmc0_plat_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .status = mmc_status, .gpio_wp =-1 ,
arch/arm/mach-versatile/versatile_pb.c +2 -2
@@ -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>
@@ -31,7 +32,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/mmc.h> #include "core.h"
@@ -41,7 +41,7 @@#define IRQ_MMCI1A IRQ_SIC_MMCI1A#endif -static struct mmc_platform_data mmc1_plat_data = { +static struct mmci_platform_data mmc1_plat_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .status = mmc_status, .gpio_wp =-1 ,
drivers/mmc/host/mmci.c +2 -2
@@ -22,12 +22,12 @@#include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/gpio.h> +#include <linux/amba/mmci.h> #include <asm/cacheflush.h> #include <asm/div64.h> #include <asm/io.h> #include <asm/sizes.h> -#include <asm/mach/mmc.h> #include "mmci.h"
@@ -537,7 +537,7 @@ static void mmci_check_status(unsigned long data)static int __devinit mmci_probe (struct amba_device *dev,struct amba_id *id) { -struct mmc_platform_data *plat = dev->dev.platform_data; +struct mmci_platform_data *plat = dev->dev.platform_data;struct mmci_host *host;struct mmc_host *mmc;int ret;
drivers/mmc/host/mmci.h +1 -1
@@ -161,7 +161,7 @@ struct mmci_host {unsigned int mclk;unsigned int cclk;u32 pwr; -struct mmc_platform_data *plat; +struct mmci_platform_data *plat;u8 hw_designer; u8 hw_revision:4;
include/linux/amba/mmci.h new file +18 -0
@@ -0,0 +1,18 @@ +/* +* include/linux/amba/mmci.h +*/ +#ifndef AMBA_MMCI_H +#define AMBA_MMCI_H + +#include <linux/mmc/host.h> + +struct mmci_platform_data { +unsigned int ocr_mask;/* available voltages */ +u32 (*translate_vdd)(struct device *,unsigned int ); +unsigned int (*status)(struct device *); +int gpio_wp; +int gpio_cd; +unsigned long capabilities; +}; + +#endif
Signature · 1 line
1.6.2.1
PATCH 1/1 Move MMCI header to amba include dir
Hi Linus,
You changes cause the bcmring platform to fail to compile.
Can you go through all the ARM platforms and make the necessary adjustments with the change in header files for mmc?
Thanks,
Scott
Quoted 414 lines
-----Original Message-----
From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-arm-kernel-bounces at lists.infradead.org] On Behalf Of Linus Walleij
Sent: September 22, 2009 6:26 AM
To: linux-arm-kernel at lists.infradead.org
Cc: Catalin Marinas; linux-mmc at vger.kernel.org; Linus Walleij
Subject: [PATCH] Move MMCI header to amba include dirThis moves the mmci platform data definition struct away from
arch/arm/include/asm/mach/mmc.hinto the more proper place among the other primecells ininclude/linux/amba/mmci.hand at the same time renames it to "mmci.h", and also the struct in this file confusingly namedmmc_platform_datahas been renamedmmci_platform_datafor clarity.Signed-off-by Linus Walleij <[email protected]>Cc Catalin Marinas <[email protected]>---
This patch is against the devel branch in Russells git, and was compiled with no errors againstrealview_defconfig,versatile_defconfig,integrator_defconfigandu300_defconfig. Some minor tweaks were needed to compile, since devel is not yet rebased to master (vic.c#include <linux/device.h> patch and the new clocksource code are the culprits).--- arch/arm/include/asm/mach/mmc.h | 18 ------------------ arch/arm/mach-integrator/integrator_cp.c | 4 ++-- arch/arm/mach-realview/core.c | 6 +++--- arch/arm/mach-realview/core.h | 4 ++-- arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-realview/realview_pb1176.c | 2 +- arch/arm/mach-realview/realview_pb11mp.c | 2 +- arch/arm/mach-realview/realview_pba8.c | 2 +- arch/arm/mach-realview/realview_pbx.c | 2 +- arch/arm/mach-u300/mmc.c | 4 ++-- arch/arm/mach-versatile/core.c | 4 ++-- arch/arm/mach-versatile/versatile_pb.c | 4 ++-- drivers/mmc/host/mmci.c | 4 ++-- drivers/mmc/host/mmci.h | 2 +- include/linux/amba/mmci.h | 18 ++++++++++++++++++ 15 files changed, 39 insertions(+), 39 deletions(-) deletemode 100644
arch/arm/include/asm/mach/mmc.hcreate mode 100644include/linux/amba/mmci.h(quoted diff) +0
-0
b/arch/arm/include/asm/mach/mmc.hdeleted file mode 100644 index 27bec55..0000000arch/arm/include/asm/mach/mmc.h deleted +0
-18@@ -1,18 +0,0 @@ -/* -* arch/arm/include/asm/mach/mmc.h -*/ -#ifndef ASMARM_MACH_MMC_H -#define ASMARM_MACH_MMC_H - -#include <linux/mmc/host.h> - -struct mmc_platform_data { -unsigned int ocr_mask;/* available voltages */ -u32 (*translate_vdd)(struct device *,unsigned int ); -unsigned int (*status)(struct device *); -int gpio_wp; -int gpio_cd; -unsigned long capabilities; -}; - -#endif arch/arm/mach-integrator/integrator_cp.c +2
-2@@ -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 ,(quoted diff) +0
-0
b/arch/arm/mach-realview/core.cindex 5a5e1f7..a2083b6 100644arch/arm/mach-realview/core.c +3
-3@@ -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,arch/arm/mach-realview/core.c +0
-0.gpio_wp = 19,(quoted diff) +0
-0
b/arch/arm/mach-realview/core.hindex 59a337b..46cd6ac 100644arch/arm/mach-realview/core.h +0
-0@@ -47,8 +47,8 @@ static struct amba_device name##_device = { \ extern struct platform_device realview_flash_device; externstruct
platform_devicerealview_cf_device; extern structplatform_devicerealview_i2c_device; -extern structmmc_platform_datarealview_mmc0_plat_data; -extern structmmc_platform_datarealview_mmc1_plat_data; +extern structmmci_platform_datarealview_mmc0_plat_data; extern struct
+mmci_platform_datarealview_mmc1_plat_data;
extern structclcd_boardclcd_plat_data; extern void__iomem*gic_cpu_base_addr; extern void__iomem*timer0_va_base; diff --gita/arch/arm/mach-realview/realview_eb.cb/arch/arm/mach-realview/realview_eb.c
index c0795ea..1d65e64 100644arch/arm/mach-realview/realview_eb.c +1
-1@@ -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@@ -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> arch/arm/mach-realview/realview_pb11mp.c +1
-1@@ -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> @@ -38,7 +39,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-pb11mp.h> arch/arm/mach-realview/realview_pba8.c +1
-1@@ -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 <asm/irq.h> @@ -34,7 +35,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include <asm/mach/time.h> #include <mach/hardware.h> arch/arm/mach-realview/realview_pbx.c +1
-1@@ -23,6 +23,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 <asm/irq.h> @@ -34,7 +35,6 @@#include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include <asm/mach/time.h> #include <mach/hardware.h> (quoted diff) +0
-0
b/arch/arm/mach-u300/mmc.cindex 82af247..7b6b016 100644arch/arm/mach-u300/mmc.c +2
-3@@ -19,8 +19,8 @@#include <linux/regulator/consumer.h> #include <linux/regulator/machine.h> #include <linux/gpio.h> +#include <linux/amba/mmci.h> -#include <asm/mach/mmc.h> #include "mmc.h" #include "padmux.h" @@ -28,7 +28,7 @@ struct mmci_card_event {struct input_dev *mmc_input;int mmc_inserted;struct work_struct workq; -struct mmc_platform_data mmc0_plat_data; +struct mmci_platform_data mmc0_plat_data; }; static unsigned int mmc_status(struct device *dev) diff --git a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.cindex 975eae4..e13be7c 100644arch/arm/mach-versatile/core.c +2
-2@@ -27,6 +27,7 @@#include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/amba/pl061.h> +#include <linux/amba/mmci.h> #include <linux/clocksource.h> #include <linux/clockchips.h> #include <linux/cnt32_to_63.h> @@ -47,7 +48,6 @@#include <asm/mach/irq.h> #include <asm/mach/time.h> #include <asm/mach/map.h> -#include <asm/mach/mmc.h> #include "core.h" #include "clock.h" @@ -369,7 +369,7 @@ unsigned int mmc_status(struct device *dev)return readl (VERSATILE_SYSMCI ) & mask; } -static struct mmc_platform_data mmc0_plat_data = { +static struct mmci_platform_data mmc0_plat_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .status = mmc_status, .gpio_wp =-1 ,arch/arm/mach-versatile/versatile_pb.c +2
-2@@ -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> @@ -31,7 +32,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/mmc.h> #include "core.h" @@ -41,7 +41,7 @@#define IRQ_MMCI1A IRQ_SIC_MMCI1A#endif -static struct mmc_platform_data mmc1_plat_data = { +static struct mmci_platform_data mmc1_plat_data = { .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .status = mmc_status, .gpio_wp =-1 ,(quoted diff) +0
-0
b/drivers/mmc/host/mmci.cindex bf7c05b..79205e5 100644drivers/mmc/host/mmci.c +2
-2@@ -22,12 +22,12 @@#include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/gpio.h> +#include <linux/amba/mmci.h> #include <asm/cacheflush.h> #include <asm/div64.h> #include <asm/io.h> #include <asm/sizes.h> -#include <asm/mach/mmc.h> #include "mmci.h" @@ -537,7 +537,7 @@ static void mmci_check_status(unsigned long data)static int __devinit mmci_probe (struct amba_device *dev,struct amba_id *id) { -struct mmc_platform_data *plat = dev->dev.platform_data; +struct mmci_platform_data *plat = dev->dev.platform_data;struct mmci_host *host;struct mmc_host *mmc;int ret;(quoted diff) +0
-0
b/drivers/mmc/host/mmci.hindex 839f264..a7f9a51 100644drivers/mmc/host/mmci.h +1
-1@@ -161,7 +161,7 @@ struct mmci_host {unsigned int mclk;unsigned int cclk;u32 pwr; -struct mmc_platform_data *plat; +struct mmci_platform_data *plat;u8 hw_designer; u8 hw_revision:4;(quoted diff) +0
-0
b/include/linux/amba/mmci.hnew file mode 100644 index 0000000..6b42417include/linux/amba/mmci.h new file +18
-1@@ -0,0 +1,18 @@ +/* +* include/linux/amba/mmci.h +*/ +#ifndef AMBA_MMCI_H +#define AMBA_MMCI_H + +#include <linux/mmc/host.h> + +struct mmci_platform_data { +unsigned int ocr_mask;/* available voltages */ +u32 (*translate_vdd)(struct device *,unsigned int ); +unsigned int (*status)(struct device *); +int gpio_wp; +int gpio_cd; +unsigned long capabilities; +}; + +#endif --1.6.2.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 Move MMCI header to amba include dir
Quoted 7 lines · Scott Branden
Hi Linus,
You changes cause the bcmring platform to fail to compile.
Can you go through all the ARM platforms and make the necessary adjustments with the change in header files for mmc?
Since Linus's change has been merged, and it's a conflict caused by simultaneous development, you _both_ need to work towards sorting it out.
Please put some time into looking at the changes and doing whatever's necessary to sort bcmring out. It's quite a simple change at the end of the day - a move of a header file and a rename of a structure.
PATCH 1/1 Move MMCI header to amba include dir
In reply to Scott Branden2009/9/28 Scott Branden <[email protected]>:
Quoted 1 line
You changes cause the bcmring platform to fail to compile.
The noes! Patch mailed.
Quoted 3 lines
Can you go through all the ARM platforms and make the necessary adjustments with the change in header files for mmc?
I think bcmring was the only one, I missed it because this patch was boiling when bcmring got merged... Look:
linux-next-work/arch/arm$ grep -r 'asm/mmc.h' . | wc -l 0
Whereas:
linux-next-work/arch/arm$ grep -r 'linux/amba/mmci.h' . | wc -l 10
So I think I've fixed them now.
Linus Walleij