From patchwork Wed Apr 10 23:00:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Bourdon X-Patchwork-Id: 1083665 X-Patchwork-Delegate: sr@denx.de 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IPUTrdl8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44fflG6Nb9z9s4Y for ; Thu, 11 Apr 2019 09:00:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 841E5C21E0D; Wed, 10 Apr 2019 23:00: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=FREEMAIL_FROM, 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 2745BC21C3F; Wed, 10 Apr 2019 23:00:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 100B8C21C3F; Wed, 10 Apr 2019 23:00:36 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id A66CAC21BE5 for ; Wed, 10 Apr 2019 23:00:35 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id s39so3507769edb.2 for ; Wed, 10 Apr 2019 16:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wgMa/2Z10c5iQvc8bCSF324mY/v4I5lnCENCi0V1Bes=; b=IPUTrdl808XCNr+U2TLVLHFzLGga1cymWP7+9ujufoNZGfI6DD6GVNMtPPqpgA9BOU hOOKzZS9PLMNwGHPwbwuHivb38o2cZgJ+9lY1MLy3Smo4z08CoudRGhuqNzpaN19i/yz 2KMWudbrSmuYdUbt+sVWI+tejxOuDA+dXBB8tQKMSSViWIIfkf7Rd2e5kTtYUDOSwYY9 DAXoxl/BCM/XrwBWxFBhX3T1w08dAwXyiQNn6v5T8wTp6u4efQ/0fqv5cMnCGWjilP1K uk++cEox9a5WNsihF4eKPtxGCI2ZZWkFJMMtXEnkSFvvPL5DJ+SuGfiyHbucdI9//Paz 8v7g== 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:mime-version :content-transfer-encoding; bh=wgMa/2Z10c5iQvc8bCSF324mY/v4I5lnCENCi0V1Bes=; b=ExNqzFz+WjmGdD1YKV5hXvUjISQlvyBSNw2hpY9RieA7Hy8/c0A6EA+ckudB6B18m7 h6TekQWgmfoiPmP7wGofR9zfDyOVHsL0Su8PBaTFjcPJJTjEo8nQhUGyV9oIMwnEg1+P T48HFjgE7pzO+laTHvMhnn14A7EcMf51e2RrMovEKQJ806tw6i4wjOxqnTvSpCGb9hr9 q/JZ6IShMOVIXm+p4+Cb0+ydFLvqtYVLDY8MQcQuTakq2WPQ7uXxa0ABrSK92qL9OYbS YYye3pc5mSdxxbZ0Hfw3cnhVVmaakm5pL40y/Hh3vZP8bLhhKxb+2UImC/oF0xCKl9yX Xfmw== X-Gm-Message-State: APjAAAX/MpTdO3kKdhtUd9aEhaj0c2/X3stBqKI8gVOJWYjBe1KHpvPp vEvwRjXQzdmPQxrrc2yijffvgNp8nso= X-Google-Smtp-Source: APXvYqxpDkGKlv4k3mXv7YLcAKn0d+6NfWA8PB5j+D8J7Cabl7IzjekLgqEpuxz+81LC5Zlfap/UzQ== X-Received: by 2002:a50:f311:: with SMTP id p17mr29392593edm.213.1554937234992; Wed, 10 Apr 2019 16:00:34 -0700 (PDT) Received: from lowell.delroth.net ([2a02:168:6426::bb2]) by smtp.gmail.com with ESMTPSA id p18sm6708695ejm.4.2019.04.10.16.00.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 16:00:34 -0700 (PDT) From: Pierre Bourdon To: u-boot@lists.denx.de Date: Thu, 11 Apr 2019 01:00:23 +0200 Message-Id: <20190410230023.4113-1-delroth@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [U-Boot] [PATCH] turris_omnia: fix eeprom/mcu device names 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" Commit c4bd12a7dad4 ("i2c: mux: Generate longer i2c mux name") changed the naming scheme of i2c devices within a mux. This broke references to i2c@0 in the Turris Omnia board initialization code. Signed-off-by: Pierre Bourdon Cc: Marek Behún Reviewed-by: Stefan Roese Reviewed-by: Marek Behún --- board/CZ.NIC/turris_omnia/turris_omnia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index c7f6479a0c..c54cd047c1 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -32,13 +32,13 @@ DECLARE_GLOBAL_DATA_PTR; -#define OMNIA_I2C_EEPROM_DM_NAME "i2c@0" +#define OMNIA_I2C_EEPROM_DM_NAME "i2c@11000->i2cmux@70->i2c@0" #define OMNIA_I2C_EEPROM 0x54 #define OMNIA_I2C_EEPROM_CONFIG_ADDR 0x0 #define OMNIA_I2C_EEPROM_ADDRLEN 2 #define OMNIA_I2C_EEPROM_MAGIC 0x0341a034 -#define OMNIA_I2C_MCU_DM_NAME "i2c@0" +#define OMNIA_I2C_MCU_DM_NAME "i2c@11000->i2cmux@70->i2c@0" #define OMNIA_I2C_MCU_ADDR_STATUS 0x1 #define OMNIA_I2C_MCU_SATA 0x20 #define OMNIA_I2C_MCU_CARDDET 0x10