From patchwork Tue Oct 27 08:43:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 7494711 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 55574BEEA4 for ; Tue, 27 Oct 2015 08:44:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB9C22086E for ; Tue, 27 Oct 2015 08:44:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE95720884 for ; Tue, 27 Oct 2015 08:44:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754428AbbJ0IoN (ORCPT ); Tue, 27 Oct 2015 04:44:13 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:11029 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754427AbbJ0IoG (ORCPT ); Tue, 27 Oct 2015 04:44:06 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NWV00IMBEXEKX60@mailout2.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 27 Oct 2015 08:44:02 +0000 (GMT) X-AuditID: cbfec7f4-f79c56d0000012ee-36-562f3952d8d0 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id C0.52.04846.2593F265; Tue, 27 Oct 2015 08:44:02 +0000 (GMT) Received: from fedinw7x64.rnd.samsung.ru ([106.109.131.169]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NWV00G65EX7R240@eusync3.samsung.com>; Tue, 27 Oct 2015 08:44:02 +0000 (GMT) From: Pavel Fedin To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Kukjin Kim , Krzysztof Kozlowski , Pankaj Dubey Subject: [PATCH v2 2/4] drivers: exynos-srom: Add support for bank configuration Date: Tue, 27 Oct 2015 11:43:53 +0300 Message-id: <64593f31150196b2b3bd8707c77f2cfac00603c4.1445935215.git.p.fedin@samsung.com> X-Mailer: git-send-email 2.4.4 In-reply-to: References: In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFLMWRmVeSWpSXmKPExsVy+t/xq7pBlvphBr/6JCxevzC06H/8mtli 0+NrrBYzzu9jsli09Qu7A6vHplWdbB6bl9R79G1ZxejxeZNcAEsUl01Kak5mWWqRvl0CV8bt vfdZClokK3Y+fMnUwHhCpIuRk0NCwETi95w1bBC2mMSFe+vBbCGBpYwSf9+6dDFyAdltTBI7 +j8wgSTYBNQlTn/9wAJiiwh4S0w+85cdxGYWqJVYc/AgWFxYIEBiyv9TrCA2i4CqxJqdy5hB bF6BaInn85YwQSyTk7hyfTrYMk4Bc4m37z+xQCw2k9h//w8zLvEJjPwLGBlWMYqmliYXFCel 5xrqFSfmFpfmpesl5+duYoSE2JcdjIuPWR1iFOBgVOLhNajQCxNiTSwrrsw9xCjBwawkwiuo ox8mxJuSWFmVWpQfX1Sak1p8iFGag0VJnHfurvchQgLpiSWp2ampBalFMFkmDk6pBkbVyzNz zy8zkuIMkEhjcsuaLMEvrzvbsuHdodMvQtYtnjTJfK9siBXDXV5TsQfvvi6N8vhwLLjE+vKS 1buFvN8d1UnaXOm5PbDQ8MD0PZ1GtjeKBHKXT1C9r16/cOX90k1b5Pieq87dJ9lTYs/EcWN+ eceEKws/CL1/0Ja9XUNIoONoRM62fxOVWIozEg21mIuKEwEhOeKqLQIAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Bindings are based on u-boot implementation, however they are stored in subnodes, providing support for more than one bank. Since the driver now does more than suspend-resume support, dependency on CONFIG_PM is removed. Signed-off-by: Pavel Fedin --- arch/arm/mach-exynos/Kconfig | 2 +- drivers/soc/samsung/Kconfig | 2 +- drivers/soc/samsung/exynos-srom.c | 42 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 83c85f5..c22dc42 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -16,7 +16,7 @@ menuconfig ARCH_EXYNOS select ARM_GIC select COMMON_CLK_SAMSUNG select EXYNOS_THERMAL - 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/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 2833b5b..ea4bc2a 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -8,6 +8,6 @@ config SOC_SAMSUNG config EXYNOS_SROM bool - depends on ARM && ARCH_EXYNOS && PM + depends on ARM && ARCH_EXYNOS endmenu diff --git a/drivers/soc/samsung/exynos-srom.c b/drivers/soc/samsung/exynos-srom.c index 57a232d..6c8c56a 100644 --- a/drivers/soc/samsung/exynos-srom.c +++ b/drivers/soc/samsung/exynos-srom.c @@ -67,9 +67,46 @@ static struct exynos_srom_reg_dump *exynos_srom_alloc_reg_dump( return rd; } +static int decode_sromc(struct exynos_srom *srom, struct device_node *np) +{ + u32 bank, width; + u32 timing[7]; + u32 bw; + + if (of_property_read_u32(np, "bank", &bank)) + return -ENXIO; + if (of_property_read_u32(np, "width", &width)) + width = 1; + if (of_property_read_u32_array(np, "srom-timing", timing, 7)) { + pr_err("Could not decode SROMC configuration\n"); + return -ENXIO; + } + + bank *= 4; /* Convert bank into shift/offset */ + + bw = 1 << EXYNOS_SROM_BW__BYTEENABLE__SHIFT; + if (width == 2) + bw |= 1 << EXYNOS_SROM_BW__DATAWIDTH__SHIFT; + bw <<= bank; + bw |= __raw_readl(srom->reg_base + EXYNOS_SROM_BW) & + ~(EXYNOS_SROM_BW__CS_MASK << bank); + __raw_writel(bw, srom->reg_base + EXYNOS_SROM_BW); + + __raw_writel((timing[0] << EXYNOS_SROM_BCX__PMC__SHIFT) | + (timing[1] << EXYNOS_SROM_BCX__TACP__SHIFT) | + (timing[2] << EXYNOS_SROM_BCX__TCAH__SHIFT) | + (timing[3] << EXYNOS_SROM_BCX__TCOH__SHIFT) | + (timing[4] << EXYNOS_SROM_BCX__TACC__SHIFT) | + (timing[5] << EXYNOS_SROM_BCX__TCOS__SHIFT) | + (timing[6] << 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; @@ -100,6 +137,9 @@ static int exynos_srom_probe(struct platform_device *pdev) return -ENOMEM; } + for_each_child_of_node(np, child) + decode_sromc(srom, child); + return 0; }