Commit 2663e766c56a "ARM Samsung: Move s3c pwm driver to pwm framework"
moved Samsung PWM driver to drivers/pwm and the config option to select
this driver has changed.
This patch fixes following build-error with s3c2410_defconfig.
arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to `pwm_config'
Signed-off-by: Tushar Behera <[email protected]>
---
arch/arm/mach-s3c24xx/Kconfig | 4 ++--
arch/arm/plat-samsung/Kconfig | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index e249611..d56b0f7 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
select I2C
select POWER_SUPPLY
select MACH_NEO1973
- select S3C2410_PWM
+ select S3C24XX_PWM
select S3C_DEV_USB_HOST
help
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
@@ -493,7 +493,7 @@ config MACH_RX1950
select S3C24XX_DCLK
select PM_H1940 if PM
select I2C
- select S3C2410_PWM
+ select S3C24XX_PWM
select S3C_DEV_NAND
select S3C2410_IOTIMING if S3C2440_CPUFREQ
select S3C2440_XTAL_16934400
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 7aca31c..9c3b90c 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI
config S3C24XX_PWM
bool "PWM device support"
- select HAVE_PWM
+ select PWM
+ select PWM_SAMSUNG
help
Support for exporting the PWM timer blocks via the pwm device
system
--
1.7.4.1
Tushar Behera wrote:
>
> Commit 2663e766c56a "ARM Samsung: Move s3c pwm driver to pwm framework"
> moved Samsung PWM driver to drivers/pwm and the config option to select
> this driver has changed.
>
> This patch fixes following build-error with s3c2410_defconfig.
> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
> `pwm_config'
>
Yes, need to fix...
arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_lcd_power':
arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to `pwm_config'
arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
`pwm_disable'
arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to `pwm_config'
arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to `pwm_enable'
arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_exit':
arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to `pwm_free'
arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_init':
arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
`pwm_request'
> Signed-off-by: Tushar Behera <[email protected]>
> ---
> arch/arm/mach-s3c24xx/Kconfig | 4 ++--
> arch/arm/plat-samsung/Kconfig | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index e249611..d56b0f7 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
> select I2C
> select POWER_SUPPLY
> select MACH_NEO1973
> - select S3C2410_PWM
> + select S3C24XX_PWM
> select S3C_DEV_USB_HOST
> help
> Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
> Phone
> @@ -493,7 +493,7 @@ config MACH_RX1950
> select S3C24XX_DCLK
> select PM_H1940 if PM
> select I2C
> - select S3C2410_PWM
> + select S3C24XX_PWM
> select S3C_DEV_NAND
> select S3C2410_IOTIMING if S3C2440_CPUFREQ
> select S3C2440_XTAL_16934400
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 7aca31c..9c3b90c 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI
>
> config S3C24XX_PWM
> bool "PWM device support"
> - select HAVE_PWM
> + select PWM
> + select PWM_SAMSUNG
> help
> Support for exporting the PWM timer blocks via the pwm device
> system
> --
> 1.7.4.1
I think, following would be better? Or ...
---
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 7aca31c..dcdfb77 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
config S3C24XX_PWM
bool "PWM device support"
- select HAVE_PWM
+ select PWM
help
Support for exporting the PWM timer blocks via the pwm device
system
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 8fc3808..34c8ec1 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -59,7 +59,7 @@ config PWM_PXA
config PWM_SAMSUNG
tristate "Samsung pwm support"
- depends on PLAT_SAMSUNG
+ def_bool PLAT_SAMSUNG
help
Generic PWM framework driver for Samsung.
---
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
On 08/07/2012 04:03 PM, Kukjin Kim wrote:
> Tushar Behera wrote:
>>
>> Commit 2663e766c56a "ARM Samsung: Move s3c pwm driver to pwm framework"
>> moved Samsung PWM driver to drivers/pwm and the config option to select
>> this driver has changed.
>>
>> This patch fixes following build-error with s3c2410_defconfig.
>> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
>> `pwm_config'
>>
>
> Yes, need to fix...
>
> arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_lcd_power':
> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to `pwm_config'
> arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
> `pwm_disable'
> arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to `pwm_config'
> arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to `pwm_enable'
> arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_exit':
> arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to `pwm_free'
> arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_init':
> arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
> `pwm_request'
>
Yes, the patch fixes all of these errors, didn't include them in the
patch comments though as they were all similar.
>> Signed-off-by: Tushar Behera <[email protected]>
>> ---
>> arch/arm/mach-s3c24xx/Kconfig | 4 ++--
>> arch/arm/plat-samsung/Kconfig | 3 ++-
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
>> index e249611..d56b0f7 100644
>> --- a/arch/arm/mach-s3c24xx/Kconfig
>> +++ b/arch/arm/mach-s3c24xx/Kconfig
>> @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
>> select I2C
>> select POWER_SUPPLY
>> select MACH_NEO1973
>> - select S3C2410_PWM
>> + select S3C24XX_PWM
The above needs to be picked up as S3C2410_PWM is no longer defined.
>> select S3C_DEV_USB_HOST
>> help
>> Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
>> Phone
>> @@ -493,7 +493,7 @@ config MACH_RX1950
>> select S3C24XX_DCLK
>> select PM_H1940 if PM
>> select I2C
>> - select S3C2410_PWM
>> + select S3C24XX_PWM
Same as above.
>> select S3C_DEV_NAND
>> select S3C2410_IOTIMING if S3C2440_CPUFREQ
>> select S3C2440_XTAL_16934400
>> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
>> index 7aca31c..9c3b90c 100644
>> --- a/arch/arm/plat-samsung/Kconfig
>> +++ b/arch/arm/plat-samsung/Kconfig
>> @@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI
>>
>> config S3C24XX_PWM
>> bool "PWM device support"
>> - select HAVE_PWM
>> + select PWM
>> + select PWM_SAMSUNG
>> help
>> Support for exporting the PWM timer blocks via the pwm device
>> system
>> --
>> 1.7.4.1
>
> I think, following would be better? Or ...
>
No issues. You can pick whichever you find better.
> ---
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 7aca31c..dcdfb77 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
>
> config S3C24XX_PWM
> bool "PWM device support"
> - select HAVE_PWM
> + select PWM
> help
> Support for exporting the PWM timer blocks via the pwm device
> system
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index 8fc3808..34c8ec1 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -59,7 +59,7 @@ config PWM_PXA
>
> config PWM_SAMSUNG
> tristate "Samsung pwm support"
> - depends on PLAT_SAMSUNG
> + def_bool PLAT_SAMSUNG
> help
> Generic PWM framework driver for Samsung.
> ---
>
>
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <[email protected]>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
--
Tushar Behera
Tushar Behera wrote:
>
> On 08/07/2012 04:03 PM, Kukjin Kim wrote:
> > Tushar Behera wrote:
> >>
> >> Commit 2663e766c56a "ARM Samsung: Move s3c pwm driver to pwm framework"
> >> moved Samsung PWM driver to drivers/pwm and the config option to select
> >> this driver has changed.
> >>
> >> This patch fixes following build-error with s3c2410_defconfig.
> >> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
> >> `pwm_config'
> >>
> >
> > Yes, need to fix...
> >
> > arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_lcd_power':
> > arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
> `pwm_config'
> > arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
> > `pwm_disable'
> > arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to
> `pwm_config'
> > arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to
> `pwm_enable'
> > arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_exit':
> > arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to
> `pwm_free'
> > arch/arm/mach-s3c24xx/built-in.o: In function `rx1950_backlight_init':
> > arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
> > `pwm_request'
> >
>
> Yes, the patch fixes all of these errors, didn't include them in the
> patch comments though as they were all similar.
>
I will add above description when I apply this :)
>
> >> Signed-off-by: Tushar Behera <[email protected]>
> >> ---
> >> arch/arm/mach-s3c24xx/Kconfig | 4 ++--
> >> arch/arm/plat-samsung/Kconfig | 3 ++-
> >> 2 files changed, 4 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-
> s3c24xx/Kconfig
> >> index e249611..d56b0f7 100644
> >> --- a/arch/arm/mach-s3c24xx/Kconfig
> >> +++ b/arch/arm/mach-s3c24xx/Kconfig
> >> @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
> >> select I2C
> >> select POWER_SUPPLY
> >> select MACH_NEO1973
> >> - select S3C2410_PWM
> >> + select S3C24XX_PWM
>
> The above needs to be picked up as S3C2410_PWM is no longer defined.
>
Correct, I know. In addition, I'd preferred to use SAMSUNG_PWM so I will
change the name later.
> >> select S3C_DEV_USB_HOST
> >> help
> >> Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
> >> Phone
> >> @@ -493,7 +493,7 @@ config MACH_RX1950
> >> select S3C24XX_DCLK
> >> select PM_H1940 if PM
> >> select I2C
> >> - select S3C2410_PWM
> >> + select S3C24XX_PWM
>
> Same as above.
>
> >> select S3C_DEV_NAND
> >> select S3C2410_IOTIMING if S3C2440_CPUFREQ
> >> select S3C2440_XTAL_16934400
> >> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-
> samsung/Kconfig
> >> index 7aca31c..9c3b90c 100644
> >> --- a/arch/arm/plat-samsung/Kconfig
> >> +++ b/arch/arm/plat-samsung/Kconfig
> >> @@ -403,7 +403,8 @@ config S5P_DEV_USB_EHCI
> >>
> >> config S3C24XX_PWM
> >> bool "PWM device support"
> >> - select HAVE_PWM
> >> + select PWM
> >> + select PWM_SAMSUNG
> >> help
> >> Support for exporting the PWM timer blocks via the pwm device
> >> system
> >> --
> >> 1.7.4.1
> >
> > I think, following would be better? Or ...
> >
>
> No issues. You can pick whichever you find better.
>
Thanks, see below.
> > ---
> > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-
> samsung/Kconfig
> > index 7aca31c..dcdfb77 100644
> > --- a/arch/arm/plat-samsung/Kconfig
> > +++ b/arch/arm/plat-samsung/Kconfig
> > @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
> >
> > config S3C24XX_PWM
> > bool "PWM device support"
> > - select HAVE_PWM
> > + select PWM
> > help
> > Support for exporting the PWM timer blocks via the pwm device
> > system
> > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> > index 8fc3808..34c8ec1 100644
> > --- a/drivers/pwm/Kconfig
> > +++ b/drivers/pwm/Kconfig
> > @@ -59,7 +59,7 @@ config PWM_PXA
> >
> > config PWM_SAMSUNG
> > tristate "Samsung pwm support"
> > - depends on PLAT_SAMSUNG
> > + def_bool PLAT_SAMSUNG
> > help
> > Generic PWM framework driver for Samsung.
> > ---
> >
> >
From: Tushar Behera <[email protected]>
Subject: [PATCH] ARM: SAMSUNG: Fix compilation error with s3c2410_defconfig
Commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to pwm framework")
moved Samsung PWM driver to drivers/pwm and the config option to select
this driver has changed.
This patch fixes following build-error with s3c2410_defconfig.
arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_lcd_power':
arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to 'pwm_config'
arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
'pwm_disable'
arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to 'pwm_config'
arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to 'pwm_enable'
arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_exit':
arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to 'pwm_free'
arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_init':
arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
'pwm_request'
Signed-off-by: Tushar Behera <[email protected]>
[[email protected]: re-worked as per review comments]
Cc: Thierry Reding <[email protected]>
Signed-off-by: Kukjin Kim <[email protected]>
---
arch/arm/mach-s3c24xx/Kconfig | 4 ++--
arch/arm/plat-samsung/Kconfig | 2 +-
drivers/pwm/Kconfig | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index e249611..d56b0f7 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
select I2C
select POWER_SUPPLY
select MACH_NEO1973
- select S3C2410_PWM
+ select S3C24XX_PWM
select S3C_DEV_USB_HOST
help
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
Phone
@@ -493,7 +493,7 @@ config MACH_RX1950
select S3C24XX_DCLK
select PM_H1940 if PM
select I2C
- select S3C2410_PWM
+ select S3C24XX_PWM
select S3C_DEV_NAND
select S3C2410_IOTIMING if S3C2440_CPUFREQ
select S3C2440_XTAL_16934400
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 7aca31c..dcdfb77 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
config S3C24XX_PWM
bool "PWM device support"
- select HAVE_PWM
+ select PWM
help
Support for exporting the PWM timer blocks via the pwm device
system
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 8fc3808..34c8ec1 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -59,7 +59,7 @@ config PWM_PXA
config PWM_SAMSUNG
tristate "Samsung pwm support"
- depends on PLAT_SAMSUNG
+ def_bool PLAT_SAMSUNG
help
Generic PWM framework driver for Samsung.
--
1.7.4.1
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Kukjin Kim wrote:
>
[...]
>
> From: Tushar Behera <[email protected]>
> Subject: [PATCH] ARM: SAMSUNG: Fix compilation error with
> s3c2410_defconfig
>
> Commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to pwm framework")
Oops, this should be "215c29d3d0e9"...
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> moved Samsung PWM driver to drivers/pwm and the config option to select
> this driver has changed.
>
> This patch fixes following build-error with s3c2410_defconfig.
>
> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_lcd_power':
> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
> 'pwm_config'
> arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
> 'pwm_disable'
> arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to
> 'pwm_config'
> arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to
> 'pwm_enable'
> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_exit':
> arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to 'pwm_free'
> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_init':
> arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
> 'pwm_request'
>
> Signed-off-by: Tushar Behera <[email protected]>
> [[email protected]: re-worked as per review comments]
> Cc: Thierry Reding <[email protected]>
> Signed-off-by: Kukjin Kim <[email protected]>
> ---
> arch/arm/mach-s3c24xx/Kconfig | 4 ++--
> arch/arm/plat-samsung/Kconfig | 2 +-
> drivers/pwm/Kconfig | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
> index e249611..d56b0f7 100644
> --- a/arch/arm/mach-s3c24xx/Kconfig
> +++ b/arch/arm/mach-s3c24xx/Kconfig
> @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
> select I2C
> select POWER_SUPPLY
> select MACH_NEO1973
> - select S3C2410_PWM
> + select S3C24XX_PWM
> select S3C_DEV_USB_HOST
> help
> Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
> Phone
> @@ -493,7 +493,7 @@ config MACH_RX1950
> select S3C24XX_DCLK
> select PM_H1940 if PM
> select I2C
> - select S3C2410_PWM
> + select S3C24XX_PWM
> select S3C_DEV_NAND
> select S3C2410_IOTIMING if S3C2440_CPUFREQ
> select S3C2440_XTAL_16934400
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 7aca31c..dcdfb77 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
>
> config S3C24XX_PWM
> bool "PWM device support"
> - select HAVE_PWM
> + select PWM
> help
> Support for exporting the PWM timer blocks via the pwm device
> system
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index 8fc3808..34c8ec1 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -59,7 +59,7 @@ config PWM_PXA
>
> config PWM_SAMSUNG
> tristate "Samsung pwm support"
> - depends on PLAT_SAMSUNG
> + def_bool PLAT_SAMSUNG
> help
> Generic PWM framework driver for Samsung.
>
> --
> 1.7.4.1
On 08/08/2012 07:02 AM, Kukjin Kim wrote:
> Kukjin Kim wrote:
>>
>
> [...]
>
>>
>> From: Tushar Behera <[email protected]>
>> Subject: [PATCH] ARM: SAMSUNG: Fix compilation error with
>> s3c2410_defconfig
>>
>> Commit 2663e766c56a ("ARM Samsung: Move s3c pwm driver to pwm framework")
>
> Oops, this should be "215c29d3d0e9"...
>
My mistake, the first version of the patch was made w.r.t. linux-next
tree. Though I build-tested it on v3.6-rc1, I forgot to change the
commit ID.
The patch below looks good to me.
Thanks.
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <[email protected]>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
>> moved Samsung PWM driver to drivers/pwm and the config option to select
>> this driver has changed.
>>
>> This patch fixes following build-error with s3c2410_defconfig.
>>
>> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_lcd_power':
>> arch/arm/mach-s3c24xx/mach-rx1950.c:430: undefined reference to
>> 'pwm_config'
>> arch/arm/mach-s3c24xx/mach-rx1950.c:431: undefined reference to
>> 'pwm_disable'
>> arch/arm/mach-s3c24xx/mach-rx1950.c:437: undefined reference to
>> 'pwm_config'
>> arch/arm/mach-s3c24xx/mach-rx1950.c:438: undefined reference to
>> 'pwm_enable'
>> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_exit':
>> arch/arm/mach-s3c24xx/mach-rx1950.c:504: undefined reference to 'pwm_free'
>> arch/arm/mach-s3c24xx/built-in.o: In function 'rx1950_backlight_init':
>> arch/arm/mach-s3c24xx/mach-rx1950.c:487: undefined reference to
>> 'pwm_request'
>>
>> Signed-off-by: Tushar Behera <[email protected]>
>> [[email protected]: re-worked as per review comments]
>> Cc: Thierry Reding <[email protected]>
>> Signed-off-by: Kukjin Kim <[email protected]>
>> ---
>> arch/arm/mach-s3c24xx/Kconfig | 4 ++--
>> arch/arm/plat-samsung/Kconfig | 2 +-
>> drivers/pwm/Kconfig | 2 +-
>> 3 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
>> index e249611..d56b0f7 100644
>> --- a/arch/arm/mach-s3c24xx/Kconfig
>> +++ b/arch/arm/mach-s3c24xx/Kconfig
>> @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02
>> select I2C
>> select POWER_SUPPLY
>> select MACH_NEO1973
>> - select S3C2410_PWM
>> + select S3C24XX_PWM
>> select S3C_DEV_USB_HOST
>> help
>> Say Y here if you are using the Openmoko GTA02 / Freerunner GSM
>> Phone
>> @@ -493,7 +493,7 @@ config MACH_RX1950
>> select S3C24XX_DCLK
>> select PM_H1940 if PM
>> select I2C
>> - select S3C2410_PWM
>> + select S3C24XX_PWM
>> select S3C_DEV_NAND
>> select S3C2410_IOTIMING if S3C2440_CPUFREQ
>> select S3C2440_XTAL_16934400
>> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
>> index 7aca31c..dcdfb77 100644
>> --- a/arch/arm/plat-samsung/Kconfig
>> +++ b/arch/arm/plat-samsung/Kconfig
>> @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
>>
>> config S3C24XX_PWM
>> bool "PWM device support"
>> - select HAVE_PWM
>> + select PWM
>> help
>> Support for exporting the PWM timer blocks via the pwm device
>> system
>> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
>> index 8fc3808..34c8ec1 100644
>> --- a/drivers/pwm/Kconfig
>> +++ b/drivers/pwm/Kconfig
>> @@ -59,7 +59,7 @@ config PWM_PXA
>>
>> config PWM_SAMSUNG
>> tristate "Samsung pwm support"
>> - depends on PLAT_SAMSUNG
>> + def_bool PLAT_SAMSUNG
>> help
>> Generic PWM framework driver for Samsung.
>>
>> --
>> 1.7.4.1
>
--
Tushar Behera
On Wed, Aug 08, 2012 at 09:54:13AM +0900, Kukjin Kim wrote:
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 7aca31c..dcdfb77 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
>
> config S3C24XX_PWM
> bool "PWM device support"
> - select HAVE_PWM
> + select PWM
> help
> Support for exporting the PWM timer blocks via the pwm device
> system
You could add
select PWM_SAMSUNG
here to side-step the issue below.
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index 8fc3808..34c8ec1 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -59,7 +59,7 @@ config PWM_PXA
>
> config PWM_SAMSUNG
> tristate "Samsung pwm support"
> - depends on PLAT_SAMSUNG
> + def_bool PLAT_SAMSUNG
tristate and def_bool conflict, don't they? I think the easiest way to
solve this problem would be to add a default line, like so:
default PLAT_SAMSUNG
I've checked this with a s3c2410_defconfig and this causes PWM_SAMSUNG
to be selected =y, which I guess is what you want.
Thierry
Thierry Reding wrote:
>
> On Wed, Aug 08, 2012 at 09:54:13AM +0900, Kukjin Kim wrote:
> > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-
> samsung/Kconfig
> > index 7aca31c..dcdfb77 100644
> > --- a/arch/arm/plat-samsung/Kconfig
> > +++ b/arch/arm/plat-samsung/Kconfig
> > @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
> >
> > config S3C24XX_PWM
> > bool "PWM device support"
> > - select HAVE_PWM
> > + select PWM
> > help
> > Support for exporting the PWM timer blocks via the pwm device
> > system
>
> You could add
>
> select PWM_SAMSUNG
>
Well, the 'PWM_SAMSUNG' depends on 'PWM', so I think, it'd better to select
PWM_SAMSUNG for building pwm-samsung.c automatically when PWM is selected.
> here to side-step the issue below.
>
> > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> > index 8fc3808..34c8ec1 100644
> > --- a/drivers/pwm/Kconfig
> > +++ b/drivers/pwm/Kconfig
> > @@ -59,7 +59,7 @@ config PWM_PXA
> >
> > config PWM_SAMSUNG
> > tristate "Samsung pwm support"
> > - depends on PLAT_SAMSUNG
> > + def_bool PLAT_SAMSUNG
>
> tristate and def_bool conflict, don't they? I think the easiest way to
Yeah, your pointing out is correct, but in this case, it should be 'bool'
not 'tristate' because the PWM driver cannot support module now.
> solve this problem would be to add a default line, like so:
>
> default PLAT_SAMSUNG
>
> I've checked this with a s3c2410_defconfig and this causes PWM_SAMSUNG
> to be selected =y, which I guess is what you want.
>
How do you think following, just adding from original one?
- tristate "Samsung pwm support"
+ bool "SAMSUNG PWM support"
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
On Wed, Aug 08, 2012 at 03:30:32PM +0900, Kukjin Kim wrote:
> Thierry Reding wrote:
> >
> > On Wed, Aug 08, 2012 at 09:54:13AM +0900, Kukjin Kim wrote:
> > > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-
> > samsung/Kconfig
> > > index 7aca31c..dcdfb77 100644
> > > --- a/arch/arm/plat-samsung/Kconfig
> > > +++ b/arch/arm/plat-samsung/Kconfig
> > > @@ -403,7 +403,7 @@ config S5P_DEV_USB_EHCI
> > >
> > > config S3C24XX_PWM
> > > bool "PWM device support"
> > > - select HAVE_PWM
> > > + select PWM
> > > help
> > > Support for exporting the PWM timer blocks via the pwm device
> > > system
> >
> > You could add
> >
> > select PWM_SAMSUNG
> >
> Well, the 'PWM_SAMSUNG' depends on 'PWM', so I think, it'd better to select
> PWM_SAMSUNG for building pwm-samsung.c automatically when PWM is selected.
>
> > here to side-step the issue below.
> >
> > > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> > > index 8fc3808..34c8ec1 100644
> > > --- a/drivers/pwm/Kconfig
> > > +++ b/drivers/pwm/Kconfig
> > > @@ -59,7 +59,7 @@ config PWM_PXA
> > >
> > > config PWM_SAMSUNG
> > > tristate "Samsung pwm support"
> > > - depends on PLAT_SAMSUNG
> > > + def_bool PLAT_SAMSUNG
> >
> > tristate and def_bool conflict, don't they? I think the easiest way to
>
> Yeah, your pointing out is correct, but in this case, it should be 'bool'
> not 'tristate' because the PWM driver cannot support module now.
Is there any reason why that is so? Looking at the driver it seems like
it should be easy to turn it into a module. I know that Jingoo (Cc'ed)
has been working on the driver and I've asked him the same question
already.
Anyway I don't want to force the issue, I just think you should consider
it.
> > solve this problem would be to add a default line, like so:
> >
> > default PLAT_SAMSUNG
> >
> > I've checked this with a s3c2410_defconfig and this causes PWM_SAMSUNG
> > to be selected =y, which I guess is what you want.
> >
> How do you think following, just adding from original one?
>
> - tristate "Samsung pwm support"
> + bool "SAMSUNG PWM support"
>
> Thanks.
If you convert this to bool anyway, then maybe you can still use
def_bool:
config PWM_SAMSUNG
prompt "SAMSUNG PWM support" if PLAT_SAMSUNG
def_bool PLAT_SAMSUNG
Any particular reason why you want "SAMSUNG" capitalized?
Thierry
Thierry Reding wrote:
>
> On Wed, Aug 08, 2012 at 03:30:32PM +0900, Kukjin Kim wrote:
[...]
> > Yeah, your pointing out is correct, but in this case, it should be
> 'bool'
> > not 'tristate' because the PWM driver cannot support module now.
>
> Is there any reason why that is so?
I mean, current pwm-samsung.c does not support module, as you know, the
pwm_init() of pwm-samsung is called by arch_initcall().
> Looking at the driver it seems like
> it should be easy to turn it into a module.
Yeah, I know :)
> I know that Jingoo (Cc'ed)
> has been working on the driver and I've asked him the same question
> already.
>
I didn't know, would be helpful to me if you could add me in Cc for
discussion of pwm-samsung. And he is my team member, so I will talk to him
about the plan.
> Anyway I don't want to force the issue, I just think you should consider
> it.
>
Thanks.
> > > solve this problem would be to add a default line, like so:
> > >
> > > default PLAT_SAMSUNG
> > >
> > > I've checked this with a s3c2410_defconfig and this causes PWM_SAMSUNG
> > > to be selected =y, which I guess is what you want.
> > >
> > How do you think following, just adding from original one?
> >
> > - tristate "Samsung pwm support"
> > + bool "SAMSUNG PWM support"
> >
> > Thanks.
>
> If you convert this to bool anyway, then maybe you can still use
> def_bool:
>
> config PWM_SAMSUNG
> prompt "SAMSUNG PWM support" if PLAT_SAMSUNG
> def_bool PLAT_SAMSUNG
>
> Any particular reason why you want "SAMSUNG" capitalized?
>
No, there is no reason, just because...
So, how about following? If PWM is selected on Samsung SoCs, the PWM_SAMSUNG
will be selected automatically. Of course, it can be de-selected in kernel
menuconfig. Note that, I think, using 'bool <expr>' and 'depends on <expr>'
is more clear than 'prompt <prompt> ["if" <expr>]'. However if any your
preference here, please kindly let me know.
---
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 8fc3808..c74d055 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -58,14 +58,12 @@ config PWM_PXA
will be called pwm-pxa.
config PWM_SAMSUNG
- tristate "Samsung pwm support"
+ bool "Samsung PWM support"
depends on PLAT_SAMSUNG
+ default y
help
Generic PWM framework driver for Samsung.
- To compile this driver as a module, choose M here: the module
- will be called pwm-samsung.
-
config PWM_TEGRA
tristate "NVIDIA Tegra PWM support"
depends on ARCH_TEGRA
---
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
On Wed, Aug 08, 2012 at 07:25:17PM +0900, Kukjin Kim wrote:
> Thierry Reding wrote:
> >
> > On Wed, Aug 08, 2012 at 03:30:32PM +0900, Kukjin Kim wrote:
>
> [...]
>
> > > Yeah, your pointing out is correct, but in this case, it should be
> > 'bool'
> > > not 'tristate' because the PWM driver cannot support module now.
> >
> > Is there any reason why that is so?
>
> I mean, current pwm-samsung.c does not support module, as you know, the
> pwm_init() of pwm-samsung is called by arch_initcall().
>
> > Looking at the driver it seems like
> > it should be easy to turn it into a module.
>
> Yeah, I know :)
>
> > I know that Jingoo (Cc'ed)
> > has been working on the driver and I've asked him the same question
> > already.
> >
> I didn't know, would be helpful to me if you could add me in Cc for
> discussion of pwm-samsung. And he is my team member, so I will talk to him
> about the plan.
He (she?) sent two patches:
https://lkml.org/lkml/2012/8/2/108
https://lkml.org/lkml/2012/8/2/109
And followed-up with the following three:
https://lkml.org/lkml/2012/8/3/47
https://lkml.org/lkml/2012/8/3/44
https://lkml.org/lkml/2012/8/3/45
> > Anyway I don't want to force the issue, I just think you should consider
> > it.
> >
> Thanks.
I guess it should be fine to go with builtin for now and keep in mind
that it might make sense to make it a proper module eventually.
> > > > solve this problem would be to add a default line, like so:
> > > >
> > > > default PLAT_SAMSUNG
> > > >
> > > > I've checked this with a s3c2410_defconfig and this causes PWM_SAMSUNG
> > > > to be selected =y, which I guess is what you want.
> > > >
> > > How do you think following, just adding from original one?
> > >
> > > - tristate "Samsung pwm support"
> > > + bool "SAMSUNG PWM support"
> > >
> > > Thanks.
> >
> > If you convert this to bool anyway, then maybe you can still use
> > def_bool:
> >
> > config PWM_SAMSUNG
> > prompt "SAMSUNG PWM support" if PLAT_SAMSUNG
> > def_bool PLAT_SAMSUNG
> >
> > Any particular reason why you want "SAMSUNG" capitalized?
> >
> No, there is no reason, just because...
>
> So, how about following? If PWM is selected on Samsung SoCs, the PWM_SAMSUNG
> will be selected automatically. Of course, it can be de-selected in kernel
> menuconfig. Note that, I think, using 'bool <expr>' and 'depends on <expr>'
> is more clear than 'prompt <prompt> ["if" <expr>]'. However if any your
> preference here, please kindly let me know.
I do like that much better as well. I just kept the def_bool because it
was proposed earlier in the patch.
> ---
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index 8fc3808..c74d055 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -58,14 +58,12 @@ config PWM_PXA
> will be called pwm-pxa.
>
> config PWM_SAMSUNG
> - tristate "Samsung pwm support"
> + bool "Samsung PWM support"
> depends on PLAT_SAMSUNG
> + default y
> help
> Generic PWM framework driver for Samsung.
>
> - To compile this driver as a module, choose M here: the module
> - will be called pwm-samsung.
> -
> config PWM_TEGRA
> tristate "NVIDIA Tegra PWM support"
> depends on ARCH_TEGRA
> ---
Yes, that looks good to me. Do you want me to take that through the PWM
tree or would you rather take it through yours?
Thierry
Thierry Reding wrote:
>
> On Wed, Aug 08, 2012 at 07:25:17PM +0900, Kukjin Kim wrote:
> > Thierry Reding wrote:
> > >
> > > On Wed, Aug 08, 2012 at 03:30:32PM +0900, Kukjin Kim wrote:
> >
[...]
> He (she?) sent two patches:
>
He :-)
> https://lkml.org/lkml/2012/8/2/108
> https://lkml.org/lkml/2012/8/2/109
>
> And followed-up with the following three:
>
> https://lkml.org/lkml/2012/8/3/47
> https://lkml.org/lkml/2012/8/3/44
> https://lkml.org/lkml/2012/8/3/45
>
Thanks for above list-up and if any comments, let you know.
[...]
> Yes, that looks good to me. Do you want me to take that through the PWM
> tree or would you rather take it through yours?
>
Thanks. Since the error happens in arch/arm/ part and this patch touches
some arch/arm/ files, would be better if this could be sent to upstream via
samsung tree. Of course, if your ack, would be nice to me ;-)
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
On Wed, Aug 08, 2012 at 07:25:17PM +0900, Kukjin Kim wrote:
> So, how about following? If PWM is selected on Samsung SoCs, the PWM_SAMSUNG
> will be selected automatically. Of course, it can be de-selected in kernel
> menuconfig. Note that, I think, using 'bool <expr>' and 'depends on <expr>'
> is more clear than 'prompt <prompt> ["if" <expr>]'. However if any your
> preference here, please kindly let me know.
>
> ---
> diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
> index 8fc3808..c74d055 100644
> --- a/drivers/pwm/Kconfig
> +++ b/drivers/pwm/Kconfig
> @@ -58,14 +58,12 @@ config PWM_PXA
> will be called pwm-pxa.
>
> config PWM_SAMSUNG
> - tristate "Samsung pwm support"
> + bool "Samsung PWM support"
> depends on PLAT_SAMSUNG
> + default y
> help
> Generic PWM framework driver for Samsung.
>
> - To compile this driver as a module, choose M here: the module
> - will be called pwm-samsung.
> -
> config PWM_TEGRA
> tristate "NVIDIA Tegra PWM support"
> depends on ARCH_TEGRA
Acked-by: Thierry Reding <[email protected]>