From patchwork Thu Jul 7 06:39:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9217863 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 CBF1560467 for ; Thu, 7 Jul 2016 06:49:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE55B2873C for ; Thu, 7 Jul 2016 06:49:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B33AC28741; Thu, 7 Jul 2016 06:49:02 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 69D6D2873C for ; Thu, 7 Jul 2016 06:49:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bL36C-0003KZ-DQ; Thu, 07 Jul 2016 06:47:48 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bL35p-00030A-29 for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2016 06:47:27 +0000 Received: by mail-pf0-x243.google.com with SMTP id c74so993963pfb.0 for ; Wed, 06 Jul 2016 23:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=bEVrviDYNAYsWqKAbcE769nNO7vkjb1lCUp6LUE0sPU=; b=NYExPffPye4lh/aw+Rfl/Slz3fFG4YS3WMDpxD13Kcc2ftLFVSNZ2BjIRBeszRhN9e db9X+NhZ7LirNKinO9ZJG4EOb8VyufXVppMJrzO6qbsjoMos/30OCQc1MmDVVYSshnNr aIdLjxnt9oUoq0DmbAe6H4NweqS2IOo/2HW1DHl5N9GpT5xs6w3/mqHUc+ONmu9BtAaP n7wj5s06UE/IQMqxLmE59B9t+ldOSLzm24oW+dJx5eXNRw5KcoJnS6m8av4Vd6cWrCA9 g49AROaSQczHgt5mU4TebKztwLyVblcAyLYt+a7ZazkEXtdHiYi94ONeEeLt2vASAuja aZhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=bEVrviDYNAYsWqKAbcE769nNO7vkjb1lCUp6LUE0sPU=; b=Iy0b045KuybUJxIbLLE6M7ufyL0Px6o7pTcd2VDS5lfAGOq5OVJ7Ant/QFCm4yBInk /4+u4JPZ5y4fc1/PJ702NHvqp6pJJxGF/U3JmwqJxBta6NjArkLNwSTTVZfgWA8o/B8A h6dtljHfTYAC5pO/S2A8rPDAFLJEXvMIaZQQmssSkh6G4Bl3uXGE+OBCE8G7MMMSx0gL BxYYsQVcU+FVXMIEGJ1y9qz2BK4HK6VQ7Lcf0T0wEEf4X6ENdjEw5A7x6sUWFfJ5blYG RKsnEYYyXH8TRRIC/i/Szogi0nTEr1oHk3WHCaLduDxnilIC7pDLUaQ0Scp5PFsh5X4Z jlnA== X-Gm-Message-State: ALyK8tKXH4QIhBJSBGXa00+Lr5afP8ntow7biUKSyxRl02OBTx4mlBqyjKGiQllwXqpQmQ== X-Received: by 10.98.65.209 with SMTP id g78mr2496273pfd.93.1467874026445; Wed, 06 Jul 2016 23:47:06 -0700 (PDT) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id z1sm6043144pab.19.2016.07.06.23.47.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Jul 2016 23:47:05 -0700 (PDT) From: Sanchayan Maity To: arnd@arndb.de, shawnguo@kernel.org Subject: [PATCH v4 4/5] soc: Add SoC driver for Freescale Vybrid platform Date: Thu, 7 Jul 2016 12:09:29 +0530 Message-Id: X-Mailer: git-send-email 2.9.0 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160706_234725_231238_EA0985C9 X-CRM114-Status: GOOD ( 20.63 ) 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, stefan@agner.ch, Sanchayan Maity , robh+dt@kernel.org, srinivas.kandagatla@linaro.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 This adds a SoC driver to be used by Freescale Vybrid SoC's. Driver utilises syscon and nvmem consumer API's to get the various register values needed and expose the SoC specific properties via sysfs. A sample output from Colibri Vybrid VF61 is below: root@colibri-vf:~# cd /sys/bus/soc/devices/soc0 root@colibri-vf:/sys/bus/soc/devices/soc0# ls family machine power revision soc_id subsystem uevent root@colibri-vf:/sys/bus/soc/devices/soc0# cat family Freescale Vybrid VF610 root@colibri-vf:/sys/bus/soc/devices/soc0# cat machine Freescale Vybrid root@colibri-vf:/sys/bus/soc/devices/soc0# cat revision 00000013 root@colibri-vf:/sys/bus/soc/devices/soc0# cat soc_id df6472a6130f29d4 Signed-off-by: Sanchayan Maity --- drivers/soc/Kconfig | 1 + drivers/soc/fsl/Kconfig | 10 +++ drivers/soc/fsl/Makefile | 1 + drivers/soc/fsl/soc-vf610.c | 212 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 224 insertions(+) create mode 100644 drivers/soc/fsl/Kconfig create mode 100644 drivers/soc/fsl/soc-vf610.c diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index cb58ef0..4410eb7 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -2,6 +2,7 @@ menu "SOC (System On Chip) specific Drivers" source "drivers/soc/bcm/Kconfig" source "drivers/soc/brcmstb/Kconfig" +source "drivers/soc/fsl/Kconfig" source "drivers/soc/fsl/qe/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig new file mode 100644 index 0000000..746b5e3 --- /dev/null +++ b/drivers/soc/fsl/Kconfig @@ -0,0 +1,10 @@ +# +# Freescale SoC drivers + +config SOC_BUS_VF610 + bool "SoC bus device for the Freescale Vybrid platform" + depends on NVMEM && NVMEM_VF610_OCOTP && OF + select SOC_BUS + help + Include support for the SoC bus on the Freescale Vybrid platform + providing sysfs information about the module variant. diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 203307f..afaf092 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -2,5 +2,6 @@ # Makefile for the Linux Kernel SOC fsl specific device drivers # +obj-$(CONFIG_SOC_VF610) += soc-vf610.o obj-$(CONFIG_QUICC_ENGINE) += qe/ obj-$(CONFIG_CPM) += qe/ diff --git a/drivers/soc/fsl/soc-vf610.c b/drivers/soc/fsl/soc-vf610.c new file mode 100644 index 0000000..23900ea --- /dev/null +++ b/drivers/soc/fsl/soc-vf610.c @@ -0,0 +1,212 @@ +/* + * Copyright (C) 2016 Toradex AG. + * + * Author: Sanchayan Maity + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MSCM_CPxCOUNT_OFFSET 0x2C +#define MSCM_CPxCFG1_OFFSET 0x14 +#define ROM_REVISION_OFFSET 0x80 + +struct vf610_soc { + struct device *dev; + struct soc_device_attribute *soc_dev_attr; + struct soc_device *soc_dev; + struct nvmem_cell *ocotp_cfg0; + struct nvmem_cell *ocotp_cfg1; +}; + +static int vf610_soc_probe(struct platform_device *pdev) +{ + struct vf610_soc *info; + struct device *dev = &pdev->dev; + struct device_node *soc_node; + struct device_node *cfg0_node, *cfg1_node; + struct regmap *rom_regmap, *mscm_regmap; + char soc_type[] = "xx0"; + size_t id1_len, id2_len; + u32 cpucount, l2size, rom_rev; + u8 *socid1, *socid2; + int ret; + + info = devm_kzalloc(dev, sizeof(struct vf610_soc), GFP_KERNEL); + if (!info) + return -ENOMEM; + info->dev = dev; + + soc_node = of_find_node_by_path("/soc"); + if (!soc_node) + return -ENODEV; + + cfg0_node = of_find_node_by_name(soc_node, "cfg0"); + if (!cfg0_node) { + ret = -ENODEV; + goto out_cfg0_node; + } + + cfg1_node = of_find_node_by_name(soc_node, "cfg1"); + if (!cfg1_node) { + ret = -ENODEV; + goto out_cfg1_node; + } + + info->ocotp_cfg0 = of_nvmem_cell_get_direct(cfg0_node); + if (IS_ERR(info->ocotp_cfg0)) { + ret = PTR_ERR(info->ocotp_cfg0); + goto out_ocotp_cfg0; + } + + info->ocotp_cfg1 = of_nvmem_cell_get_direct(cfg1_node); + if (IS_ERR(info->ocotp_cfg1)) { + ret = PTR_ERR(info->ocotp_cfg1); + goto out_ocotp_cfg1; + } + + socid1 = nvmem_cell_read(info->ocotp_cfg0, &id1_len); + if (IS_ERR(socid1)) { + dev_err(dev, "Could not read nvmem cell %ld\n", + PTR_ERR(socid1)); + ret = PTR_ERR(socid1); + goto out_socid1; + } + + socid2 = nvmem_cell_read(info->ocotp_cfg1, &id2_len); + if (IS_ERR(socid2)) { + dev_err(dev, "Could not read nvmem cell %ld\n", + PTR_ERR(socid2)); + ret = PTR_ERR(socid2); + goto out_socid2; + } + add_device_randomness(socid1, id1_len); + add_device_randomness(socid2, id2_len); + + rom_regmap = syscon_regmap_lookup_by_compatible("fsl,vf610-ocrom"); + if (IS_ERR(rom_regmap)) { + dev_err(dev, "regmap lookup for ocrom failed %ld\n", + PTR_ERR(rom_regmap)); + ret = PTR_ERR(rom_regmap); + goto out; + } + + mscm_regmap = syscon_regmap_lookup_by_compatible("fsl,vf610-mscm-cpucfg"); + if (IS_ERR(mscm_regmap)) { + dev_err(dev, "regmap lookup for mscm failed %ld\n", + PTR_ERR(mscm_regmap)); + ret = PTR_ERR(mscm_regmap); + goto out; + } + + ret = regmap_read(rom_regmap, ROM_REVISION_OFFSET, &rom_rev); + if (ret) { + ret = -ENODEV; + goto out; + } + + ret = regmap_read(mscm_regmap, MSCM_CPxCOUNT_OFFSET, &cpucount); + if (ret) { + ret = -ENODEV; + goto out; + } + + ret = regmap_read(mscm_regmap, MSCM_CPxCFG1_OFFSET, &l2size); + if (ret) { + ret = -ENODEV; + goto out; + } + + soc_type[0] = cpucount ? '6' : '5'; /* Dual Core => VF6x0 */ + soc_type[1] = l2size ? '1' : '0'; /* L2 Cache => VFx10 */ + + info->soc_dev_attr = devm_kzalloc(dev, + sizeof(info->soc_dev_attr), GFP_KERNEL); + if (!info->soc_dev_attr) { + ret = -ENOMEM; + goto out; + } + + info->soc_dev_attr->machine = devm_kasprintf(dev, + GFP_KERNEL, "Freescale Vybrid"); + info->soc_dev_attr->soc_id = devm_kasprintf(dev, + GFP_KERNEL, + "%02x%02x%02x%02x%02x%02x%02x%02x", + socid1[3], socid1[2], socid1[1], + socid1[0], socid2[3], socid2[2], + socid2[1], socid2[0]); + info->soc_dev_attr->family = devm_kasprintf(&pdev->dev, + GFP_KERNEL, "Freescale Vybrid VF%s", + soc_type); + info->soc_dev_attr->revision = devm_kasprintf(dev, + GFP_KERNEL, "%08x", rom_rev); + + platform_set_drvdata(pdev, info); + + info->soc_dev = soc_device_register(info->soc_dev_attr); + if (IS_ERR(info->soc_dev)) { + ret = -ENODEV; + goto out; + } + + ret = 0; + +out: + kfree(socid2); +out_socid2: + kfree(socid1); +out_socid1: + nvmem_cell_put(info->ocotp_cfg1); +out_ocotp_cfg1: + nvmem_cell_put(info->ocotp_cfg0); +out_ocotp_cfg0: + of_node_put(cfg1_node); +out_cfg1_node: + of_node_put(cfg0_node); +out_cfg0_node: + of_node_put(soc_node); + + return ret; +} + +static int vf610_soc_remove(struct platform_device *pdev) +{ + struct vf610_soc *info = platform_get_drvdata(pdev); + + if (info->soc_dev) + soc_device_unregister(info->soc_dev); + + return 0; +} + +static const struct of_device_id vf610_soc_match[] = { + { .compatible = "fsl,vf610-soc", }, + { /* */ } +}; + +static struct platform_driver vf610_soc_driver = { + .probe = vf610_soc_probe, + .remove = vf610_soc_remove, + .driver = { + .name = "vf610-soc", + .of_match_table = vf610_soc_match, + }, +}; +builtin_platform_driver(vf610_soc_driver);