From patchwork Tue May 18 19:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Leis X-Patchwork-Id: 12265561 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A519C433B4 for ; Tue, 18 May 2021 19:51:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3C93610CD for ; Tue, 18 May 2021 19:51:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3C93610CD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj5kf-0007yl-1B for qemu-devel@archiver.kernel.org; Tue, 18 May 2021 15:51:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3dhikYAcKCkM0jsyzwjlttlqj.htrvjrz-ij0jqstslsz.twl@flex--venture.bounces.google.com>) id 1lj5b7-00069k-Aa for qemu-devel@nongnu.org; Tue, 18 May 2021 15:41:45 -0400 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]:56281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3dhikYAcKCkM0jsyzwjlttlqj.htrvjrz-ij0jqstslsz.twl@flex--venture.bounces.google.com>) id 1lj5b5-0003i1-P8 for qemu-devel@nongnu.org; Tue, 18 May 2021 15:41:45 -0400 Received: by mail-yb1-xb4a.google.com with SMTP id o6-20020a5b06460000b02905004326697dso14798683ybq.22 for ; Tue, 18 May 2021 12:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=O9O4reEPqLUeYKHwxWKxGpiPoeJSbBXfRrJaRXnaRIE=; b=G2sobRNl/5RLrSEjgjh9UTm/0Ld0mh36P29VmtW6WJsuQcfAKzs5mnFpxoudiZ+FLI O27DCUyQuyuCAwtO2m57wu1PJf9dq+9gYrAVJ1nLyDy/l4pg8bNvfR0qaT/QAnAb5YF4 vpDeevk3skRfUp5fa8cLEMCnQ5l2P/5VrhOR5UdD9ZRIOsh4/H195EE06+ZiWAIskSEM jvjEBd59adD5ibre3h1XbMMabRi+agf+7XM02ODS/iNlmZ5sEyMKk1zd4cZ40xh3B6S8 /Z0oJrGJPoATshLOxORt9O3AekbzTt99KOZzrhV9AWktOwypAJFDmqtWcB0pB6ogGxcW UvXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=O9O4reEPqLUeYKHwxWKxGpiPoeJSbBXfRrJaRXnaRIE=; b=fOgKxjK+zlMbCrF14s26Y/3qEf0he/kKPV1Le7ZOhCP4K2YqQJLD+MnSsmtCX1L5ov JfODiyaop2n9S1WkQOsNra83or29KhmfZXuCj4dL9/xtUE6xGPGBK4Vz/nzho2yYc0xL 1DEpFUrK/9++ztubDF8qUpI4oG9H9ODS/QUAS2K9eSNjvcY8pL7HwoOgrGSUTio5FMsR jlGGGGonut2Y+Y/BoOiKT8+6RH0cTQZQfAkIOGR9LVQBEBIuRkEvMjMQWqS9IWN0ogy6 kQVBpuk6zV6j0ZuUgksHVdZPb/ux76jnoTKTQM9qVH7KwF8npQlOyKsXNounQCJVUin9 LC+Q== X-Gm-Message-State: AOAM533ZhcRFSl5sPGTUFYVGe90arKoCpGSokhzSi94XOT4KmY8EC0UX z+tlA0h/egLnOWtjGKp6esCqZQBYOkW9 X-Google-Smtp-Source: ABdhPJz/OcBApN6eUd87jM5ob68UzR/CNl4Yrd0wxpzKAo/XKMauGA4HlZXXXd8EEIZ67GUhDXtCPu/cQqLz X-Received: from venture.svl.corp.google.com ([2620:15c:2a3:200:5902:8a04:d917:4e93]) (user=venture job=sendgmr) by 2002:a25:7085:: with SMTP id l127mr10221604ybc.293.1621366902104; Tue, 18 May 2021 12:41:42 -0700 (PDT) Date: Tue, 18 May 2021 12:41:18 -0700 In-Reply-To: <20210518194118.755410-1-venture@google.com> Message-Id: <20210518194118.755410-5-venture@google.com> Mime-Version: 1.0 References: <20210518194118.755410-1-venture@google.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH 4/4] aspeed: sonorapass: enable pca954x muxes From: Patrick Venture To: hskinnemoen@google.com, kfting@nuvoton.com, clg@kaod.org, peter.maydell@linaro.org, andrew@aj.id.au, joel@jms.id.au Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Patrick Venture , Hao Wu Received-SPF: pass client-ip=2607:f8b0:4864:20::b4a; envelope-from=3dhikYAcKCkM0jsyzwjlttlqj.htrvjrz-ij0jqstslsz.twl@flex--venture.bounces.google.com; helo=mail-yb1-xb4a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Enables the pca954x muxes in the bmc board configuration. Signed-off-by: Patrick Venture Reviewed-by: Hao Wu --- hw/arm/aspeed.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 35a28b0e8b..27fd51980c 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -541,14 +541,16 @@ static void swift_bmc_i2c_init(AspeedMachineState *bmc) static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) { + I2CSlave *i2c_mux; AspeedSoCState *soc = &bmc->soc; /* bus 2 : */ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x48); i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x49); - /* bus 2 : pca9546 @ 0x73 */ + i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "pca9546", 0x73); - /* bus 3 : pca9548 @ 0x70 */ + /* bus 3 : */ + i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9548", 0x70); /* bus 4 : */ uint8_t *eeprom4_54 = g_malloc0(8 * 1024); @@ -562,7 +564,7 @@ static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) /* bus 6 : */ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x48); i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x49); - /* bus 6 : pca9546 @ 0x73 */ + i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "pca9546", 0x73); /* bus 8 : */ uint8_t *eeprom8_56 = g_malloc0(8 * 1024); @@ -573,14 +575,12 @@ static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) /* bus 8 : adc128d818 @ 0x1d */ /* bus 8 : adc128d818 @ 0x1f */ - /* - * bus 13 : pca9548 @ 0x71 - * - channel 3: - * - tmm421 @ 0x4c - * - tmp421 @ 0x4e - * - tmp421 @ 0x4f - */ - + /* bus 13 : */ + i2c_mux = i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 13), + "pca9548", 0x71); + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 3), "tmp421", 0x4c); + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 3), "tmp421", 0x4e); + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 3), "tmp421", 0x4f); } static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)