From patchwork Wed Aug 31 12:35:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1115752 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7VCZhd7017273 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 31 Aug 2011 12:36:04 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qyk0y-0005OL-Dr; Wed, 31 Aug 2011 12:35:32 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qyk0x-0003y9-W2; Wed, 31 Aug 2011 12:35:32 +0000 Received: from mail-ww0-f49.google.com ([74.125.82.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qyk0u-0003xn-RJ for linux-arm-kernel@lists.infradead.org; Wed, 31 Aug 2011 12:35:29 +0000 Received: by wwf10 with SMTP id 10so477777wwf.18 for ; Wed, 31 Aug 2011 05:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-transfer-encoding:content-type; bh=Ktmf0qcgh9yrJaYgeEogCWoijkdlhunP0bw4Rpud/a4=; b=iaG93xfoDNMw7A5crlYrJV7q3KZSOIUZM80oywWUSgZMKNghSnjHsrMUmujDdV13UK PDjepXiqHa0UOAL2iiDX+Q7pBM56LnfusPQRLvspPUq84ebiaKWFl/yrsTueCSZnDH+m pzCnxJfxPn2fEjqcUU0Pv3Z3x/9TcFjZQfs8Q= Received: by 10.216.133.197 with SMTP id q47mr330043wei.90.1314794126501; Wed, 31 Aug 2011 05:35:26 -0700 (PDT) Received: from flatron.localnet (178-73-0-134.home.aster.pl [178.73.0.134]) by mx.google.com with ESMTPS id m20sm3928988wed.9.2011.08.31.05.35.24 (version=SSLv3 cipher=OTHER); Wed, 31 Aug 2011 05:35:25 -0700 (PDT) From: Tomasz Figa To: linux-arm-kernel Subject: [PATCH 3/5] ARM: Samsung: pwm: Exclude timer 3 on S3C64xx if generic time is enabled. Date: Wed, 31 Aug 2011 14:35:21 +0200 Message-ID: <5142282.FY8lfsdgLT@flatron> User-Agent: KMail/4.7.0 (Linux/3.0.3-gentoo; KDE/4.7.0; x86_64; ; ) In-Reply-To: <1731819.jJi37IsjvJ@flatron> References: <1731819.jJi37IsjvJ@flatron> MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110831_083529_014573_57FFE2CD X-CRM114-Status: GOOD ( 13.63 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kukjin Kim , Ben Dooks X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 31 Aug 2011 12:36:04 +0000 (UTC) From 33ad5bbb9e6e575a4f284417290d9dc0413f5bc9 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Sun, 28 Aug 2011 02:46:18 +0200 Subject: [PATCH 3/5] ARM: Samsung: pwm: Exclude timer 3 on S3C64xx if generic time is enabled. This patch excludes PWM timer 3 from timers supported with the PWM driver on S3C64xx when generic time is enabled. Signed-off-by: Tomasz Figa --- arch/arm/plat-samsung/pwm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-samsung/pwm.c b/arch/arm/plat-samsung/pwm.c index 27b5353..8f0fad1 100644 --- a/arch/arm/plat-samsung/pwm.c +++ b/arch/arm/plat-samsung/pwm.c @@ -273,6 +273,13 @@ static int s3c_pwm_probe(struct platform_device *pdev) unsigned int id = pdev->id; int ret; +#ifdef CONFIG_S3C64XX_GENERIC_CLOCKEVENTS + if (id == 3 && + platform_get_device_id(pdev)->driver_data == TYPE_S3C64XX) { + dev_err(dev, "TIMER3 is currently not supported\n"); + return -ENXIO; + } +#endif if (id == 4) { dev_err(dev, "TIMER4 is currently not supported\n"); return -ENXIO;