* [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data
@ 2011-06-20 14:11 Zhangfei Gao
2011-06-20 16:29 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Zhangfei Gao @ 2011-06-20 14:11 UTC (permalink / raw)
To: linux-mmc@vger.kernel.org, Chris Ball, Stephen Rothwell
Cc: Zhangfei Gao, Arnd Bergmann
As suggested by Arnd, move platform data to include/linux/platform_data,
Add 'depends on CLKDEV_LOOKUP' since clk API is used,
As a result driver could be built on all platforms which support CLKDEV_LOOKUP
This can improve the build test coverage
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
CC: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
drivers/mmc/host/Kconfig | 2 ++
drivers/mmc/host/sdhci-pxav2.c | 2 +-
drivers/mmc/host/sdhci-pxav3.c | 2 +-
.../linux/platform_data/pxa_sdhci.h | 10 +++++-----
5 files changed, 10 insertions(+), 8 deletions(-)
rename arch/arm/plat-pxa/include/plat/sdhci.h => include/linux/platform_data/pxa_sdhci.h (92%)
diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h
index 2cbf6df..de7b888 100644
--- a/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -1,7 +1,7 @@
#ifndef __ASM_MACH_MMP2_H
#define __ASM_MACH_MMP2_H
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
struct sys_timer;
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 198ddda..204ad7c 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -183,6 +183,7 @@ config MMC_SDHCI_S3C
config MMC_SDHCI_PXAV3
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
+ depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
default CPU_MMP2
@@ -195,6 +196,7 @@ config MMC_SDHCI_PXAV3
config MMC_SDHCI_PXAV2
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
+ depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
default CPU_PXA910
diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 7a6fa8c..38f5899 100644
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -25,7 +25,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include "sdhci.h"
#include "sdhci-pltfm.h"
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 901f00f..4198dbb 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -24,7 +24,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include "sdhci.h"
diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/include/linux/platform_data/pxa_sdhci.h
similarity index 92%
rename from arch/arm/plat-pxa/include/plat/sdhci.h
rename to include/linux/platform_data/pxa_sdhci.h
index 800ebc1..51ad099 100644
--- a/arch/arm/plat-pxa/include/plat/sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -1,4 +1,5 @@
-/* linux/arch/arm/plat-pxa/include/plat/sdhci.h
+/*
+ * include/linux/platform_data/pxa_sdhci.h
*
* Copyright 2010 Marvell
* Zhangfei Gao <zhangfei.gao@marvell.com>
@@ -10,8 +11,8 @@
* published by the Free Software Foundation.
*/
-#ifndef __PLAT_PXA_SDHCI_H
-#define __PLAT_PXA_SDHCI_H
+#ifndef _PXA_SDHCI_H_
+#define _PXA_SDHCI_H_
/* pxa specific flag */
/* Require clock free running */
@@ -56,5 +57,4 @@ struct sdhci_pxa {
u8 clk_enable;
u8 power_mode;
};
-
-#endif /* __PLAT_PXA_SDHCI_H */
+#endif /* _PXA_SDHCI_H_ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data
2011-06-20 14:11 [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data Zhangfei Gao
@ 2011-06-20 16:29 ` Arnd Bergmann
2011-06-20 17:48 ` Philip Rakity
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2011-06-20 16:29 UTC (permalink / raw)
To: Zhangfei Gao; +Cc: linux-mmc@vger.kernel.org, Chris Ball, Stephen Rothwell
On Monday 20 June 2011, Zhangfei Gao wrote:
>
> As suggested by Arnd, move platform data to include/linux/platform_data,
> Add 'depends on CLKDEV_LOOKUP' since clk API is used,
> As a result driver could be built on all platforms which support CLKDEV_LOOKUP
> This can improve the build test coverage
>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
> CC: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
BTW, For some reason, your changelog text above is still indented funny. This should
not happen if you use git-format-patch rather than git-show.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data
2011-06-20 16:29 ` Arnd Bergmann
@ 2011-06-20 17:48 ` Philip Rakity
0 siblings, 0 replies; 4+ messages in thread
From: Philip Rakity @ 2011-06-20 17:48 UTC (permalink / raw)
To: Zhangfei Gao
Cc: linux-mmc@vger.kernel.org, Chris Ball, Stephen Rothwell,
Arnd Bergmann
Zhangfei,
Would you mind posting the patch to the mmc mailing list. It has not shown up in my inbox.
Philip
On Jun 20, 2011, at 9:29 AM, Arnd Bergmann wrote:
> On Monday 20 June 2011, Zhangfei Gao wrote:
>>
>> As suggested by Arnd, move platform data to include/linux/platform_data,
>> Add 'depends on CLKDEV_LOOKUP' since clk API is used,
>> As a result driver could be built on all platforms which support CLKDEV_LOOKUP
>> This can improve the build test coverage
>>
>> Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
>> CC: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
>
> BTW, For some reason, your changelog text above is still indented funny. This should
> not happen if you use git-format-patch rather than git-show.
>
> Arnd
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data
@ 2011-06-21 4:59 Zhangfei Gao
0 siblings, 0 replies; 4+ messages in thread
From: Zhangfei Gao @ 2011-06-21 4:59 UTC (permalink / raw)
To: linux-mmc@vger.kernel.org, Chris Ball, Philip Rakity
Cc: Zhangfei Gao, Arnd Bergmann, Stephen Rothwell
resend:
As suggested by Arnd, move platform data to include/linux/platform_data.
Add 'depends on CLKDEV_LOOKUP' since clk API is used,
As a result driver could be built on all platforms which support CLKDEV_LOOKUP, which can improve the build test coverage.
CC: Arnd Bergmann <arnd@arndb.de>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-mmp/include/mach/mmp2.h | 2 +-
drivers/mmc/host/Kconfig | 2 ++
drivers/mmc/host/sdhci-pxav2.c | 2 +-
drivers/mmc/host/sdhci-pxav3.c | 2 +-
.../linux/platform_data/pxa_sdhci.h | 10 +++++-----
5 files changed, 10 insertions(+), 8 deletions(-)
rename arch/arm/plat-pxa/include/plat/sdhci.h => include/linux/platform_data/pxa_sdhci.h (92%)
diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h
index 2cbf6df..de7b888 100644
--- a/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -1,7 +1,7 @@
#ifndef __ASM_MACH_MMP2_H
#define __ASM_MACH_MMP2_H
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
struct sys_timer;
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 198ddda..204ad7c 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -183,6 +183,7 @@ config MMC_SDHCI_S3C
config MMC_SDHCI_PXAV3
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
+ depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
default CPU_MMP2
@@ -195,6 +196,7 @@ config MMC_SDHCI_PXAV3
config MMC_SDHCI_PXAV2
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
+ depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
default CPU_PXA910
diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 7a6fa8c..38f5899 100644
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -25,7 +25,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include "sdhci.h"
#include "sdhci-pltfm.h"
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 901f00f..4198dbb 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -24,7 +24,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
-#include <plat/sdhci.h>
+#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include "sdhci.h"
diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/include/linux/platform_data/pxa_sdhci.h
similarity index 92%
rename from arch/arm/plat-pxa/include/plat/sdhci.h
rename to include/linux/platform_data/pxa_sdhci.h
index 800ebc1..51ad099 100644
--- a/arch/arm/plat-pxa/include/plat/sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -1,4 +1,5 @@
-/* linux/arch/arm/plat-pxa/include/plat/sdhci.h
+/*
+ * include/linux/platform_data/pxa_sdhci.h
*
* Copyright 2010 Marvell
* Zhangfei Gao <zhangfei.gao@marvell.com>
@@ -10,8 +11,8 @@
* published by the Free Software Foundation.
*/
-#ifndef __PLAT_PXA_SDHCI_H
-#define __PLAT_PXA_SDHCI_H
+#ifndef _PXA_SDHCI_H_
+#define _PXA_SDHCI_H_
/* pxa specific flag */
/* Require clock free running */
@@ -56,5 +57,4 @@ struct sdhci_pxa {
u8 clk_enable;
u8 power_mode;
};
-
-#endif /* __PLAT_PXA_SDHCI_H */
+#endif /* _PXA_SDHCI_H_ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-21 4:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-20 14:11 [PATCH] mmc: sdhci-pxa move platform data to include/linux/platform_data Zhangfei Gao
2011-06-20 16:29 ` Arnd Bergmann
2011-06-20 17:48 ` Philip Rakity
-- strict thread matches above, loose matches on Subject: below --
2011-06-21 4:59 Zhangfei Gao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox