From patchwork Mon May 30 13:15:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9141389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9367360759 for ; Mon, 30 May 2016 13:17:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 876F828185 for ; Mon, 30 May 2016 13:17:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C254281C2; Mon, 30 May 2016 13:17:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 894D628185 for ; Mon, 30 May 2016 13:17:03 +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 1b7N2n-0001ke-IO; Mon, 30 May 2016 13:15:45 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b7N2j-0001UW-Hp for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2016 13:15:42 +0000 Received: from wuerfel.localnet ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MN62C-1b9Xp32ZAm-006g8Q; Mon, 30 May 2016 15:14:59 +0200 From: Arnd Bergmann To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/4] soc: fsl: add GUTS driver for QorIQ platforms Date: Mon, 30 May 2016 15:15:25 +0200 Message-ID: <5339448.D8rpq4ofAC@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: References: <1462417950-46796-1-git-send-email-yangbo.lu@nxp.com> MIME-Version: 1.0 X-Provags-ID: V03:K0:mxXS/41m7N34qVJllxfELd94BFUwgck/ecRmxi2lmf1vXDAX1Zn sZ9Esmp4cDFZlLCP8cSfHWgNPH8aiLWWymZeYOrGm2nTp5V0nFVANqMpDb+ZJSMtknmenjP vpVjGQEaPrAC6AxFQuMXHdWO3mWYH0TkyQebcJaHVDWMMfDv7cCAhiLzOxVHeGT15Evy6Q/ IZ5AL7E4qT/BzPPiGWVpQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:qXZhXYIkTWY=:44Nd7A5frs8q5YnwhUXC3w WeCvZcfc1R/+W+lil6Fc5InvEW4k7rdFd34T1SvrzlGd3KwRQFA13Vh5j1JMAcQnobVDGB73K S61rpePPLk8zvrSqdBdWZfdpKK0qNrD8sJV9IkR7RF5O2bhsBmrJjiDaE6tSeqcAgNPVfB9IS lzfzS6Wk5mT96VOZbiUpZ6w9FiI9EVvoFDlqCsmQvez65PQZfmgKpf70Pvvso4TDY8nVZ5K5W uYuppSTwqLAUtZF4tnDhrXH3oRgoRZ1Q54WrHwMUg/NYOsuMjIuLQaivj4eVYepNg/a36Z1k5 cMrLVdaYIhwCxRGnXxRSHt7jQ9KCkgpyt/tWZ5M7SsmLcw5Gx9n4BG2sjs8aNaHC0sTEQ0jAW sf5E5p7iUkYJONbkYuo7DJeePy/wkAIa9MiexsU4ewnDcEtGN+Y5piiiNLWDzIzFg1cKcZeJq OOR3tt93WRByd9IWh9bOa72RWyHTrxlPQNB0bUUj7Ef9vz0y2Lwedi9D3z4aJ//m2H688ckhE co13kxRYAWEq0jxSMsvQQUjK3/AQJSHddVGQzw4zfU5vpzsYwuixsJag+M6IROaBYhbnbrtY4 g8YQyUYqbSD7Ch9p9/L9T5GQadvReA11cR6eiU3zpVJHo/WzysPcLjlMRX04ZYFB3hI9Jqe7K ilQSaK3Z0llLN3M0j5YW2x9gdt5XvyvjKeqNZxVqbdPPTu+wEFBKUqumXjscfSQMMnmPCGX1Q 0tR4tn0QP3vLldkP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160530_061541_997969_6B5F3A39 X-CRM114-Status: GOOD ( 19.24 ) 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: Mark Rutland , Ulf Hansson , "linux-kernel@vger.kernel.org" , "linux-i2c@vger.kernel.org" , "linux-clk@vger.kernel.org" , Qiang Zhao , Russell King , Bhupesh Sharma , Joerg Roedel , Claudiu Manoil , "devicetree@vger.kernel.org" , Kumar Gala , Scott Wood , Rob Herring , Santosh Shilimkar , "linux-arm-kernel@lists.infradead.org" , "netdev@vger.kernel.org" , "linux-mmc@vger.kernel.org" , Xiaobo Xie , Yang-Leo Li , "iommu@lists.linux-foundation.org" , Yangbo Lu Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Yangbo Lu The global utilities block controls power management, I/O device enabling, power-onreset(POR) configuration monitoring, alternate function selection for multiplexed signals,and clock control. This patch adds GUTS driver to manage and access global utilities block. [arnd turned this into a platform_driver registering a soc_device rather than providing an ad-hoc interface for soc-id] Signed-off-by: Yangbo Lu Signed-off-by: Arnd Bergmann diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index cb58ef0d9b2c..7106463f118e 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -2,7 +2,7 @@ menu "SOC (System On Chip) specific Drivers" source "drivers/soc/bcm/Kconfig" source "drivers/soc/brcmstb/Kconfig" -source "drivers/soc/fsl/qe/Kconfig" +source "drivers/soc/fsl/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" source "drivers/soc/rockchip/Kconfig" diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig new file mode 100644 index 000000000000..33d331cac8d6 --- /dev/null +++ b/drivers/soc/fsl/Kconfig @@ -0,0 +1,15 @@ +# +# Freescale SOC drivers +# + +source "drivers/soc/fsl/qe/Kconfig" + +config FSL_GUTS + bool "NXP Layerscale SoC identification" + depends on PPC_FSL || SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST + default PPC_FSL || SOC_LS1021A || ARCH_LAYERSCAPE + select SOC_BUS + help + This registers a SoC device for NXP (formerly Freescale) + Layerscape devices, making information about the system + available in /sys/devices/soc/ diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 203307fd92c1..02afb7f980f6 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_QUICC_ENGINE) += qe/ obj-$(CONFIG_CPM) += qe/ +obj-$(CONFIG_FSL_GUTS) += guts.o diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c new file mode 100644 index 000000000000..2f30698f5bcf --- /dev/null +++ b/drivers/soc/fsl/guts.c @@ -0,0 +1,130 @@ +/* + * Freescale QorIQ Platforms GUTS Driver + * + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define GUTS_PVR 0x0a0 +#define GUTS_SVR 0x0a4 + +struct guts { + void __iomem *regs; + bool little_endian; + struct soc_device_attribute soc; +}; + +static u32 fsl_guts_get_svr(struct guts *guts) +{ + if (guts->little_endian) + return ioread32(guts->regs + GUTS_SVR); + else + return ioread32be(guts->regs + GUTS_SVR); +} + +static u32 fsl_guts_get_pvr(struct guts *guts) +{ + if (guts->little_endian) + return ioread32(guts->regs + GUTS_PVR); + else + return ioread32be(guts->regs + GUTS_PVR); +} + +/* + * Table for matching compatible strings, for device tree + * guts node, for Freescale QorIQ SOCs. + */ +static const struct of_device_id fsl_guts_of_match[] = { + /* For T4 & B4 Series SOCs */ + { .compatible = "fsl,qoriq-device-config-1.0", .data = "T4/B4 series" }, + /* For P Series SOCs */ + { .compatible = "fsl,p1010-guts", .data = "P1010/P1014" }, + { .compatible = "fsl,p1020-guts", .data = "P1020/P1011" }, + { .compatible = "fsl,p1021-guts", .data = "P1021/P1012" }, + { .compatible = "fsl,p1022-guts", .data = "P1022/P1013" }, + { .compatible = "fsl,p1023-guts", .data = "P1013/P1017" }, + { .compatible = "fsl,p2020-guts", .data = "P2010/P2020" }, + { .compatible = "fsl,qoriq-device-config-2.0", .data = "P series" }, + /* For BSC Series SOCs */ + { .compatible = "fsl,bsc9131-guts", .data = "BSC9131 Qonverge" }, + { .compatible = "fsl,bsc9132-guts", .data = "BSC9132 Qonverge" }, + /* For MPC85xx Series SOCs */ + { .compatible = "fsl,mpc8536-guts", .data = "PowerPC MPC8536" }, + { .compatible = "fsl,mpc8544-guts", .data = "PowerPC MPC8544" }, + { .compatible = "fsl,mpc8548-guts", .data = "PowerPC MPC8548" }, + { .compatible = "fsl,mpc8568-guts", .data = "PowerPC MPC8568" }, + { .compatible = "fsl,mpc8569-guts", .data = "PowerPC MPC8569" }, + { .compatible = "fsl,mpc8572-guts", .data = "PowerPC MPC8572" }, + /* For Layerscape Series SOCs */ + { .compatible = "fsl,ls1021a-dcfg", .data = "Layerscape LS1021A" }, + { .compatible = "fsl,ls1043a-dcfg", .data = "Layerscape LS1043A" }, + { .compatible = "fsl,ls2080a-dcfg", .data = "Layerscape LS2080A" }, + {} +}; + +static void fsl_guts_init(struct device *dev, struct guts *guts) +{ + const struct of_device_id *id; + u32 svr = fsl_guts_get_svr(guts); + + guts->soc.family = "NXP QorIQ"; + id = of_match_node(fsl_guts_of_match, dev->of_node); + guts->soc.soc_id = devm_kasprintf(dev, "%s (ver 0x%06x)" id->data, + svr >> 8; + guts->soc.revision = devm_kasprintf(dev, GFP_KERNEL, "0x%02x", + svr & 0xff); +} + +static int fsl_guts_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct guts *guts; + int ret; + + guts = devm_kzalloc(dev, sizeof(*guts), GFP_KERNEL); + if (!guts) { + ret = -ENOMEM; + goto out; + + } + + /* + * syscon devices default to little-endian, but on powerpc we have + * existing device trees with big-endian maps and an absent endianess + * "big-property" + */ + if (!IS_ENABLED(CONFIG_POWERPC) && + !of_property_read_bool(dev->of_node, "big-endian")) + guts->little_endian = true; + + guts->regs = devm_ioremap_resource(dev, 0); + if (!guts->regs) { + ret = -ENOMEM; + kfree(guts); + goto out; + } + + fsl_guts_init(dev, guts); + ret = 0; +out: + return ret; +} + +static struct platform_driver fsl_soc_guts = { + .probe = fsl_guts_probe, + .driver.of_match_table = fsl_guts_of_match, +}; + +module_platform_driver(fsl_soc_guts);