Re: [PATCH 06/12] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
On 17 April 2012 13:55, Kyungmin Park wrote:
> On 4/17/12, Thomas Abraham wrote:
>> On 17 April 2012 12:00, Kyungmin Park wrote:
>>> Hi,
>>>
>>> It's already merged with different patch,
>>
>> This is a repost of the patch from Heiko Stuebner which would be
>> required to fix compilation issue for rtc driver. I think you are
>> referring to that patch but it is not merged yet. So I am reposting it
>> with this series.
>
> No it's 3.4.0-rc3. it's already included.
Right, it is merged already. I was still on -rc2 and did not notice this change.
Thanks,
Thomas.
>>
>> Thanks,
>> Thomas.
>>
>>>
>>> #ifdef CONFIG_OF
>>> static const struct of_device_id s3c_rtc_dt_match[] = {
>>> {
>>> .compatible = "samsung,s3c2410-rtc",
>>> .data = &s3c_rtc_drv_data_array[TYPE_S3C2410],
>>> }, {
>>> .compatible = "samsung,s3c2416-rtc",
>>> .data = &s3c_rtc_drv_data_array[TYPE_S3C2416],
>>> }, {
>>> .compatible = "samsung,s3c2443-rtc",
>>> .data = &s3c_rtc_drv_data_array[TYPE_S3C2443],
>>> }, {
>>> .compatible = "samsung,s3c6410-rtc",
>>> .data = &s3c_rtc_drv_data_array[TYPE_S3C64XX],
>>> },
>>> {},
>>> };
>>> MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
>>> #else
>>> #define s3c_rtc_dt_match NULL
>>> #endif
>>>
>>> Thank you,
>>> Kyungmin Park
>>>
>>> On 4/17/12, Thomas Abraham wrote:
From: Heiko Stuebner
Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree
block)
and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
introduced build-failures with enabled CONFIG_USE_OF option.
This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
the of_device_id.data property.
Reported-by: Sylwester Nawrocki
Signed-off-by: Heiko Stuebner
---
drivers/rtc/rtc-s3c.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 9ccea13..c792b6d 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct
platform_device *pdev)
if (pdev->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
- return match->data;
+ return (int)match->data;
}
#endif
return platform_get_device_id(pdev)->driver_data;
@@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device
*pdev)
#ifdef CONFIG_OF
static const struct of_device_id s3c_rtc_dt_match[] = {
{
- .compatible = "samsung,s3c2410-rtc"
- .data = TYPE_S3C2410,
+ .compatible = "samsung,s3c2410-rtc",
+ .data = (void *)TYPE_S3C2410,
}, {
- .compatible = "samsung,s3c2416-rtc"
- .data = TYPE_S3C2416,
+ .compatible = "samsung,s3c2416-rtc",
+ .data = (void *)TYPE_S3C2416,
}, {
- .compatible = "samsung,s3c2443-rtc"
- .data = TYPE_S3C2443,
+ .compatible = "samsung,s3c2443-rtc",
+ .data = (void *)TYPE_S3C2443,
}, {
- .compatible = "samsung,s3c6410-rtc"
- .data = TYPE_S3C64XX,
+ .compatible = "samsung,s3c6410-rtc",
+ .data = (void *)TYPE_S3C64XX,
},
{},
};
--
1.6.6.rc2
--
To unsubscribe from this list: send the line "unsubscribe
linux-samsung-soc"
in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
>> in
>> the body of a message to majord...@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 06/12] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
On 4/17/12, Thomas Abraham wrote:
> On 17 April 2012 12:00, Kyungmin Park wrote:
>> Hi,
>>
>> It's already merged with different patch,
>
> This is a repost of the patch from Heiko Stuebner which would be
> required to fix compilation issue for rtc driver. I think you are
> referring to that patch but it is not merged yet. So I am reposting it
> with this series.
No it's 3.4.0-rc3. it's already included.
>
> Thanks,
> Thomas.
>
>>
>> #ifdef CONFIG_OF
>> static const struct of_device_id s3c_rtc_dt_match[] = {
>>{
>>.compatible = "samsung,s3c2410-rtc",
>>.data = &s3c_rtc_drv_data_array[TYPE_S3C2410],
>>}, {
>>.compatible = "samsung,s3c2416-rtc",
>>.data = &s3c_rtc_drv_data_array[TYPE_S3C2416],
>>}, {
>>.compatible = "samsung,s3c2443-rtc",
>>.data = &s3c_rtc_drv_data_array[TYPE_S3C2443],
>>}, {
>>.compatible = "samsung,s3c6410-rtc",
>>.data = &s3c_rtc_drv_data_array[TYPE_S3C64XX],
>>},
>>{},
>> };
>> MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
>> #else
>> #define s3c_rtc_dt_match NULL
>> #endif
>>
>> Thank you,
>> Kyungmin Park
>>
>> On 4/17/12, Thomas Abraham wrote:
>>> From: Heiko Stuebner
>>>
>>> Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree
>>> block)
>>> and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
>>> introduced build-failures with enabled CONFIG_USE_OF option.
>>>
>>> This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
>>> the of_device_id.data property.
>>>
>>> Reported-by: Sylwester Nawrocki
>>> Signed-off-by: Heiko Stuebner
>>> ---
>>> drivers/rtc/rtc-s3c.c | 18 +-
>>> 1 files changed, 9 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
>>> index 9ccea13..c792b6d 100644
>>> --- a/drivers/rtc/rtc-s3c.c
>>> +++ b/drivers/rtc/rtc-s3c.c
>>> @@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct
>>> platform_device *pdev)
>>> if (pdev->dev.of_node) {
>>> const struct of_device_id *match;
>>> match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
>>> - return match->data;
>>> + return (int)match->data;
>>> }
>>> #endif
>>> return platform_get_device_id(pdev)->driver_data;
>>> @@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device
>>> *pdev)
>>> #ifdef CONFIG_OF
>>> static const struct of_device_id s3c_rtc_dt_match[] = {
>>> {
>>> - .compatible = "samsung,s3c2410-rtc"
>>> - .data = TYPE_S3C2410,
>>> + .compatible = "samsung,s3c2410-rtc",
>>> + .data = (void *)TYPE_S3C2410,
>>> }, {
>>> - .compatible = "samsung,s3c2416-rtc"
>>> - .data = TYPE_S3C2416,
>>> + .compatible = "samsung,s3c2416-rtc",
>>> + .data = (void *)TYPE_S3C2416,
>>> }, {
>>> - .compatible = "samsung,s3c2443-rtc"
>>> - .data = TYPE_S3C2443,
>>> + .compatible = "samsung,s3c2443-rtc",
>>> + .data = (void *)TYPE_S3C2443,
>>> }, {
>>> - .compatible = "samsung,s3c6410-rtc"
>>> - .data = TYPE_S3C64XX,
>>> + .compatible = "samsung,s3c6410-rtc",
>>> + .data = (void *)TYPE_S3C64XX,
>>> },
>>> {},
>>> };
>>> --
>>> 1.6.6.rc2
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe
>>> linux-samsung-soc"
>>> in
>>> the body of a message to majord...@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 06/12] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
On 17 April 2012 12:00, Kyungmin Park wrote:
> Hi,
>
> It's already merged with different patch,
This is a repost of the patch from Heiko Stuebner which would be
required to fix compilation issue for rtc driver. I think you are
referring to that patch but it is not merged yet. So I am reposting it
with this series.
Thanks,
Thomas.
>
> #ifdef CONFIG_OF
> static const struct of_device_id s3c_rtc_dt_match[] = {
> {
> .compatible = "samsung,s3c2410-rtc",
> .data = &s3c_rtc_drv_data_array[TYPE_S3C2410],
> }, {
> .compatible = "samsung,s3c2416-rtc",
> .data = &s3c_rtc_drv_data_array[TYPE_S3C2416],
> }, {
> .compatible = "samsung,s3c2443-rtc",
> .data = &s3c_rtc_drv_data_array[TYPE_S3C2443],
> }, {
> .compatible = "samsung,s3c6410-rtc",
> .data = &s3c_rtc_drv_data_array[TYPE_S3C64XX],
> },
> {},
> };
> MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
> #else
> #define s3c_rtc_dt_match NULL
> #endif
>
> Thank you,
> Kyungmin Park
>
> On 4/17/12, Thomas Abraham wrote:
>> From: Heiko Stuebner
>>
>> Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree block)
>> and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
>> introduced build-failures with enabled CONFIG_USE_OF option.
>>
>> This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
>> the of_device_id.data property.
>>
>> Reported-by: Sylwester Nawrocki
>> Signed-off-by: Heiko Stuebner
>> ---
>> drivers/rtc/rtc-s3c.c | 18 +-
>> 1 files changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
>> index 9ccea13..c792b6d 100644
>> --- a/drivers/rtc/rtc-s3c.c
>> +++ b/drivers/rtc/rtc-s3c.c
>> @@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct
>> platform_device *pdev)
>> if (pdev->dev.of_node) {
>> const struct of_device_id *match;
>> match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
>> - return match->data;
>> + return (int)match->data;
>> }
>> #endif
>> return platform_get_device_id(pdev)->driver_data;
>> @@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device
>> *pdev)
>> #ifdef CONFIG_OF
>> static const struct of_device_id s3c_rtc_dt_match[] = {
>> {
>> - .compatible = "samsung,s3c2410-rtc"
>> - .data = TYPE_S3C2410,
>> + .compatible = "samsung,s3c2410-rtc",
>> + .data = (void *)TYPE_S3C2410,
>> }, {
>> - .compatible = "samsung,s3c2416-rtc"
>> - .data = TYPE_S3C2416,
>> + .compatible = "samsung,s3c2416-rtc",
>> + .data = (void *)TYPE_S3C2416,
>> }, {
>> - .compatible = "samsung,s3c2443-rtc"
>> - .data = TYPE_S3C2443,
>> + .compatible = "samsung,s3c2443-rtc",
>> + .data = (void *)TYPE_S3C2443,
>> }, {
>> - .compatible = "samsung,s3c6410-rtc"
>> - .data = TYPE_S3C64XX,
>> + .compatible = "samsung,s3c6410-rtc",
>> + .data = (void *)TYPE_S3C64XX,
>> },
>> {},
>> };
>> --
>> 1.6.6.rc2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
>> in
>> the body of a message to majord...@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 06/12] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
Hi,
It's already merged with different patch,
#ifdef CONFIG_OF
static const struct of_device_id s3c_rtc_dt_match[] = {
{
.compatible = "samsung,s3c2410-rtc",
.data = &s3c_rtc_drv_data_array[TYPE_S3C2410],
}, {
.compatible = "samsung,s3c2416-rtc",
.data = &s3c_rtc_drv_data_array[TYPE_S3C2416],
}, {
.compatible = "samsung,s3c2443-rtc",
.data = &s3c_rtc_drv_data_array[TYPE_S3C2443],
}, {
.compatible = "samsung,s3c6410-rtc",
.data = &s3c_rtc_drv_data_array[TYPE_S3C64XX],
},
{},
};
MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
#else
#define s3c_rtc_dt_match NULL
#endif
Thank you,
Kyungmin Park
On 4/17/12, Thomas Abraham wrote:
> From: Heiko Stuebner
>
> Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree block)
> and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
> introduced build-failures with enabled CONFIG_USE_OF option.
>
> This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
> the of_device_id.data property.
>
> Reported-by: Sylwester Nawrocki
> Signed-off-by: Heiko Stuebner
> ---
> drivers/rtc/rtc-s3c.c | 18 +-
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> index 9ccea13..c792b6d 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct
> platform_device *pdev)
> if (pdev->dev.of_node) {
> const struct of_device_id *match;
> match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
> - return match->data;
> + return (int)match->data;
> }
> #endif
> return platform_get_device_id(pdev)->driver_data;
> @@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device
> *pdev)
> #ifdef CONFIG_OF
> static const struct of_device_id s3c_rtc_dt_match[] = {
> {
> - .compatible = "samsung,s3c2410-rtc"
> - .data = TYPE_S3C2410,
> + .compatible = "samsung,s3c2410-rtc",
> + .data = (void *)TYPE_S3C2410,
> }, {
> - .compatible = "samsung,s3c2416-rtc"
> - .data = TYPE_S3C2416,
> + .compatible = "samsung,s3c2416-rtc",
> + .data = (void *)TYPE_S3C2416,
> }, {
> - .compatible = "samsung,s3c2443-rtc"
> - .data = TYPE_S3C2443,
> + .compatible = "samsung,s3c2443-rtc",
> + .data = (void *)TYPE_S3C2443,
> }, {
> - .compatible = "samsung,s3c6410-rtc"
> - .data = TYPE_S3C64XX,
> + .compatible = "samsung,s3c6410-rtc",
> + .data = (void *)TYPE_S3C64XX,
> },
> {},
> };
> --
> 1.6.6.rc2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 06/12] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
From: Heiko Stuebner
Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree block)
and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
introduced build-failures with enabled CONFIG_USE_OF option.
This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
the of_device_id.data property.
Reported-by: Sylwester Nawrocki
Signed-off-by: Heiko Stuebner
---
drivers/rtc/rtc-s3c.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 9ccea13..c792b6d 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct
platform_device *pdev)
if (pdev->dev.of_node) {
const struct of_device_id *match;
match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
- return match->data;
+ return (int)match->data;
}
#endif
return platform_get_device_id(pdev)->driver_data;
@@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device *pdev)
#ifdef CONFIG_OF
static const struct of_device_id s3c_rtc_dt_match[] = {
{
- .compatible = "samsung,s3c2410-rtc"
- .data = TYPE_S3C2410,
+ .compatible = "samsung,s3c2410-rtc",
+ .data = (void *)TYPE_S3C2410,
}, {
- .compatible = "samsung,s3c2416-rtc"
- .data = TYPE_S3C2416,
+ .compatible = "samsung,s3c2416-rtc",
+ .data = (void *)TYPE_S3C2416,
}, {
- .compatible = "samsung,s3c2443-rtc"
- .data = TYPE_S3C2443,
+ .compatible = "samsung,s3c2443-rtc",
+ .data = (void *)TYPE_S3C2443,
}, {
- .compatible = "samsung,s3c6410-rtc"
- .data = TYPE_S3C64XX,
+ .compatible = "samsung,s3c6410-rtc",
+ .data = (void *)TYPE_S3C64XX,
},
{},
};
--
1.6.6.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
