From patchwork Sat Nov 26 18:06:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 84276 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp541831qgi; Sat, 26 Nov 2016 10:09:32 -0800 (PST) X-Received: by 10.84.137.1 with SMTP id 1mr30548606plm.8.1480183772642; Sat, 26 Nov 2016 10:09:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q28si49451652pfl.44.2016.11.26.10.09.32; Sat, 26 Nov 2016 10:09:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481AbcKZSJS (ORCPT + 25 others); Sat, 26 Nov 2016 13:09:18 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:48006 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753149AbcKZSIP (ORCPT ); Sat, 26 Nov 2016 13:08:15 -0500 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id uAQI6Uf2018512; Sun, 27 Nov 2016 03:06:57 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com uAQI6Uf2018512 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1480183617; bh=5fV5sMnFKzMhXdx4RoKFlGH0MJlgLaWWydx9Qbzxguc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sFL3MJJVhaJ/lvH9gCtXmrZzy8jKrxsIGTCz5A91L4+ZDVIM5ZP82waXjMSsxrFXh oQrMjmobKpDhIP+u8HAo1BdX8IVAvu80O7AImU4LSzilzMi2kzU36zIXGdXv4UTQQD Tnmzro9n18qNDe6yA5sDB718XDcaqTrLgChTkv7759Uqw8eKczALDNKWpdcyvT83FL epc+p0uV62XLgXbCr/zdSzNDo0DeFjepKeC/Jauds9TREZATVR53cJVVEXcvA6Yk54 /aUz79hbWRuyZAdBaokaxh5knDBjPSz0nS65JpuAZLHZs6Pcni8CW6GpM2E/0e+gN1 bHlzD3VL55PoQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse , Cyrille Pitchen Subject: [PATCH 30/39] mtd: nand: denali: set DEVICES_CONNECTED 1 if not set Date: Sun, 27 Nov 2016 03:06:16 +0900 Message-Id: <1480183585-592-31-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480183585-592-1-git-send-email-yamada.masahiro@socionext.com> References: <1480183585-592-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the driver expects DEVICE_CONNECTED is automatically set by the hardware, but this feature is disabled in some cases. In such cases, it is the software's responsibility to set up the DEVICES_CONNECTED register. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 71bdf2a..4b2bbcb 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -1485,6 +1485,13 @@ static void denali_multidev_fixup(struct denali_nand_info *denali) */ denali->devnum = ioread32(denali->flash_reg + DEVICES_CONNECTED); + /* + * On some SoCs, DEVICES_CONNECTED is not auto-detected. For those SoCs + * DEVICES_CONNECT is left to 0. Set 1 if it is the case. + */ + if (denali->devnum == 0) + denali->devnum = 1; + devnum_shift = fls(denali->devnum) - 1; if (denali->devnum != BIT(devnum_shift)) { @@ -1492,9 +1499,10 @@ static void denali_multidev_fixup(struct denali_nand_info *denali) "DEVICE_CONNECTED=%d is not power of 2. Some devices will not be used.\n", denali->devnum); denali->devnum = BIT(devnum_shift); - iowrite32(denali->devnum, denali->flash_reg + DEVICES_CONNECTED); } + iowrite32(denali->devnum, denali->flash_reg + DEVICES_CONNECTED); + mtd->size <<= devnum_shift; mtd->erasesize <<= devnum_shift; mtd->writesize <<= devnum_shift;