From patchwork Mon May 20 00:44:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101747 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gDs3drRz9s6w for ; Mon, 20 May 2019 10:46:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EC6F2C21E16; Mon, 20 May 2019 00:45:44 +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=SPF_HELO_PASS 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 63987C21DFD; Mon, 20 May 2019 00:45:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33C77C21D83; Mon, 20 May 2019 00:45:28 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 70D26C21D74 for ; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MLQcx-1hB8Io1stX-00IVQC; Mon, 20 May 2019 02:45:25 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:57 +0200 Message-Id: <20190520004502.8924-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:x+4YTMJ8Fb9CyqO8NJbKHjEHW+gEwgsZTkbrRXnKhXVhoLkRo68 IS9NziApCLQPXZLpM8JKh3IezBoufs8b8IeZbd+TBp0ano8R/kPSidIg8TPD0ugJUTO7vI1 CDL/EXsAEPBYjx5+ea4hXaOJfaSpmddZvn6szA3k2wMQPCPiYq3g3NRhI/XUAjkhsfoacxH 9lpwt8i2D0vvAxL4wK7DQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:RNAjDWmBpII=:R8JXVciy6ahfaTEU703sz6 Xm3e+M02RzJpiUQ2yeXpobyVLWxp13F8gOKWP6aMTr3nfGiPg3+bUb8074s2VQuK2yBihfmNG ghfF0nkJhUo+TLjH4xMElSfPx0vuXVg66HiYxtdTMRmaqWqfAUu5oxIdCBHDSzfHkpEVF6w9F nymTC7Znl9RGtUP9DXXLCCkE824g+SAzmfz8Y+vc6JRPpKNk9pmbUpTtB3c5irfKPffV35XZR 3ZUPNyVCPlIarchc3/H0Ag9TVgnaoIleDH7UEoqh9Kkwv+WMveLfWsJOclFcNRJqDczbX8gvL INdCw/vktNvbuQMZ8oOVq1S9jfE7oAJIKQS3F2tbgkSGY1MY8Y0KXcEBaSOr/LUcp50qUyMFs gcfDQUGdfPvunhLhB2/Qc4VCS/0A/67UCfTIWQVaPkLmFlmnACX0HdFKlFDPFOM0MEF5VCain QhZCiRut0Qbcmp2pn4F/m1w6r6IroiGCW79BtV4+7faIFRaKXOFtkWGJfgqrHjfrAkojga2BW qBvcQuvyzwuc0tMTAA89yvy+tPEwQSclVgJBZ4gW7chEvdu6Fu40dZ3mbwEYeLYLFTxiujipw UKz/w+0j09cLNLYN/gFqpZgEjjPvBjTRjJHmfR1CQiHxydADgOH77dhPPJnH7RvYQ61PZ7+On FGfO2aVVXFQM2FNERNpTG0F+FN+lw8ymyxNmKk7bnms2WFA5HQRN+ONd6jD3ZQduohs4el1Ys ERgQcxfupiPS89ZpI52AAKvjHVZauXdrlxYA5A== Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH v1 05/10] dm: core: gracefully handle alias seq without of 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Gracefully handle alias seq in the platform data rather than OF case. Signed-off-by: Marcel Ziswiler --- drivers/core/read.c | 4 +++- include/dm/read.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/core/read.c b/drivers/core/read.c index 6bda077a34..670ffe5dc5 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -212,15 +212,17 @@ int dev_read_alias_seq(struct udevice *dev, int *devnump) { ofnode node = dev_ofnode(dev); const char *uc_name = dev->uclass->uc_drv->name; - int ret; + int ret = -ENOTSUPP; if (ofnode_is_np(node)) { ret = of_alias_get_id(ofnode_to_np(node), uc_name); if (ret >= 0) *devnump = ret; } else { +#if CONFIG_IS_ENABLED(OF_CONTROL) ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name, ofnode_to_offset(node), devnump); +#endif } return ret; diff --git a/include/dm/read.h b/include/dm/read.h index 60b727cbd8..a8ffbe42ac 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -702,8 +702,12 @@ static inline const void *dev_read_prop(struct udevice *dev, static inline int dev_read_alias_seq(struct udevice *dev, int *devnump) { +#if CONFIG_IS_ENABLED(OF_CONTROL) return fdtdec_get_alias_seq(gd->fdt_blob, dev->uclass->uc_drv->name, dev_of_offset(dev), devnump); +#else + return -ENOTSUPP; +#endif } static inline int dev_read_u32_array(struct udevice *dev, const char *propname,