From patchwork Wed Aug 8 14:34:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1296111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 5D1273FC23 for ; Wed, 8 Aug 2012 14:39:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sz7Mb-0002GD-7B; Wed, 08 Aug 2012 14:35:57 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sz7ME-0002EC-4k for linux-arm-kernel@lists.infradead.org; Wed, 08 Aug 2012 14:35:37 +0000 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MAk71-1SsCXR44oV-00BIMl; Wed, 08 Aug 2012 16:34:59 +0200 From: Arnd Bergmann To: Kukjin Kim Subject: Re: [PATCH 4/6] ARM: s3c24xx: use new PWM driver Date: Wed, 8 Aug 2012 14:34:55 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1344430493-5304-1-git-send-email-arnd@arndb.de> <1344430493-5304-5-git-send-email-arnd@arndb.de> <0b6801cd7567$29be48b0$7d3ada10$%kim@samsung.com> In-Reply-To: <0b6801cd7567$29be48b0$7d3ada10$%kim@samsung.com> MIME-Version: 1.0 Message-Id: <201208081434.56198.arnd@arndb.de> X-Provags-ID: V02:K0:6bY5eiR/f0fvq5uHQB4BaFgr9DUl/FASEnf7tSIv0JQ iPSlFKSbKIM/6RFYdFD/M0URPdhJOGmQ4cwri+DKeaeF8joObt oX/54tmt8CTHHpkzKgUseyHdw/F21LCxeVMqEMu3TPJc2GRlJm CSg/yQ4gk/LQHfC6XWzWFiqXWoaqU7CgCL9SW8OGoaH0efD9Y8 s6KXiXCYPaJub3L2mQCbFstKWsyeeotOvPp7kUnK4JfL6ZWQmT eeOutF2nLDhQHZWtiahhOOKelGI78qB4NLx6QXHQNgk+2ZFkCr 62siuxNZt3VI4nqmmeU3utQc/tiBp+1laDaRxjmkTDI3zMKyGB GkKUQxOWJQr7HnB3MPR4= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tushar Behera X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wednesday 08 August 2012, Kukjin Kim wrote: > 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..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 This approach has two disadvantages compared to mine: * When building for the samsung platforms other than rx1950 or gta02, you can no longer have the PWM driver as a loadable module, for no good reason. * It is still possible to manually disable PWM_SAMSUNG, even on rx1950 and gta02, because the Kconfig symbol is visible. I've added a "Reported-by: Tushar Behera " line to my version of the patch, but I would prefer to keep that approach. I have also changed the patch to use the S3C24XX_PWM symbol because that lets everyone migrate the defconfig files. Do you want to give this patch some more testing, or should I keep it in arm-soc? Arnd Acked-by: Kukjin Kim --- From 438b0cf94adb2528bdeeb71314f7be16512ea5b1 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 4 Aug 2012 07:52:19 +0000 Subject: [PATCH] ARM: s3c24xx: use new PWM driver The samsung PWM driver has moved to the new PWM subsystem, which changed the Kconfig symbol for that driver, but the rx1950 and gta02 boards still uses the old one. Without this patch, building s3c2410_defconfig results in: 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: Arnd Bergmann Reported-by: Tushar Behera Cc: Kukjin Kim 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