From patchwork Wed May 10 14:21:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 760645 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wNK0w2llQz9ryZ for ; Thu, 11 May 2017 00:50:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="QuHN3RjP"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 260B9C21D08; Wed, 10 May 2017 14:45:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9568CC21CAD; Wed, 10 May 2017 14:28:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9E34EC21D36; Wed, 10 May 2017 14:24:18 +0000 (UTC) Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by lists.denx.de (Postfix) with ESMTPS id 33E2FC21D3E for ; Wed, 10 May 2017 14:24:05 +0000 (UTC) Received: by mail-oi0-f48.google.com with SMTP id h4so37210857oib.3 for ; Wed, 10 May 2017 07:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZkDg5Zfm7g9SUSuD8Lyv5AzxRboocxRZ49JaC6P+xek=; b=QuHN3RjPPJ8HX7cqHt5H/yB9xSmx/bs6dmo7swS5cTiDfHRJ+yGbumUNZS1E4uI0OT GgUo/XVDarODFWzWy6GjPZ0nFlp2donT4gzDfIMU97O/c8S/eAdEnYCcU+h6qgk8SEMx FuJvnUwJL8/yqR1ze7IrH0PoOt4KQWTeAG4hFG6CBm9Xscd6wNY/3gbXsiHh2XCaVVcI LeQ04sRyPfaF7XOARwr52aUin5tgVvCdXZGfbsq7evJDML2x+x+FIb57J2xym8HtjwRr fXca3gYxe+PYVku2YgHYNwibNWTaaTqluVeQdqIE20AGfrgce8SzHwJHCEneSIWAJb3R nY3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ZkDg5Zfm7g9SUSuD8Lyv5AzxRboocxRZ49JaC6P+xek=; b=FcIF9I0nRTgJVt5DNY8vpXiN5lK50N32xIQra7jVrNrLDo6P7aEUDwwFKMfxMfri2o lJOLE5sN4gDoMss9m5gwfsOTbjiyus2Zu35DnObFeI52BYOmy32uPZoJY5ix7jM8UCed /unt5y2VJPsshUsb/tO9cMDy26f+uJjtWiu99tu0fc//S2pxi9hSy9TzshPPuG2rWSxi Ra/aoNXeEHSNaGLl99kygq43moL6n9k6Qyo4/+nLAjOzxjMVD1GLZmeWlpEdDRQYoMJw jk3WjniyQrWlgRV56owutp5VLsGTH+7UdUzLWecDhiq2dcR0tPSalueWAQWKAYrfkJnn j8kA== X-Gm-Message-State: AODbwcAynaAxJ4F9nuZJs0R0T1xlgSMcYFtZtH2LTLyExME8OuM7YmKf 0WquKyDZEyKX7RLG X-Received: by 10.157.40.74 with SMTP id h10mr2891342otd.209.1494426243322; Wed, 10 May 2017 07:24:03 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:11:7d9f:fcbe:ade:4561]) by smtp.gmail.com with ESMTPSA id 10sm1510436otw.55.2017.05.10.07.24.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2017 07:24:02 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E6F4640550; Wed, 10 May 2017 08:24:01 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 10 May 2017 08:21:34 -0600 Message-Id: <20170510142150.30515-56-sjg@chromium.org> X-Mailer: git-send-email 2.13.0.rc2.291.g57267f2277-goog In-Reply-To: <20170510142150.30515-1-sjg@chromium.org> References: <20170510142150.30515-1-sjg@chromium.org> Cc: Tom Rini , Stephen Warren Subject: [U-Boot] [PATCH v2 55/71] dm: mailbox: Update uclass to support livetree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Update the mailbox uclass to support livetree. Fix the xlate() method in all callers. Signed-off-by: Simon Glass --- Changes in v2: None drivers/mailbox/mailbox-uclass.c | 20 ++++++++------------ drivers/mailbox/tegra-hsp.c | 2 +- include/mailbox-uclass.h | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c index 38448de965..822ae5b45e 100644 --- a/drivers/mailbox/mailbox-uclass.c +++ b/drivers/mailbox/mailbox-uclass.c @@ -6,7 +6,6 @@ #include #include -#include #include #include @@ -18,7 +17,7 @@ static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev) } static int mbox_of_xlate_default(struct mbox_chan *chan, - struct fdtdec_phandle_args *args) + struct ofnode_phandle_args *args) { debug("%s(chan=%p)\n", __func__, chan); @@ -34,24 +33,22 @@ static int mbox_of_xlate_default(struct mbox_chan *chan, int mbox_get_by_index(struct udevice *dev, int index, struct mbox_chan *chan) { - struct fdtdec_phandle_args args; + struct ofnode_phandle_args args; int ret; struct udevice *dev_mbox; struct mbox_ops *ops; debug("%s(dev=%p, index=%d, chan=%p)\n", __func__, dev, index, chan); - ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev), - "mboxes", "#mbox-cells", 0, - index, &args); + ret = dev_read_phandle_with_args(dev, "mboxes", "#mbox-cells", 0, index, + &args); if (ret) { - debug("%s: fdtdec_parse_phandle_with_args failed: %d\n", - __func__, ret); + debug("%s: dev_read_phandle_with_args failed: %d\n", __func__, + ret); return ret; } - ret = uclass_get_device_by_of_offset(UCLASS_MAILBOX, args.node, - &dev_mbox); + ret = uclass_get_device_by_ofnode(UCLASS_MAILBOX, args.node, &dev_mbox); if (ret) { debug("%s: uclass_get_device_by_of_offset failed: %d\n", __func__, ret); @@ -85,8 +82,7 @@ int mbox_get_by_name(struct udevice *dev, const char *name, debug("%s(dev=%p, name=%s, chan=%p)\n", __func__, dev, name, chan); - index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev), - "mbox-names", name); + index = dev_read_stringlist_search(dev, "mbox-names", name); if (index < 0) { debug("fdt_stringlist_search() failed: %d\n", index); return index; diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c index b546ba2471..bd2ec411c7 100644 --- a/drivers/mailbox/tegra-hsp.c +++ b/drivers/mailbox/tegra-hsp.c @@ -72,7 +72,7 @@ static int tegra_hsp_db_id(ulong chan_id) } static int tegra_hsp_of_xlate(struct mbox_chan *chan, - struct fdtdec_phandle_args *args) + struct ofnode_phandle_args *args) { debug("%s(chan=%p)\n", __func__, chan); diff --git a/include/mailbox-uclass.h b/include/mailbox-uclass.h index 6ec62e5a0e..8a638b04c5 100644 --- a/include/mailbox-uclass.h +++ b/include/mailbox-uclass.h @@ -36,7 +36,7 @@ struct mbox_ops { * @return 0 if OK, or a negative error code. */ int (*of_xlate)(struct mbox_chan *chan, - struct fdtdec_phandle_args *args); + struct ofnode_phandle_args *args); /** * request - Request a translated channel. *