From patchwork Fri Aug 9 05:21:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yegor Yefremov X-Patchwork-Id: 1144386 X-Patchwork-Delegate: trini@ti.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=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b="OqLB73d1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 464YX953GNz9sN4 for ; Fri, 9 Aug 2019 15:22:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8186CC21DFA; Fri, 9 Aug 2019 05:22:10 +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=FREEMAIL_FROM, 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 B3918C21C27; Fri, 9 Aug 2019 05:22:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2B53C21C27; Fri, 9 Aug 2019 05:22:07 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id 78E1BC21BE5 for ; Fri, 9 Aug 2019 05:22:07 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id m44so131630edd.9 for ; Thu, 08 Aug 2019 22:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=TEN2ya7u/lSDlJKl7YF9GdQ6JZzp3wm3vS3kKkZOz0k=; b=OqLB73d1Z0vIyHspQU83Kc7UHipvVYelce2hjmyx2ZRIS0zxjf4DHr2+J3xnzTeeIa uf5YGjKsBMLhuBdj2NVml1gvrFprktoyqNJLM/VF1pI08yyuP1NIZMDXecvnwZ+79AL3 5WB6EoqrVZVqZuUyRPqOgcagn3+yRkwO1CS+3CpoDU/osz/SR4mHvA9Y/Ulft29xLLmP asVp3z2WwcvrgrjyCN2Ha4hLWNbcZL5sV9ILRe8okEt8ho7X0JQdxgHgGsfFqq/9V8pC VcNUivwfWk307o/BkdB/K5mGQ/4SBlZik8i+6TmW7B5X1pR9K1sNkDTtzbHxTJRZj9P9 Budg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TEN2ya7u/lSDlJKl7YF9GdQ6JZzp3wm3vS3kKkZOz0k=; b=PltJLgpsUNFz2RYdIV/ijvAyAfmkosrFcrP2lyOaCH1KG+HgJzsCo3Y18ATBmg59Hx iFS+JzcQpGmPKHN6nZTUf17nACczwmncbJnWdXxeIilK4PDfBKNbI/D122+rbd/wGhTY iBC3g+OHbcbtDq53mCWa9u1GXif/+713PzPSM3C/A3FfuwmRRSo+p6K1QJ0cbQm9zxQG qAS6oIuCZXzSqGBhTuPM1THlTSMDB5aPAQEdlyAynF49gCW72hEWWwTdQNIw62MVP7zr zNSnIjUIB6X96LJcyCYKCyX/5xhUgtLkfOvDvNTux47KUtfHZEF9XhzswQ+1J0sUGnI1 fffw== X-Gm-Message-State: APjAAAWYF1Poy3XniJ1Fd3R5zfrZzjt2P/LQZqA6T9HWjMEK/hw+L1gb MCP5PbpHj8SAL1SbRgY/6BloKGySjvA= X-Google-Smtp-Source: APXvYqyPIlFfKwfAWLbhV3N74q1w57FGDVROtor9HYcpHe46ywsWrLA1/Jm3C67KAwq6yoUe3ptAvw== X-Received: by 2002:a17:906:1e89:: with SMTP id e9mr17327919ejj.56.1565328126897; Thu, 08 Aug 2019 22:22:06 -0700 (PDT) Received: from development1.visionsystems.de (mail.visionsystems.de. [213.209.99.202]) by smtp.gmail.com with ESMTPSA id c6sm62263edv.27.2019.08.08.22.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 22:22:06 -0700 (PDT) From: yegorslists@googlemail.com To: u-boot@lists.denx.de Date: Fri, 9 Aug 2019 07:21:57 +0200 Message-Id: <20190809052157.22097-1-yegorslists@googlemail.com> X-Mailer: git-send-email 2.17.0 Cc: trini@konsulko.com Subject: [U-Boot] [PATCH] arm: baltos: use device tree alias to access Ethernet slave 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" From: Yegor Yefremov The full path has changed in the recent kernels so that it is not possible to load them. Aliases "ethernet0" and "ethernet1" are still present in both legacy and new kernels. Also, fix error messages to correspond to the taken actions. Signed-off-by: Yegor Yefremov --- board/vscom/baltos/board.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index c5949ad267..036a356578 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -288,15 +288,15 @@ int ft_board_setup(void *blob, bd_t *bd) mac_addr[5] = header.MAC1[5]; - node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100200"); + node = fdt_path_offset(blob, "ethernet0"); if (node < 0) { - printf("no /soc/fman/ethernet path offset\n"); + printf("no ethernet0 path offset\n"); return -ENODEV; } ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6); if (ret) { - printf("error setting local-mac-address property\n"); + printf("error setting mac-address property\n"); return -ENODEV; } @@ -308,15 +308,15 @@ int ft_board_setup(void *blob, bd_t *bd) mac_addr[4] = header.MAC2[4]; mac_addr[5] = header.MAC2[5]; - node = fdt_path_offset(blob, "/ocp/ethernet/slave@4a100300"); + node = fdt_path_offset(blob, "ethernet1"); if (node < 0) { - printf("no /soc/fman/ethernet path offset\n"); + printf("no ethernet1 path offset\n"); return -ENODEV; } ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6); if (ret) { - printf("error setting local-mac-address property\n"); + printf("error setting mac-address property\n"); return -ENODEV; }