From patchwork Sun Jun 14 05:49:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sdharia@codeaurora.org X-Patchwork-Id: 6603811 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: X-Original-To: patchwork-linux-arm-msm@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 E01FD9F1C1 for ; Sun, 14 Jun 2015 05:50:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF6F5206EE for ; Sun, 14 Jun 2015 05:50:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 066B720411 for ; Sun, 14 Jun 2015 05:50:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751947AbbFNFuJ (ORCPT ); Sun, 14 Jun 2015 01:50:09 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:58632 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751791AbbFNFt6 (ORCPT ); Sun, 14 Jun 2015 01:49:58 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id B7F20140271; Sun, 14 Jun 2015 05:49:57 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 9FC04140277; Sun, 14 Jun 2015 05:49:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from sdharia-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sdharia@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 22157140271; Sun, 14 Jun 2015 05:49:55 +0000 (UTC) From: Sagar Dharia To: gregkh@linuxfoundation.org, broonie@kernel.org, linux-kernel@vger.kernel.org, bp@suse.de, poeschel@lemonage.de, sdharia@codeaurora.org, santosh.shilimkar@ti.com, treding@nvidia.com, gong.chen@linux.intel.com, andreas.noever@gmail.com, alan@linux.intel.com, mathieu.poirier@linaro.org, daniel@ffwll.ch, oded.gabbay@amd.com, jkosina@suse.cz, sharon.dvir1@mail.huji.ac.il, joe@perches.com, davem@davemloft.net, james.hogan@imgtec.com, michael.opdenacker@free-electrons.com, daniel.thompson@linaro.org, nkaje@codeaurora.org, mbutler@audience.com Cc: kheitke@audience.com, mlocke@codeaurora.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/3] of/slimbus: OF helper for SLIMbus Date: Sat, 13 Jun 2015 23:49:17 -0600 Message-Id: <1434260958-13732-3-git-send-email-sdharia@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1434260958-13732-1-git-send-email-sdharia@codeaurora.org> References: <1434260958-13732-1-git-send-email-sdharia@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP OF helper routine scans the SLIMbus DeviceTree, allocates resources, and creates slim_devices according to the hierarchy. Signed-off-by: Sagar Dharia --- drivers/slimbus/slimbus.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/slimbus.h | 19 ++++++++++++ 2 files changed, 96 insertions(+) diff --git a/drivers/slimbus/slimbus.c b/drivers/slimbus/slimbus.c index be4f2c7..f51b503 100644 --- a/drivers/slimbus/slimbus.c +++ b/drivers/slimbus/slimbus.c @@ -19,6 +19,7 @@ #include #include #include +#include static DEFINE_MUTEX(slim_lock); static DEFINE_IDR(ctrl_idr); @@ -761,6 +762,82 @@ int slim_get_logical_addr(struct slim_device *sb, struct slim_eaddr *e_addr, } EXPORT_SYMBOL(slim_get_logical_addr); +#if IS_ENABLED(CONFIG_OF) +/* OF helpers for SLIMbus */ +int of_register_slim_devices(struct slim_controller *ctrl) +{ + struct device_node *node; + struct slim_boardinfo *temp, *binfo = NULL; + int n = 0; + int ret = 0; + + if (!ctrl->dev.of_node) + return -EINVAL; + + for_each_child_of_node(ctrl->dev.of_node, node) { + struct property *prop; + u8 *ea; + struct slim_device *slim; + char *name; + + prop = of_find_property(node, "enumeration-addr", NULL); + if (!prop || prop->length != 6) { + dev_err(&ctrl->dev, "of_slim: invalid E-addr"); + continue; + } + ea = (u8 *)prop->value; + name = kcalloc(SLIMBUS_NAME_SIZE, sizeof(char), GFP_KERNEL); + if (!name) { + ret = -ENOMEM; + goto of_slim_err; + } + ret = of_modalias_node(node, name, SLIMBUS_NAME_SIZE); + if (ret < 0) { + dev_err(&ctrl->dev, "of_slim: modalias fail:%d on %s\n", + ret, node->full_name); + kfree(name); + continue; + } + slim = kcalloc(1, sizeof(struct slim_device), GFP_KERNEL); + if (!slim) { + ret = -ENOMEM; + kfree(name); + goto of_slim_err; + } + slim->e_addr.manf_id = (u16)(ea[5] << 8) | ea[4]; + slim->e_addr.prod_code = (u16)(ea[3] << 8) | ea[2]; + slim->e_addr.dev_index = ea[1]; + slim->e_addr.instance = ea[0]; + + + temp = krealloc(binfo, (n + 1) * sizeof(struct slim_boardinfo), + GFP_KERNEL); + if (!temp) { + kfree(name); + kfree(slim); + goto of_slim_err; + } + binfo = temp; + slim->dev.of_node = of_node_get(node); + slim->name = name; + binfo[n].bus_num = ctrl->nr; + binfo[n].slim_slave = slim; + n++; + } + return slim_register_board_info(binfo, n); + +of_slim_err: + n--; + while (n >= 0) { + kfree(binfo[n].slim_slave->name); + kfree(binfo[n].slim_slave); + } + kfree(binfo); + return ret; +} +EXPORT_SYMBOL(of_register_slim_devices); +#endif + MODULE_LICENSE("GPL v2"); MODULE_VERSION("0.1"); MODULE_DESCRIPTION("Slimbus module"); diff --git a/include/linux/slimbus.h b/include/linux/slimbus.h index 05b7594..61b7c74 100644 --- a/include/linux/slimbus.h +++ b/include/linux/slimbus.h @@ -370,6 +370,25 @@ static inline int slim_register_board_info(struct slim_boardinfo const *info, } #endif +#if IS_ENABLED(CONFIG_OF) +/* + * of_slim_register_devices() - Register devices in the SLIMbus Device Tree + * @ctrl: slim_controller which devices should be registered to. + * + * This routine scans the SLIMbus Device Tree, allocating resources and + * creating slim_devices according to the SLIMbus Device Tree + * hierarchy. + * This routine is normally called from the probe routine of the driver + * registering as a slim_controller. + */ +extern int of_register_slim_devices(struct slim_controller *ctrl); +#else +static int of_register_slim_devices(struct slim_controller *ctrl) +{ + return 0; +} +#endif + static inline void *slim_get_ctrldata(const struct slim_controller *dev) { return dev_get_drvdata(&dev->dev);