From patchwork Mon Apr 11 07:42:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 8797461 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AB0609F3D1 for ; Mon, 11 Apr 2016 07:51:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E86920272 for ; Mon, 11 Apr 2016 07:51:12 +0000 (UTC) Received: from bombadil.infradead.org (unknown [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56C4920256 for ; Mon, 11 Apr 2016 07:51:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1apWUM-0004gp-0l; Mon, 11 Apr 2016 07:42:26 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1apWTH-00047S-Rv for linux-arm-kernel@lists.infradead.org; Mon, 11 Apr 2016 07:41:23 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O5G01H0ELCBBPB0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 11 Apr 2016 16:40:59 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [203.254.230.51]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 8A.18.04789.B055B075; Mon, 11 Apr 2016 16:40:59 +0900 (KST) X-AuditID: cbfee691-f795a6d0000012b5-a6-570b550b4561 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 27.6B.06682.B055B075; Mon, 11 Apr 2016 16:40:59 +0900 (KST) Received: from pankaj.sisodomain.com ([107.108.83.125]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O5G006QDLBXEB30@mmp2.samsung.com>; Mon, 11 Apr 2016 16:40:59 +0900 (KST) From: Pankaj Dubey To: linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RESPIN v2 5/6] memory: samsung: exynos-srom: Add support for bank configuration Date: Mon, 11 Apr 2016 13:12:27 +0530 Message-id: <1460360548-32127-6-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1460360548-32127-1-git-send-email-pankaj.dubey@samsung.com> References: <1460360548-32127-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsVy+t8zY13uUO5wg67fxhavXxha9C64ymax 6fE1VovLu+awWcw4v4/J4tT1z2wWry6tYrNYtPULu0XHMkYHTo/NS+o9rpxoYvXo27KK0ePz JrkAligum5TUnMyy1CJ9uwSujHXrdzAVTFaq6N01n6mBsVemi5GDQ0LARKK/v6iLkRPIFJO4 cG89WxcjF4eQwEpGiZ1z5jDB1LzdUwcRn8UocfbqKmaQBiGBn4wSMxeZgNhsAroST97PBYuL CGRLTF77iAWkgVlgJqPE3B3HGEESwgLREm8WfQUrYhFQlZjR8IUNxOYV8JDYdG8vC8QVchIn j01mBbE5BTwlOrfcYIVY5iHx4dVidpChEgKr2CV6V/5hgxgkIPFt8iEWiEtlJTYdYIaYIylx cMUNlgmMwgsYGVYxiqYWJBcUJ6UXmeoVJ+YWl+al6yXn525ihAT6xB2M9w9YH2IU4GBU4uF1 uMYVLsSaWFZcmXuI0RRow0RmKdHkfGA85ZXEGxqbGVmYmpgaG5lbmimJ8+pI/wwWEkhPLEnN Tk0tSC2KLyrNSS0+xMjEwSnVwCj7bsIxw10Tlb/bK1R+Cryzh4llqmHs6n97tLTr9J1z7Hat DPDOVSxrDlu8XYX7fM0Tr/bFOz5nPvuS9maO6p+G7M+HHpzLvcqm/Hsjz3fdeY1fzM5MyvLv STBdLxfIm6IUvtF2L9/TBSeuBzqfbIs0TXn6+sNqj7TYhOa8pPNb7S9fqea6qarEUpyRaKjF XFScCACS0Ap2bwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFIsWRmVeSWpSXmKPExsVy+t9jQV3uUO5wg7Nv9CxevzC06F1wlc1i 0+NrrBaXd81hs5hxfh+Txanrn9ksXl1axWaxaOsXdouOZYwOnB6bl9R7XDnRxOrRt2UVo8fn TXIBLFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5 QJcoKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLrMTJAAwnrGDPWrd/BVDBZqaJ313ym BsZemS5GDg4JAROJt3vquhg5gUwxiQv31rN1MXJxCAnMYpQ4e3UVM0hCSOAno8TMRSYgNpuA rsST93PB4iIC2RKT1z5iAWlgFpjJKDF3xzFGkISwQLTEm0VfwYpYBFQlZjR8YQOxeQU8JDbd 28sCsU1O4uSxyawgNqeAp0TnlhusEMs8JD68Wsw+gZF3ASPDKkaJ1ILkguKk9FzDvNRyveLE 3OLSvHS95PzcTYzgeHomtYPx4C73Q4wCHIxKPLwvLnOFC7EmlhVX5h5ilOBgVhLhnRHIHS7E m5JYWZValB9fVJqTWnyI0RTosInMUqLJ+cBYzyuJNzQ2MTOyNDKzMDIxN1cS5338f12YkEB6 YklqdmpqQWoRTB8TB6dUA+Mh/TBWyTfpkh9P/Dndc9+J2X7Lr//NmpdMZFmeuTxgtXy59Ny0 FQdSN70rye6TY/v/vNNlhYh3TA6feZjjIp+qhuyvZtuWHDH6sHme4Jlt/6Y+ssy/XL7NYU9J eSebsljI0xlBm/5I8+/sTNJ5vGxjVvMLARP7jap6nRH/fX7KLN/uX1wqoKrEUpyRaKjFXFSc CACOXJokvQIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160411_004120_312446_ED897938 X-CRM114-Status: GOOD ( 18.78 ) X-Spam-Score: -7.9 (-------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: k.kozlowski@samsung.com, kgene.kim@samsung.com, Pankaj Dubey , p.fedin@samsung.com, thomas.ab@samsung.com, olof@lixom.net MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RDNS_NONE,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pavel Fedin Implement handling properties in subnodes and adding child devices to the system. Child devices will not be added if configuration fails. Since the driver now does more than suspend-resume support, dependency on CONFIG_PM is removed. Signed-off-by: Pavel Fedin Reviewed-by: Krzysztof Kozlowski Signed-off-by: Pankaj Dubey Signed-off-by: Krzysztof Kozlowski --- arch/arm/mach-exynos/Kconfig | 2 +- drivers/memory/samsung/Kconfig | 2 +- drivers/memory/samsung/exynos-srom.c | 60 ++++++++++++++++++++++++++++++++++-- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 28f9928..e65aa7d 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -18,7 +18,7 @@ menuconfig ARCH_EXYNOS select COMMON_CLK_SAMSUNG select EXYNOS_THERMAL select EXYNOS_PMU - select EXYNOS_SROM if PM + select EXYNOS_SROM select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG diff --git a/drivers/memory/samsung/Kconfig b/drivers/memory/samsung/Kconfig index 64ab5dd..9de1222 100644 --- a/drivers/memory/samsung/Kconfig +++ b/drivers/memory/samsung/Kconfig @@ -8,6 +8,6 @@ if SAMSUNG_MC config EXYNOS_SROM bool "Exynos SROM controller driver" if COMPILE_TEST - depends on (ARM && ARCH_EXYNOS && PM) || (COMPILE_TEST && HAS_IOMEM) + depends on (ARM && ARCH_EXYNOS) || (COMPILE_TEST && HAS_IOMEM) endif diff --git a/drivers/memory/samsung/exynos-srom.c b/drivers/memory/samsung/exynos-srom.c index 68e073c..96756fb 100644 --- a/drivers/memory/samsung/exynos-srom.c +++ b/drivers/memory/samsung/exynos-srom.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -67,11 +68,50 @@ static struct exynos_srom_reg_dump *exynos_srom_alloc_reg_dump( return rd; } +static int exynos_srom_configure_bank(struct exynos_srom *srom, + struct device_node *np) +{ + u32 bank, width, pmc = 0; + u32 timing[6]; + u32 cs, bw; + + if (of_property_read_u32(np, "reg", &bank)) + return -EINVAL; + if (of_property_read_u32(np, "reg-io-width", &width)) + width = 1; + if (of_property_read_bool(np, "samsung,srom-page-mode")) + pmc = 1 << EXYNOS_SROM_BCX__PMC__SHIFT; + if (of_property_read_u32_array(np, "samsung,srom-timing", timing, + ARRAY_SIZE(timing))) + return -EINVAL; + + bank *= 4; /* Convert bank into shift/offset */ + + cs = 1 << EXYNOS_SROM_BW__BYTEENABLE__SHIFT; + if (width == 2) + cs |= 1 << EXYNOS_SROM_BW__DATAWIDTH__SHIFT; + + bw = __raw_readl(srom->reg_base + EXYNOS_SROM_BW); + bw = (bw & ~(EXYNOS_SROM_BW__CS_MASK << bank)) | (cs << bank); + __raw_writel(bw, srom->reg_base + EXYNOS_SROM_BW); + + __raw_writel(pmc | (timing[0] << EXYNOS_SROM_BCX__TACP__SHIFT) | + (timing[1] << EXYNOS_SROM_BCX__TCAH__SHIFT) | + (timing[2] << EXYNOS_SROM_BCX__TCOH__SHIFT) | + (timing[3] << EXYNOS_SROM_BCX__TACC__SHIFT) | + (timing[4] << EXYNOS_SROM_BCX__TCOS__SHIFT) | + (timing[5] << EXYNOS_SROM_BCX__TACS__SHIFT), + srom->reg_base + EXYNOS_SROM_BC0 + bank); + + return 0; +} + static int exynos_srom_probe(struct platform_device *pdev) { - struct device_node *np; + struct device_node *np, *child; struct exynos_srom *srom; struct device *dev = &pdev->dev; + bool bad_bank_config = false; np = dev->of_node; if (!np) { @@ -100,7 +140,23 @@ static int exynos_srom_probe(struct platform_device *pdev) return -ENOMEM; } - return 0; + for_each_child_of_node(np, child) { + if (exynos_srom_configure_bank(srom, child)) { + dev_err(dev, + "Could not decode bank configuration for %s\n", + child->name); + bad_bank_config = true; + } + } + + /* + * If any bank failed to configure, we still provide suspend/resume, + * but do not probe child devices + */ + if (bad_bank_config) + return 0; + + return of_platform_populate(np, NULL, NULL, dev); } static int exynos_srom_remove(struct platform_device *pdev)