* [PATCH] mmc: Standardise capability type
@ 2012-11-14 12:35 ` Lee Jones
0 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-14 12:35 UTC (permalink / raw)
To: linux-arm-kernel, linux-kernel
Cc: arnd, linus.walleij, Lee Jones, Chris Ball, linux-mmc
There are discrepancies with regards to how MMC capabilities
are carried throughout the subsystem. Let's standardise them
to elevate any confusion.
Cc: Chris Ball <cjb@laptop.org>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mmc/core/mmc.c | 2 +-
include/linux/mmc/dw_mmc.h | 4 ++--
include/linux/mmc/host.h | 4 ++--
include/linux/mmc/sdhci.h | 4 ++--
include/linux/platform_data/pxa_sdhci.h | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7cc4638..8c2fa80 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -239,7 +239,7 @@ static void mmc_select_card_type(struct mmc_card *card)
{
struct mmc_host *host = card->host;
u8 card_type = card->ext_csd.raw_card_type & EXT_CSD_CARD_TYPE_MASK;
- unsigned int caps = host->caps, caps2 = host->caps2;
+ u32 caps = host->caps, caps2 = host->caps2;
unsigned int hs_max_dtr = 0;
if (card_type & EXT_CSD_CARD_TYPE_26)
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 7c6a113..f825379 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -229,8 +229,8 @@ struct dw_mci_board {
u32 quirks; /* Workaround / Quirk flags */
unsigned int bus_hz; /* Clock speed at the cclk_in pad */
- unsigned int caps; /* Capabilities */
- unsigned int caps2; /* More capabilities */
+ u32 caps; /* Capabilities */
+ u32 caps2; /* More capabilities */
/*
* Override fifo depth. If 0, autodetect it from the FIFOTH register,
* but note that this may not be reliable after a bootloader has used
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 7abb0e1..37442b2 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -211,7 +211,7 @@ struct mmc_host {
#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */
#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */
- unsigned long caps; /* Host capabilities */
+ u32 caps; /* Host capabilities */
#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */
#define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */
@@ -241,7 +241,7 @@ struct mmc_host {
#define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */
#define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */
- unsigned int caps2; /* More host capabilities */
+ u32 caps2; /* More host capabilities */
#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */
#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index fa8529a..c76b4a3 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -157,8 +157,8 @@ struct sdhci_host {
struct timer_list timer; /* Timer for timeouts */
- unsigned int caps; /* Alternative CAPABILITY_0 */
- unsigned int caps1; /* Alternative CAPABILITY_1 */
+ u32 caps; /* Alternative CAPABILITY_0 */
+ u32 caps1; /* Alternative CAPABILITY_1 */
unsigned int ocr_avail_sdio; /* OCR bit masks */
unsigned int ocr_avail_sd;
diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h
index 59acd98..0d75008 100644
--- a/include/linux/platform_data/pxa_sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -48,8 +48,8 @@ struct sdhci_pxa_platdata {
unsigned int ext_cd_gpio;
bool ext_cd_gpio_invert;
unsigned int max_speed;
- unsigned int host_caps;
- unsigned int host_caps2;
+ u32 host_caps;
+ u32 host_caps2;
unsigned int quirks;
unsigned int pm_caps;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-14 12:35 ` Lee Jones
0 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-14 12:35 UTC (permalink / raw)
To: linux-arm-kernel
There are discrepancies with regards to how MMC capabilities
are carried throughout the subsystem. Let's standardise them
to elevate any confusion.
Cc: Chris Ball <cjb@laptop.org>
Cc: linux-mmc at vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mmc/core/mmc.c | 2 +-
include/linux/mmc/dw_mmc.h | 4 ++--
include/linux/mmc/host.h | 4 ++--
include/linux/mmc/sdhci.h | 4 ++--
include/linux/platform_data/pxa_sdhci.h | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 7cc4638..8c2fa80 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -239,7 +239,7 @@ static void mmc_select_card_type(struct mmc_card *card)
{
struct mmc_host *host = card->host;
u8 card_type = card->ext_csd.raw_card_type & EXT_CSD_CARD_TYPE_MASK;
- unsigned int caps = host->caps, caps2 = host->caps2;
+ u32 caps = host->caps, caps2 = host->caps2;
unsigned int hs_max_dtr = 0;
if (card_type & EXT_CSD_CARD_TYPE_26)
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 7c6a113..f825379 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -229,8 +229,8 @@ struct dw_mci_board {
u32 quirks; /* Workaround / Quirk flags */
unsigned int bus_hz; /* Clock speed at the cclk_in pad */
- unsigned int caps; /* Capabilities */
- unsigned int caps2; /* More capabilities */
+ u32 caps; /* Capabilities */
+ u32 caps2; /* More capabilities */
/*
* Override fifo depth. If 0, autodetect it from the FIFOTH register,
* but note that this may not be reliable after a bootloader has used
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 7abb0e1..37442b2 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -211,7 +211,7 @@ struct mmc_host {
#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */
#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */
- unsigned long caps; /* Host capabilities */
+ u32 caps; /* Host capabilities */
#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */
#define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */
@@ -241,7 +241,7 @@ struct mmc_host {
#define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */
#define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */
- unsigned int caps2; /* More host capabilities */
+ u32 caps2; /* More host capabilities */
#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */
#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index fa8529a..c76b4a3 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -157,8 +157,8 @@ struct sdhci_host {
struct timer_list timer; /* Timer for timeouts */
- unsigned int caps; /* Alternative CAPABILITY_0 */
- unsigned int caps1; /* Alternative CAPABILITY_1 */
+ u32 caps; /* Alternative CAPABILITY_0 */
+ u32 caps1; /* Alternative CAPABILITY_1 */
unsigned int ocr_avail_sdio; /* OCR bit masks */
unsigned int ocr_avail_sd;
diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h
index 59acd98..0d75008 100644
--- a/include/linux/platform_data/pxa_sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -48,8 +48,8 @@ struct sdhci_pxa_platdata {
unsigned int ext_cd_gpio;
bool ext_cd_gpio_invert;
unsigned int max_speed;
- unsigned int host_caps;
- unsigned int host_caps2;
+ u32 host_caps;
+ u32 host_caps2;
unsigned int quirks;
unsigned int pm_caps;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-14 12:35 ` Lee Jones
@ 2012-11-15 11:30 ` Linus Walleij
-1 siblings, 0 replies; 14+ messages in thread
From: Linus Walleij @ 2012-11-15 11:30 UTC (permalink / raw)
To: Lee Jones
Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, Chris Ball,
linux-mmc
On Wed, Nov 14, 2012 at 1:35 PM, Lee Jones <lee.jones@linaro.org> wrote:
> There are discrepancies with regards to how MMC capabilities
> are carried throughout the subsystem. Let's standardise them
> to elevate any confusion.
>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Looks good to me, and these are obviously
u32 bitfields by design, so:
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-15 11:30 ` Linus Walleij
0 siblings, 0 replies; 14+ messages in thread
From: Linus Walleij @ 2012-11-15 11:30 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 14, 2012 at 1:35 PM, Lee Jones <lee.jones@linaro.org> wrote:
> There are discrepancies with regards to how MMC capabilities
> are carried throughout the subsystem. Let's standardise them
> to elevate any confusion.
>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc at vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Looks good to me, and these are obviously
u32 bitfields by design, so:
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-15 11:30 ` Linus Walleij
@ 2012-11-15 11:47 ` Arnd Bergmann
-1 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-11-15 11:47 UTC (permalink / raw)
To: Linus Walleij
Cc: Lee Jones, linux-arm-kernel, linux-kernel, linus.walleij,
Chris Ball, linux-mmc
On Thursday 15 November 2012, Linus Walleij wrote:
>
> On Wed, Nov 14, 2012 at 1:35 PM, Lee Jones <lee.jones@linaro.org> wrote:
>
> > There are discrepancies with regards to how MMC capabilities
> > are carried throughout the subsystem. Let's standardise them
> > to elevate any confusion.
> >
> > Cc: Chris Ball <cjb@laptop.org>
> > Cc: linux-mmc@vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> Looks good to me, and these are obviously
> u32 bitfields by design, so:
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-15 11:47 ` Arnd Bergmann
0 siblings, 0 replies; 14+ messages in thread
From: Arnd Bergmann @ 2012-11-15 11:47 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 15 November 2012, Linus Walleij wrote:
>
> On Wed, Nov 14, 2012 at 1:35 PM, Lee Jones <lee.jones@linaro.org> wrote:
>
> > There are discrepancies with regards to how MMC capabilities
> > are carried throughout the subsystem. Let's standardise them
> > to elevate any confusion.
> >
> > Cc: Chris Ball <cjb@laptop.org>
> > Cc: linux-mmc at vger.kernel.org
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> Looks good to me, and these are obviously
> u32 bitfields by design, so:
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-14 12:35 ` Lee Jones
@ 2012-11-17 21:54 ` Chris Ball
-1 siblings, 0 replies; 14+ messages in thread
From: Chris Ball @ 2012-11-17 21:54 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, linux-mmc
Hi Lee,
Pushed to mmc-next for 3.8 with a minor change:
On Wed, Nov 14 2012, Lee Jones wrote:
> There are discrepancies with regards to how MMC capabilities
> are carried throughout the subsystem. Let's standardise them
> to elevate any confusion.
I think you meant "eliminate" here. :) Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-17 21:54 ` Chris Ball
0 siblings, 0 replies; 14+ messages in thread
From: Chris Ball @ 2012-11-17 21:54 UTC (permalink / raw)
To: linux-arm-kernel
Hi Lee,
Pushed to mmc-next for 3.8 with a minor change:
On Wed, Nov 14 2012, Lee Jones wrote:
> There are discrepancies with regards to how MMC capabilities
> are carried throughout the subsystem. Let's standardise them
> to elevate any confusion.
I think you meant "eliminate" here. :) Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-17 21:54 ` Chris Ball
@ 2012-11-19 9:27 ` Lee Jones
-1 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-19 9:27 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, linux-mmc
On Sat, 17 Nov 2012, Chris Ball wrote:
> Hi Lee,
>
> Pushed to mmc-next for 3.8 with a minor change:
>
> On Wed, Nov 14 2012, Lee Jones wrote:
> > There are discrepancies with regards to how MMC capabilities
> > are carried throughout the subsystem. Let's standardise them
> > to elevate any confusion.
>
> I think you meant "eliminate" here. :) Thanks,
No, I meant alleviate. :)
Do you want me to re-submit, or have you fixed up?
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-19 9:27 ` Lee Jones
0 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-19 9:27 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, 17 Nov 2012, Chris Ball wrote:
> Hi Lee,
>
> Pushed to mmc-next for 3.8 with a minor change:
>
> On Wed, Nov 14 2012, Lee Jones wrote:
> > There are discrepancies with regards to how MMC capabilities
> > are carried throughout the subsystem. Let's standardise them
> > to elevate any confusion.
>
> I think you meant "eliminate" here. :) Thanks,
No, I meant alleviate. :)
Do you want me to re-submit, or have you fixed up?
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-19 9:27 ` Lee Jones
@ 2012-11-19 11:58 ` Chris Ball
-1 siblings, 0 replies; 14+ messages in thread
From: Chris Ball @ 2012-11-19 11:58 UTC (permalink / raw)
To: Lee Jones; +Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, linux-mmc
Hi,
On Mon, Nov 19 2012, Lee Jones wrote:
>> > There are discrepancies with regards to how MMC capabilities
>> > are carried throughout the subsystem. Let's standardise them
>> > to elevate any confusion.
>>
>> I think you meant "eliminate" here. :) Thanks,
>
> No, I meant alleviate. :)
>
> Do you want me to re-submit, or have you fixed up?
I already pushed with a change to "eliminate" -- I'll leave it like
that if that's okay.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-19 11:58 ` Chris Ball
0 siblings, 0 replies; 14+ messages in thread
From: Chris Ball @ 2012-11-19 11:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Nov 19 2012, Lee Jones wrote:
>> > There are discrepancies with regards to how MMC capabilities
>> > are carried throughout the subsystem. Let's standardise them
>> > to elevate any confusion.
>>
>> I think you meant "eliminate" here. :) Thanks,
>
> No, I meant alleviate. :)
>
> Do you want me to re-submit, or have you fixed up?
I already pushed with a change to "eliminate" -- I'll leave it like
that if that's okay.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] mmc: Standardise capability type
2012-11-19 11:58 ` Chris Ball
@ 2012-11-19 12:19 ` Lee Jones
-1 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-19 12:19 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-arm-kernel, linux-kernel, arnd, linus.walleij, linux-mmc
On Mon, 19 Nov 2012, Chris Ball wrote:
> Hi,
>
> On Mon, Nov 19 2012, Lee Jones wrote:
> >> > There are discrepancies with regards to how MMC capabilities
> >> > are carried throughout the subsystem. Let's standardise them
> >> > to elevate any confusion.
> >>
> >> I think you meant "eliminate" here. :) Thanks,
> >
> > No, I meant alleviate. :)
> >
> > Do you want me to re-submit, or have you fixed up?
>
> I already pushed with a change to "eliminate" -- I'll leave it like
> that if that's okay.
No problem.
Thanks Chris.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] mmc: Standardise capability type
@ 2012-11-19 12:19 ` Lee Jones
0 siblings, 0 replies; 14+ messages in thread
From: Lee Jones @ 2012-11-19 12:19 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 19 Nov 2012, Chris Ball wrote:
> Hi,
>
> On Mon, Nov 19 2012, Lee Jones wrote:
> >> > There are discrepancies with regards to how MMC capabilities
> >> > are carried throughout the subsystem. Let's standardise them
> >> > to elevate any confusion.
> >>
> >> I think you meant "eliminate" here. :) Thanks,
> >
> > No, I meant alleviate. :)
> >
> > Do you want me to re-submit, or have you fixed up?
>
> I already pushed with a change to "eliminate" -- I'll leave it like
> that if that's okay.
No problem.
Thanks Chris.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-11-19 12:19 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-14 12:35 [PATCH] mmc: Standardise capability type Lee Jones
2012-11-14 12:35 ` Lee Jones
2012-11-15 11:30 ` Linus Walleij
2012-11-15 11:30 ` Linus Walleij
2012-11-15 11:47 ` Arnd Bergmann
2012-11-15 11:47 ` Arnd Bergmann
2012-11-17 21:54 ` Chris Ball
2012-11-17 21:54 ` Chris Ball
2012-11-19 9:27 ` Lee Jones
2012-11-19 9:27 ` Lee Jones
2012-11-19 11:58 ` Chris Ball
2012-11-19 11:58 ` Chris Ball
2012-11-19 12:19 ` Lee Jones
2012-11-19 12:19 ` Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.