From patchwork Fri Sep 19 13:06:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 4938051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E9C7BEEA5 for ; Fri, 19 Sep 2014 13:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9707A201FE for ; Fri, 19 Sep 2014 13:15:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B82AE201F7 for ; Fri, 19 Sep 2014 13:15:50 +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 1XUxzp-0007Xb-Rm; Fri, 19 Sep 2014 13:13:09 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XUxzm-0007UL-GZ for linux-arm-kernel@lists.infradead.org; Fri, 19 Sep 2014 13:13:07 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NC500LVNGP52X40@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 19 Sep 2014 22:12:41 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 61.E2.04049.9CB2C145; Fri, 19 Sep 2014 22:12:41 +0900 (KST) X-AuditID: cbfee68e-f79536d000000fd1-ff-541c2bc92242 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A9.EB.04943.9CB2C145; Fri, 19 Sep 2014 22:12:41 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NC5003TYGMSC420@mmp2.samsung.com>; Fri, 19 Sep 2014 22:12:41 +0900 (KST) From: Pankaj Dubey To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4] mfd: syscon: Decouple syscon interface from platform devices Date: Fri, 19 Sep 2014 18:36:49 +0530 Message-id: <1411132009-11173-1-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRmVeSWpSXmKPExsWyRsSkTvektkyIwf4FShZ/Jx1jt3i4s5/F Ytmku2wW33d9YbfoXXCVzeL+16OMFp0XOlgtNj2+xmpxedccNosZ5/cxWdy+zGvx6eh/VotF W4FqO5YxWqza9YfR4uaz7UwOAh4tzT1sHr9/TWL0+He4n8lj56y77B53ru1h89i8pN6jb8sq Ro/Pm+QCOKK4bFJSczLLUov07RK4Ms5P2s5SsMikYlvfccYGxidaXYycHBICJhIdV3vYIWwx iQv31rN1MXJxCAksZZRY+PwGE0zRt4uzmCES0xklznyYD+VMYJK4sWQzC0gVm4CuxJP3c5lB bBGBbIn+26vB4swCu5kkDm1PBLGFBQIkztxazAZiswioSjRunAi2mlfAQ+L4jFdA9RxA2xQk 5kyygVh8iV3i//kaiHIBiW+TD0GVyEpsOsAMUSIpcXDFDZYJjIILGBlWMYqmFiQXFCelFxnp FSfmFpfmpesl5+duYgTGyel/z/p2MN48YH2IUYCDUYmH1yNNOkSINbGsuDL3EKMp0IaJzFKi yfnAaMwriTc0NjOyMDUxNTYytzRTEudNkPoZLCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoGx tl2z2qQuV3V1lWnfhoZCgU3xAprtaxbKrLKL4xNjkbhQ7t62wkF7Wlf3T1v5Lf5LucUvp+fl J0pMtfivs7xml0TgqvIP9R5nErSucN1XzLm/yalDvmrezZV/Vz913KF64JiT8cmNyvPD1x+5 dMDY5rJNnvn7wjtsS5X+Nqp8+tu3ePr8zu1KLMUZiYZazEXFiQA10FrqjgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsVy+t9jQd2T2jIhBo/7xC3+TjrGbvFwZz+L xbJJd9ksvu/6wm7Ru+Aqm8X9r0cZLTovdLBabHp8jdXi8q45bBYzzu9jsrh9mdfi09H/rBaL tgLVdixjtFi16w+jxc1n25kcBDxamnvYPH7/msTo8e9wP5PHzll32T3uXNvD5rF5Sb1H35ZV jB6fN8kFcEQ1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+ATo umXmAD2gpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcw4P2k7S8Eik4pt fccZGxifaHUxcnJICJhIfLs4ixnCFpO4cG89WxcjF4eQwHRGiTMf5jNDOBOYJG4s2cwCUsUm oCvx5P1csA4RgWyJ/turweLMAruZJA5tTwSxhQUCJM7cWswGYrMIqEo0bpzIDmLzCnhIHJ/x CqieA2ibgsScSTYTGLkXMDKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAiOw2dSOxhXNlgc YhTgYFTi4fVIkw4RYk0sK67MPcQowcGsJMLLJyYTIsSbklhZlVqUH19UmpNafIjRFGj5RGYp 0eR8YIrIK4k3NDYxNzU2tTSxMDGzVBLnPdBqHSgkkJ5YkpqdmlqQWgTTx8TBKdXAWCDgFGH1 +93ujmX3utm+u2pcyI47f+VjjmzBlJc9tmUhuec+K3GWJ26+t/KphY6/51Z9C6vVJ+U7bpyR 2Jd/NHWS5yzVpwf4GYyd6+bmfwzeL5uwq8dk2cl7xnMfnLXYaFSbcyE3bE4qt5Qx88cywUqF 7i9ZC+JsjmhqykxdqTT10G9RVk5fJZbijERDLeai4kQAEtS2C9kCAAA= 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-20140919_061306_699089_887FEA5B X-CRM114-Status: GOOD ( 21.03 ) X-Spam-Score: -5.7 (-----) Cc: kgene.kim@samsung.com, linux@arm.linux.org.uk, arnd@arndb.de, naushad@samsung.com, b29396@freescale.com, tomasz.figa@gmail.com, joshi@samsung.com, thomas.ab@samsung.com, Li.Xiubo@freescale.com, Pankaj Dubey , vikas.sajjan@samsung.com, chow.kim@samsung.com, lee.jones@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Currently a syscon entity can be only registered directly through a platform device that binds to a dedicated syscon driver. However in certain use cases it is desirable to make a device used with another driver a syscon interface provider. For example, certain SoCs (e.g. Exynos) contain system controller blocks which perform various functions such as power domain control, CPU power management, low power mode control, but in addition contain certain IP integration glue, such as various signal masks, coprocessor power control, etc. In such case, there is a need to have a dedicated driver for such system controller but also share registers with other drivers. The latter is where the syscon interface is helpful. In case of DT based platforms, this patch decouples syscon object from syscon platform driver, and allows to create syscon objects first time when it is required by calling of syscon_regmap_lookup_by APIs and keep a list of such syscon objects along with syscon provider device_nodes and regmap handles. For non-DT based platforms, this patch keeps syscon platform driver structure where is can be probed and such non-DT based drivers can use syscon_regmap_lookup_by_pdev API and get access to regmap handles. Once all users of "syscon_regmap_lookup_by_pdev" migrated to DT based, we can completly remove platform driver of syscon, and keep only helper functions to get regmap handles. Suggested-by: Arnd Bergmann Suggested-by: Tomasz Figa Tested-by: Vivek Gautam Signed-off-by: Pankaj Dubey Tested-by: Javier Martinez Canillas --- Changes since v3: - Addressed Arnd's comment for v2. - Updated of_syscon_register for adding dev pointer in regmap_init_mmio. - For early users created dummy platform device. Changes since v2: - Added back platform device support from syscon, with one change that syscon will not be probed for DT based platform. - Added back syscon_regmap_lookup_by_pdevname API so that non-DT base users of syscon will not be broken. - Removed unwanted change in syscon.h. - Modified Signed-off-by list, added Suggested-by of Tomasz Figa and Arnd Bergmann. - Added Tested-by of Vivek Gautam for testing on Exynos platform. Changes since v1: - Removed of_syscon_unregister function. - Modified of_syscon_register function and it will be used by syscon.c to create syscon objects whenever required. - Removed platform device support from syscon. - Removed syscon_regmap_lookup_by_pdevname API support. - As there are significant changes w.r.t patchset v1, I am taking over author for this patchset from Tomasz Figa. [1]: https://lkml.org/lkml/2014/9/2/299 drivers/mfd/syscon.c | 102 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index ca15878..630de0a 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -22,33 +23,100 @@ #include #include #include +#include static struct platform_driver syscon_driver; +static DEFINE_SPINLOCK(syscon_list_slock); +static LIST_HEAD(syscon_list); + struct syscon { + struct device_node *np; struct regmap *regmap; + struct list_head list; +}; + +static struct regmap_config syscon_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, }; -static int syscon_match_node(struct device *dev, void *data) +static struct syscon *of_syscon_register(struct device_node *np) { - struct device_node *dn = data; + struct platform_device *pdev = NULL; + struct syscon *syscon; + struct regmap *regmap; + void __iomem *base; + + + if (!of_device_is_compatible(np, "syscon")) + return ERR_PTR(-EINVAL); + + syscon = kzalloc(sizeof(*syscon), GFP_KERNEL); + if (!syscon) + return ERR_PTR(-ENOMEM); + + base = of_iomap(np, 0); + if (!base) + return ERR_PTR(-ENOMEM); + + if (!of_device_is_available(np) || + of_node_test_and_set_flag(np, OF_POPULATED)) { + /* if device is already populated and avaiable then use it */ + pdev = of_find_device_by_node(np); + if (!(&pdev->dev)) + return ERR_PTR(-ENODEV); + + } else { + /* for early users create dummy syscon device and use it */ + pdev = kzalloc(sizeof(*pdev), GFP_KERNEL); + if (!pdev) + return ERR_PTR(-ENOMEM); + + pdev->name = "dummy-syscon"; + pdev->id = -1; + device_initialize(&pdev->dev); + pdev->dev.of_node = np; + } + + regmap = regmap_init_mmio(&pdev->dev, base, &syscon_regmap_config); + if (IS_ERR(regmap)) { + pr_err("regmap init failed\n"); + return ERR_CAST(regmap); + } + + syscon->regmap = regmap; + syscon->np = np; - return (dev->of_node == dn) ? 1 : 0; + spin_lock(&syscon_list_slock); + list_add_tail(&syscon->list, &syscon_list); + spin_unlock(&syscon_list_slock); + + return syscon; } struct regmap *syscon_node_to_regmap(struct device_node *np) { - struct syscon *syscon; - struct device *dev; + struct syscon *entry, *syscon = NULL; - dev = driver_find_device(&syscon_driver.driver, NULL, np, - syscon_match_node); - if (!dev) - return ERR_PTR(-EPROBE_DEFER); + spin_lock(&syscon_list_slock); - syscon = dev_get_drvdata(dev); + list_for_each_entry(entry, &syscon_list, list) + if (entry->np == np) { + syscon = entry; + break; + } - return syscon->regmap; + spin_unlock(&syscon_list_slock); + + if (!syscon) + syscon = of_syscon_register(np); + + if (!IS_ERR(syscon)) + return syscon->regmap; + + return ERR_CAST(syscon); } EXPORT_SYMBOL_GPL(syscon_node_to_regmap); @@ -110,17 +178,6 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, } EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_phandle); -static const struct of_device_id of_syscon_match[] = { - { .compatible = "syscon", }, - { }, -}; - -static struct regmap_config syscon_regmap_config = { - .reg_bits = 32, - .val_bits = 32, - .reg_stride = 4, -}; - static int syscon_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -167,7 +224,6 @@ static struct platform_driver syscon_driver = { .driver = { .name = "syscon", .owner = THIS_MODULE, - .of_match_table = of_syscon_match, }, .probe = syscon_probe, .id_table = syscon_ids,