* [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs
@ 2012-03-09 13:44 Marek Szyprowski
2012-03-09 15:56 ` Kukjin Kim
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Marek Szyprowski @ 2012-03-09 13:44 UTC (permalink / raw
To: linux-samsung-soc, linux-mmc
Cc: Marek Szyprowski, Kyungmin Park, Kukjin Kim, Thomas Abraham
exynos4_sdhci_drv_data structure is not available on non-Exynos builds,
that's why EXYNOS4_SDHCI_DRV_DATA macro has been introduced. This patch
fixes commit 67819656 'mmc: sdhci-s3c: Add device tree support' to use
that macro. This fixes broken build for pre-Exynos SoCs.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/mmc/host/sdhci-s3c.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index ea0767e..984601e 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -859,7 +859,7 @@ MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
static const struct of_device_id sdhci_s3c_dt_match[] = {
{ .compatible = "samsung,s3c6410-sdhci", },
{ .compatible = "samsung,exynos4210-sdhci",
- .data = &exynos4_sdhci_drv_data },
+ .data = EXYNOS4_SDHCI_DRV_DATA },
{},
};
MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
--
1.7.1.569.g6f426
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs
2012-03-09 13:44 [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs Marek Szyprowski
@ 2012-03-09 15:56 ` Kukjin Kim
2012-03-09 16:07 ` Marek Szyprowski
2012-03-12 0:12 ` Jaehoon Chung
2012-03-16 3:29 ` Chris Ball
2 siblings, 1 reply; 5+ messages in thread
From: Kukjin Kim @ 2012-03-09 15:56 UTC (permalink / raw
To: Marek Szyprowski
Cc: linux-samsung-soc, linux-mmc, Kyungmin Park, Kukjin Kim,
Thomas Abraham
On 03/09/12 05:44, Marek Szyprowski wrote:
> exynos4_sdhci_drv_data structure is not available on non-Exynos builds,
> that's why EXYNOS4_SDHCI_DRV_DATA macro has been introduced. This patch
> fixes commit 67819656 'mmc: sdhci-s3c: Add device tree support' to use
> that macro. This fixes broken build for pre-Exynos SoCs.
>
I think, it is protected by CONFIG_OF and the pre-EXYNOS SoCs is not
support device tree yet. Could you please let me know the build error
and build condition?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> Signed-off-by: Marek Szyprowski<m.szyprowski@samsung.com>
> ---
> drivers/mmc/host/sdhci-s3c.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index ea0767e..984601e 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -859,7 +859,7 @@ MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
> static const struct of_device_id sdhci_s3c_dt_match[] = {
> { .compatible = "samsung,s3c6410-sdhci", },
> { .compatible = "samsung,exynos4210-sdhci",
> - .data =&exynos4_sdhci_drv_data },
> + .data = EXYNOS4_SDHCI_DRV_DATA },
> {},
> };
> MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs
2012-03-09 15:56 ` Kukjin Kim
@ 2012-03-09 16:07 ` Marek Szyprowski
0 siblings, 0 replies; 5+ messages in thread
From: Marek Szyprowski @ 2012-03-09 16:07 UTC (permalink / raw
To: 'Kukjin Kim'
Cc: linux-samsung-soc, linux-mmc, 'Kyungmin Park',
'Thomas Abraham'
Hello,
On Friday, March 09, 2012 4:56 PM Kukjin Kim wrote:
> On 03/09/12 05:44, Marek Szyprowski wrote:
> > exynos4_sdhci_drv_data structure is not available on non-Exynos builds,
> > that's why EXYNOS4_SDHCI_DRV_DATA macro has been introduced. This patch
> > fixes commit 67819656 'mmc: sdhci-s3c: Add device tree support' to use
> > that macro. This fixes broken build for pre-Exynos SoCs.
> >
> I think, it is protected by CONFIG_OF and the pre-EXYNOS SoCs is not
> support device tree yet. Could you please let me know the build error
> and build condition?
pre-EXYNOS SoC do not support device tree, but I had to enable flat device
tree support to get them working once in the past and I still have it in my
config. Now I see that kernel boots fine without enabling flat device tree,
but imho the reported issue should be fixed to reduce the amount of work in
the future.
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs
2012-03-09 13:44 [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs Marek Szyprowski
2012-03-09 15:56 ` Kukjin Kim
@ 2012-03-12 0:12 ` Jaehoon Chung
2012-03-16 3:29 ` Chris Ball
2 siblings, 0 replies; 5+ messages in thread
From: Jaehoon Chung @ 2012-03-12 0:12 UTC (permalink / raw
To: Marek Szyprowski
Cc: linux-samsung-soc, linux-mmc, Kyungmin Park, Kukjin Kim,
Thomas Abraham
Looks fine to me.
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
On 03/09/2012 10:44 PM, Marek Szyprowski wrote:
> exynos4_sdhci_drv_data structure is not available on non-Exynos builds,
> that's why EXYNOS4_SDHCI_DRV_DATA macro has been introduced. This patch
> fixes commit 67819656 'mmc: sdhci-s3c: Add device tree support' to use
> that macro. This fixes broken build for pre-Exynos SoCs.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/mmc/host/sdhci-s3c.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index ea0767e..984601e 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -859,7 +859,7 @@ MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
> static const struct of_device_id sdhci_s3c_dt_match[] = {
> { .compatible = "samsung,s3c6410-sdhci", },
> { .compatible = "samsung,exynos4210-sdhci",
> - .data = &exynos4_sdhci_drv_data },
> + .data = EXYNOS4_SDHCI_DRV_DATA },
> {},
> };
> MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs
2012-03-09 13:44 [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs Marek Szyprowski
2012-03-09 15:56 ` Kukjin Kim
2012-03-12 0:12 ` Jaehoon Chung
@ 2012-03-16 3:29 ` Chris Ball
2 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2012-03-16 3:29 UTC (permalink / raw
To: Marek Szyprowski
Cc: linux-samsung-soc, linux-mmc, Kyungmin Park, Kukjin Kim,
Thomas Abraham
Hi Marek,
On Fri, Mar 09 2012, Marek Szyprowski wrote:
> exynos4_sdhci_drv_data structure is not available on non-Exynos builds,
> that's why EXYNOS4_SDHCI_DRV_DATA macro has been introduced. This patch
> fixes commit 67819656 'mmc: sdhci-s3c: Add device tree support' to use
> that macro. This fixes broken build for pre-Exynos SoCs.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/mmc/host/sdhci-s3c.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index ea0767e..984601e 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -859,7 +859,7 @@ MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
> static const struct of_device_id sdhci_s3c_dt_match[] = {
> { .compatible = "samsung,s3c6410-sdhci", },
> { .compatible = "samsung,exynos4210-sdhci",
> - .data = &exynos4_sdhci_drv_data },
> + .data = EXYNOS4_SDHCI_DRV_DATA },
> {},
> };
> MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
Thanks, pushed to mmc-next for 3.4 with Jaehoon's ACK.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-03-16 3:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-09 13:44 [PATCH] drivers: mmc: sdhci-s3c: fix broken compilation for non-Exynos SoCs Marek Szyprowski
2012-03-09 15:56 ` Kukjin Kim
2012-03-09 16:07 ` Marek Szyprowski
2012-03-12 0:12 ` Jaehoon Chung
2012-03-16 3:29 ` Chris Ball
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.