From patchwork Wed Jul 6 15:52:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 949942 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p66Frobc000682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 6 Jul 2011 15:54:11 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeUPs-00050I-A4; Wed, 06 Jul 2011 15:53:33 +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 1QeUPr-0000pY-FS; Wed, 06 Jul 2011 15:53:31 +0000 Received: from mail-iw0-f177.google.com ([209.85.214.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QeUPK-0000j5-BR for linux-arm-kernel@lists.infradead.org; Wed, 06 Jul 2011 15:52:59 +0000 Received: by iwn35 with SMTP id 35so25347iwn.36 for ; Wed, 06 Jul 2011 08:52:55 -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:x-mailer:in-reply-to:references; bh=8ho3H7J6JhOAcmD2Opo9QU0UsajsLTzaRRovz9hDcxk=; b=a1scnTVtwmmKQFJv1PvvoWjtqCmG6jYTB3SPSLBiKXjo3p9GltS9hreaStzOn2cYlm 42o0NnFGtDlclmN7oD1R+3jq9vkV0IQcbQLxHwdnmGGYY+RUL/DBQ/nHYkYAfKYTnzs1 VOkFdQmtO2ZXaRfa5wY3r+K+b59j7hkn4T5SA= Received: by 10.231.27.228 with SMTP id j36mr7898908ibc.117.1309967575078; Wed, 06 Jul 2011 08:52:55 -0700 (PDT) Received: from localhost.localdomain ([202.115.1.35]) by mx.google.com with ESMTPS id fw9sm4931186ibb.47.2011.07.06.08.52.51 (version=SSLv3 cipher=OTHER); Wed, 06 Jul 2011 08:52:54 -0700 (PDT) From: Eric Miao To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] ARM: pxa168: correct nand pmu setting Date: Wed, 6 Jul 2011 23:52:29 +0800 Message-Id: <1309967549-3394-3-git-send-email-eric.y.miao@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309967549-3394-1-git-send-email-eric.y.miao@gmail.com> References: <1309967549-3394-1-git-send-email-eric.y.miao@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110706_115258_672196_343B49A3 X-CRM114-Status: GOOD ( 13.86 ) 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 [209.85.214.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (eric.y.miao[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 0.0 T_TO_NO_BRKTS_FREEMAIL To: misformatted and free email service Cc: Lei Wen , Eric Miao , stable@kernel.org 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: , MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Jul 2011 15:54:11 +0000 (UTC) From: Lei Wen The original pair of <0x01db, 208000000> is invalid. Correct it to the valid value. The 6th bit of the NFC APMU register indicates NFC works whether at 156Mhz or 78Mhz. So 0x19b indicates NFC works at 156Mhz, and 0x1db indicates it works at 78Mhz. Signed-off-by: Lei Wen Cc: stable@kernel.org Signed-off-by: Eric Miao --- arch/arm/mach-mmp/pxa168.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 72b4e76..ab9f999 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -79,7 +79,7 @@ static APBC_CLK(ssp4, PXA168_SSP4, 4, 0); static APBC_CLK(ssp5, PXA168_SSP5, 4, 0); static APBC_CLK(keypad, PXA168_KPC, 0, 32000); -static APMU_CLK(nand, NAND, 0x01db, 208000000); +static APMU_CLK(nand, NAND, 0x19b, 156000000); static APMU_CLK(lcd, LCD, 0x7f, 312000000); /* device and clock bindings */