From patchwork Wed Jun 17 08:38:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6623061 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@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 18A65C0020 for ; Wed, 17 Jun 2015 09:05:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22FEC20844 for ; Wed, 17 Jun 2015 09:05:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAADE20834 for ; Wed, 17 Jun 2015 09:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbbFQJFS (ORCPT ); Wed, 17 Jun 2015 05:05:18 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:49832 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbbFQJFQ (ORCPT ); Wed, 17 Jun 2015 05:05:16 -0400 Received: from ayla.of.borg ([84.193.93.87]) by xavier.telenet-ops.be with bizsmtp id hM521q00b1t5w8s01M52MD; Wed, 17 Jun 2015 11:05:14 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1Z58sE-00071E-6k; Wed, 17 Jun 2015 10:39:06 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1Z58sF-0003wD-4a; Wed, 17 Jun 2015 10:39:07 +0200 From: Geert Uytterhoeven To: Greg Kroah-Hartman , Simon Horman , Magnus Damm Cc: Arnd Bergmann , Laurent Pinchart , Kuninori Morimoto , Marc Zyngier , devel@driverdev.osuosl.org, linux-sh@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 5/7] staging: board: Add support for devices with complex dependencies Date: Wed, 17 Jun 2015 10:38:54 +0200 Message-Id: <1434530336-15073-6-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434530336-15073-1-git-send-email-geert+renesas@glider.be> References: <1434530336-15073-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add support for easy registering of one ore more platform devices that may: - need clocks that are described in DT, - be part of a PM Domain. All these dependencies are optional. Signed-off-by: Geert Uytterhoeven --- v2: - Drop support for pinctrl, use standard pinctrl in DT instead, - Drop support for configured GPIOs, use "gpio-hog" in DT instead, - Use clk_add_alias() instead of open coding, - Update for changed function names, - Drop RFC status. --- drivers/staging/board/board.c | 56 +++++++++++++++++++++++++++++++++++++++++++ drivers/staging/board/board.h | 20 ++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/drivers/staging/board/board.c b/drivers/staging/board/board.c index 8712f566b31196e0..29d456e29f38feac 100644 --- a/drivers/staging/board/board.c +++ b/drivers/staging/board/board.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) "board_staging: " fmt +#include #include #include #include @@ -16,6 +17,8 @@ #include #include #include +#include +#include #include "board.h" @@ -118,3 +121,56 @@ void __init board_staging_gic_fixup_resources(struct resource *res, for (i = 0; i < nres; i++) gic_fixup_resource(&res[i]); } + +int __init board_staging_register_clock(const struct board_staging_clk *bsc) +{ + int error; + + pr_debug("Aliasing clock %s for con_id %s dev_id %s\n", bsc->clk, + bsc->con_id, bsc->dev_id); + error = clk_add_alias(bsc->con_id, bsc->dev_id, bsc->clk, NULL); + if (error) + pr_err("Failed to alias clock %s (%d)\n", bsc->clk, error); + + return error; +} + +int __init board_staging_register_device(const struct board_staging_dev *dev) +{ + struct platform_device *pdev = dev->pdev; + unsigned int i; + int error; + + pr_debug("Trying to register device %s\n", pdev->name); + if (board_staging_dt_node_available(pdev->resource, + pdev->num_resources)) { + pr_warn("Skipping %s, already in DT\n", pdev->name); + return -EEXIST; + } + + board_staging_gic_fixup_resources(pdev->resource, pdev->num_resources); + + for (i = 0; i < dev->nclocks; i++) + board_staging_register_clock(&dev->clocks[i]); + + error = platform_device_register(pdev); + if (error) { + pr_err("Failed to register device %s (%d)\n", pdev->name, + error); + return error; + } + + if (dev->domain) + __pm_genpd_name_add_device(dev->domain, &pdev->dev, NULL); + + return error; +} + +void __init board_staging_register_devices(const struct board_staging_dev *devs, + unsigned int ndevs) +{ + unsigned int i; + + for (i = 0; i < ndevs; i++) + board_staging_register_device(&devs[i]); +} diff --git a/drivers/staging/board/board.h b/drivers/staging/board/board.h index 3af6dbe22f91ebdc..42ed125132201327 100644 --- a/drivers/staging/board/board.h +++ b/drivers/staging/board/board.h @@ -4,12 +4,32 @@ #include #include +struct board_staging_clk { + const char *clk; + const char *con_id; + const char *dev_id; +}; + +struct board_staging_dev { + /* Platform Device */ + struct platform_device *pdev; + /* Clocks (optional) */ + const struct board_staging_clk *clocks; + unsigned int nclocks; + /* Generic PM Domain (optional) */ + const char *domain; +}; + struct resource; bool board_staging_dt_node_available(const struct resource *resource, unsigned int num_resources); int board_staging_gic_setup_xlate(const char *gic_match, unsigned int base); void board_staging_gic_fixup_resources(struct resource *res, unsigned int nres); +int board_staging_register_clock(const struct board_staging_clk *bsc); +int board_staging_register_device(const struct board_staging_dev *dev); +void board_staging_register_devices(const struct board_staging_dev *devs, + unsigned int ndevs); #define board_staging(str, fn) \ static int __init runtime_board_check(void) \