From patchwork Thu Sep 26 06:55:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Potin Lai X-Patchwork-Id: 13812915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A598DCCF9E9 for ; Thu, 26 Sep 2024 07:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tOJeAQBgJ2clDphyw+PZwbFI1eIa6mgTGdFOxyjksqw=; b=qpmTwsJyZ5dWPG151+hIy+NVCg qzlHnbnDcOV+LoZypnLYq+pln8WQ8EdEvbXzfoF3I/mQi0icWml951yVc4Q1CffVCUktlo6LaQZ5H 13nRjG0rkvM24ZV7ola4aPlXjoONTWTPXfr+Q6MhLcNe7+Wmwye1AfW95yePHtSkhdJ3dhEQ0Fedc Ie3xH+DiwtG/Kuh6hCtwj1qPqRCpdupqlLhs9omMGRtB6LetPmh4oPINSfneXjTkZ/nYJTugcakvT XTfTCL7Rux9gxH0jTC8el/61EvGKOIOl+UteiasGxVPAnN3B3/HWkLT/yiN/r97+GfATjZAFBuMRN HbLqeyow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1stilG-00000007Tyi-1OE6; Thu, 26 Sep 2024 07:18:02 +0000 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1stiRt-00000007Q6h-3Syx for linux-arm-kernel@lists.infradead.org; Thu, 26 Sep 2024 06:58:03 +0000 Received: by mail-ot1-x330.google.com with SMTP id 46e09a7af769-71116d8504bso374341a34.3 for ; Wed, 25 Sep 2024 23:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727333880; x=1727938680; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tOJeAQBgJ2clDphyw+PZwbFI1eIa6mgTGdFOxyjksqw=; b=l1BMuPSUxKKjo95tqk8xlHSk7zjKE+U8G4C6gFDTrO9O02MsyyWFn3x25TP/iUtHh2 gRhsksKQitCeDaJ/DpdJ2RuBonUr+3jvKu39rXK1+Uq8ItsqdQiCuJhrLv+1W35I4Q9D 19qaGF+TdDrINYE/VQTbYxWfRFmaKK9/iM6ypNeCNRxuR3V4Pn9a7Prs3Ekj1YSY73R8 o8vfVym9r65dpTwJ/czSyWdDtD2hHjoHF/oHVJKoHho3LYZGqYWwNvWmsyHHCdc3zUD2 iVCe2F/nXCPOjqcRhGq3n4Ks6333h+Zcbg3gvGs0U/fUiFmFK5xm1f1JiyXSiDgyi+vh eonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727333880; x=1727938680; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tOJeAQBgJ2clDphyw+PZwbFI1eIa6mgTGdFOxyjksqw=; b=Xjlm2SM7JF9T3cYYJZdu6zwmZSnhG01knRoDRtX4dA2vwKLB0KXcpb85YwbAqrpS8n T0f+fWO+yC1I4JDWcOOTTk4I59AbF4QZm758tbDHI0YJ74gZxZwo4CAuO3z6mo1B4AtI hu74BtL4omdssOWKG2son8M1MQ+AsCDSfBZflLekOjt5GTvMIaIxXIUo2GU3NjUKzUn9 wTQCJTCwNo/GZmBNvZS1Ans7X7P/LbJW3uHzTcb4Lp6D4btoEaYm9vLd+u0XY1ykquN9 z3nEZzgL5zxYOt3KrmGeQs4HLwF2a68CPvFaRfKX9Sa8lS1Cea13VPm5a0EK9VR6x6KS vSNA== X-Forwarded-Encrypted: i=1; AJvYcCViaBpsfk/jOZ8ri+C2IjOV0YAKoDJMLOmbJX33dwEcIUretGOIGiNi+HY7ff8Y2N+6v0AkvIHzSt7ngQgY+8jx@lists.infradead.org X-Gm-Message-State: AOJu0Yy4avb3Q4VFhSMlzDCYJKRSJN9jl3fJWX2Mo7mHYQawCAsJr584 dHeag4wpobU+YPPwOkLwX4BsJXZv722v10KSNO0Bit5Bd/8efGpiPX57XA== X-Google-Smtp-Source: AGHT+IExWK+57Nv4bnkY6Z4Z3F5Ia4gqBkNVZyx9LkGlgz4UdeGz9WEEAh9zY+ip9cLnrr+1vzswXQ== X-Received: by 2002:a05:6359:5fa6:b0:1b8:32b5:4e90 with SMTP id e5c5f4694b2df-1bea86a70f4mr220637455d.27.1727333880448; Wed, 25 Sep 2024 23:58:00 -0700 (PDT) Received: from localhost.localdomain (61-220-246-151.hinet-ip.hinet.net. [61.220.246.151]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6b7c51112sm3656709a12.42.2024.09.25.23.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 23:58:00 -0700 (PDT) From: Potin Lai Date: Thu, 26 Sep 2024 14:55:31 +0800 Subject: [PATCH 1/2] ARM: dts: aspeed: catalina: move hdd board i2c mux bus to i2c5 MIME-Version: 1.0 Message-Id: <20240926-catalina-evt-dvt-system-modify-v1-1-84a27b47040b@gmail.com> References: <20240926-catalina-evt-dvt-system-modify-v1-0-84a27b47040b@gmail.com> In-Reply-To: <20240926-catalina-evt-dvt-system-modify-v1-0-84a27b47040b@gmail.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , Patrick Williams Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org, Potin Lai , Potin Lai X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1727333875; l=4559; i=potin.lai.pt@gmail.com; s=20240724; h=from:subject:message-id; bh=bVHCPsMjz6la14pOQHSDdWP8VOORoHkUheYAAgbPX2g=; b=FbMAYYDOp4IUOZBWRvqxzcluqfEkK3cvoWaLbUyyAfYkdWaLSpyoH9naFSdYvHzf267hQ/ODN x7ArvoNb9IjA4UYMRfxxklZG8nU5hR9CtEpfEF29lKp+7dzbysU8416 X-Developer-Key: i=potin.lai.pt@gmail.com; a=ed25519; pk=6Z4H4V4fJwLteH/WzIXSsx6TkuY5FOcBBP+4OflJ5gM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240925_235801_910777_65910D43 X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Potin Lai Due to EVT hardware changes, move HDD board i2c mux bus from i2c30 to i2c5. Signed-off-by: Potin Lai --- .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 165 +++++++++++---------- 1 file changed, 83 insertions(+), 82 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts index fa0921a4afe2..eac6e33e98f4 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts @@ -50,14 +50,14 @@ aliases { i2c45 = &i2c0mux5ch1; i2c46 = &i2c0mux5ch2; i2c47 = &i2c0mux5ch3; - i2c48 = &i2c30mux0ch0; - i2c49 = &i2c30mux0ch1; - i2c50 = &i2c30mux0ch2; - i2c51 = &i2c30mux0ch3; - i2c52 = &i2c30mux0ch4; - i2c53 = &i2c30mux0ch5; - i2c54 = &i2c30mux0ch6; - i2c55 = &i2c30mux0ch7; + i2c48 = &i2c5mux0ch0; + i2c49 = &i2c5mux0ch1; + i2c50 = &i2c5mux0ch2; + i2c51 = &i2c5mux0ch3; + i2c52 = &i2c5mux0ch4; + i2c53 = &i2c5mux0ch5; + i2c54 = &i2c5mux0ch6; + i2c55 = &i2c5mux0ch7; }; chosen { @@ -244,80 +244,6 @@ i2c0mux1ch2: i2c@2 { #address-cells = <1>; #size-cells = <0>; reg = <2>; - i2c-mux@70 { - compatible = "nxp,pca9548"; - reg = <0x70>; - #address-cells = <1>; - #size-cells = <0>; - i2c-mux-idle-disconnect; - - i2c30mux0ch0: i2c@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - }; - i2c30mux0ch1: i2c@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - }; - i2c30mux0ch2: i2c@2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <2>; - }; - i2c30mux0ch3: i2c@3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <3>; - }; - i2c30mux0ch4: i2c@4 { - #address-cells = <1>; - #size-cells = <0>; - reg = <4>; - }; - i2c30mux0ch5: i2c@5 { - #address-cells = <1>; - #size-cells = <0>; - reg = <5>; - }; - i2c30mux0ch6: i2c@6 { - #address-cells = <1>; - #size-cells = <0>; - reg = <6>; - // HDD FRU EEPROM - eeprom@52 { - compatible = "atmel,24c64"; - reg = <0x52>; - }; - }; - i2c30mux0ch7: i2c@7 { - #address-cells = <1>; - #size-cells = <0>; - reg = <7>; - - power-sensor@40 { - compatible = "ti,ina230"; - reg = <0x40>; - shunt-resistor = <2000>; - }; - power-sensor@41 { - compatible = "ti,ina230"; - reg = <0x41>; - shunt-resistor = <2000>; - }; - power-sensor@44 { - compatible = "ti,ina230"; - reg = <0x44>; - shunt-resistor = <2000>; - }; - power-sensor@45 { - compatible = "ti,ina230"; - reg = <0x45>; - shunt-resistor = <2000>; - }; - }; - }; }; i2c0mux1ch3: i2c@3 { #address-cells = <1>; @@ -647,6 +573,81 @@ &i2c4 { &i2c5 { status = "okay"; + + i2c-mux@70 { + compatible = "nxp,pca9548"; + reg = <0x70>; + #address-cells = <1>; + #size-cells = <0>; + i2c-mux-idle-disconnect; + + i2c5mux0ch0: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + i2c5mux0ch1: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + i2c5mux0ch2: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + i2c5mux0ch3: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; + i2c5mux0ch4: i2c@4 { + #address-cells = <1>; + #size-cells = <0>; + reg = <4>; + }; + i2c5mux0ch5: i2c@5 { + #address-cells = <1>; + #size-cells = <0>; + reg = <5>; + }; + i2c5mux0ch6: i2c@6 { + #address-cells = <1>; + #size-cells = <0>; + reg = <6>; + // HDD FRU EEPROM + eeprom@52 { + compatible = "atmel,24c64"; + reg = <0x52>; + }; + }; + i2c5mux0ch7: i2c@7 { + #address-cells = <1>; + #size-cells = <0>; + reg = <7>; + + power-sensor@40 { + compatible = "ti,ina230"; + reg = <0x40>; + shunt-resistor = <2000>; + }; + power-sensor@41 { + compatible = "ti,ina230"; + reg = <0x41>; + shunt-resistor = <2000>; + }; + power-sensor@44 { + compatible = "ti,ina230"; + reg = <0x44>; + shunt-resistor = <2000>; + }; + power-sensor@45 { + compatible = "ti,ina230"; + reg = <0x45>; + shunt-resistor = <2000>; + }; + }; + }; }; &i2c6 {