From patchwork Fri Mar 29 13:01:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13610620 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 22564C6FD1F for ; Fri, 29 Mar 2024 13:02:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id DD53EC43394; Fri, 29 Mar 2024 13:02:28 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 88D45C433C7 for ; Fri, 29 Mar 2024 13:02:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 88D45C433C7 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id EE7A237948B for ; Fri, 29 Mar 2024 13:05:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XdhkrfhHlnSP for ; Fri, 29 Mar 2024 14:05:45 +0100 (CET) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id 973463793D7; Fri, 29 Mar 2024 14:05:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1711717525; bh=4G+G6BuM+cMP6rEZ/uaw8UHoFG85g2A3tKcOaMLiEvY=; h=From:To:Subject:Date:In-Reply-To:References; b=p5XN+y9z9I88hiQ3MEw1lqBDxoGJmvKX6uSVIi2OFwnC9lkaTMyjSFhCkMcC5LMct DFnvhpI0EiaxtGx5oecuoGkg5W2zT62KRg1gh3zW+5NWzbpIEcSJNZ9LK4M2VBeWw+ lOsD2AWixC3PcL/5CHSH0g5GB22Mb3frtKO7c9wk= From: Renze Nicolai List-Id: To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au, renze@rnplus.nl Subject: [PATCH 1/3] ARM: dts: Modify GPIO table for Asrock X570D4U BMC Date: Fri, 29 Mar 2024 14:01:39 +0100 Message-ID: <20240329130152.878944-2-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240329130152.878944-1-renze@rnplus.nl> References: <20240329130152.878944-1-renze@rnplus.nl> MIME-Version: 1.0 This commit removes button-nmi-n, this board does not have support for an NMI button. Input status-locatorled-n has been renamed to input-locatorled-n to better indicate the signal type. The suffix -n has been appended to the name of control-locatorbutton, button-power, control-power, button-reset, control-reset, input-id0, input-id1, input-id2, output-bmc-ready to reflect the inverted signal polarity. GPIO output-rtc-battery-voltage-read-enable has been renamed to output-hwm-vbat-enable, input-alert1-n to input-aux-smb-alert-n, input-alert3-n to input-psu-smb-alert-n, input-mfg to input-mfg-mode-n and input-caseopen to input-case-open-n. And GPIOs input-bmc-smb-present-n, input-pcie-wake-n, input-sleep-s3-n, input-sleep-s5-n and input-power-good have been added. Signed-off-by: Renze Nicolai --- .../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index 3c975bc41ae7..34bc382bf492 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -79,64 +79,64 @@ iio-hwmon { &gpio { status = "okay"; gpio-line-names = - /*A0-A3*/ "status-locatorled-n", "", "button-nmi-n", "", - /*A4-A7*/ "", "", "", "", - /*B0-B3*/ "input-bios-post-cmplt-n", "", "", "", - /*B4-B7*/ "", "", "", "", - /*C0-C3*/ "", "", "", "", - /*C4-C7*/ "", "", "control-locatorbutton", "", - /*D0-D3*/ "button-power", "control-power", "button-reset", "control-reset", - /*D4-D7*/ "", "", "", "", - /*E0-E3*/ "", "", "", "", - /*E4-E7*/ "", "", "", "", - /*F0-F3*/ "", "", "", "", - /*F4-F7*/ "", "", "", "", - /*G0-G3*/ "output-rtc-battery-voltage-read-enable", "input-id0", "input-id1", "input-id2", - /*G4-G7*/ "input-alert1-n", "input-alert2-n", "input-alert3-n", "", - /*H0-H3*/ "", "", "", "", - /*H4-H7*/ "input-mfg", "", "led-heartbeat-n", "input-caseopen", - /*I0-I3*/ "", "", "", "", - /*I4-I7*/ "", "", "", "", - /*J0-J3*/ "output-bmc-ready", "", "", "", - /*J4-J7*/ "", "", "", "", - /*K0-K3*/ "", "", "", "", - /*K4-K7*/ "", "", "", "", - /*L0-L3*/ "", "", "", "", - /*L4-L7*/ "", "", "", "", - /*M0-M3*/ "", "", "", "", - /*M4-M7*/ "", "", "", "", - /*N0-N3*/ "", "", "", "", - /*N4-N7*/ "", "", "", "", - /*O0-O3*/ "", "", "", "", - /*O4-O7*/ "", "", "", "", - /*P0-P3*/ "", "", "", "", - /*P4-P7*/ "", "", "", "", - /*Q0-Q3*/ "", "", "", "", - /*Q4-Q7*/ "", "", "", "", - /*R0-R3*/ "", "", "", "", - /*R4-R7*/ "", "", "", "", - /*S0-S3*/ "input-bmc-pchhot-n", "", "", "", - /*S4-S7*/ "", "", "", "", - /*T0-T3*/ "", "", "", "", - /*T4-T7*/ "", "", "", "", - /*U0-U3*/ "", "", "", "", - /*U4-U7*/ "", "", "", "", - /*V0-V3*/ "", "", "", "", - /*V4-V7*/ "", "", "", "", - /*W0-W3*/ "", "", "", "", - /*W4-W7*/ "", "", "", "", - /*X0-X3*/ "", "", "", "", - /*X4-X7*/ "", "", "", "", - /*Y0-Y3*/ "", "", "", "", - /*Y4-Y7*/ "", "", "", "", - /*Z0-Z3*/ "", "", "led-fault-n", "output-bmc-throttle-n", - /*Z4-Z7*/ "", "", "", "", - /*AA0-AA3*/ "input-cpu1-thermtrip-latch-n", "", "input-cpu1-prochot-n", "", - /*AA4-AC7*/ "", "", "", "", - /*AB0-AB3*/ "", "", "", "", - /*AB4-AC7*/ "", "", "", "", - /*AC0-AC3*/ "", "", "", "", - /*AC4-AC7*/ "", "", "", ""; + /*A0-A3*/ "input-locatorled-n", "", "", "", + /*A4-A7*/ "", "", "", "", + /*B0-B3*/ "input-bios-post-cmplt-n", "", "", "", + /*B4-B7*/ "", "", "", "", + /*C0-C3*/ "", "", "", "", + /*C4-C7*/ "", "", "control-locatorbutton-n", "", + /*D0-D3*/ "button-power-n", "control-power-n", "button-reset-n", "control-reset-n", + /*D4-D7*/ "", "", "", "", + /*E0-E3*/ "", "", "", "", + /*E4-E7*/ "", "", "", "", + /*F0-F3*/ "", "", "", "", + /*F4-F7*/ "", "", "", "", + /*G0-G3*/ "output-hwm-vbat-enable", "input-id0-n", "input-id1-n", "input-id2-n", + /*G4-G7*/ "input-aux-smb-alert-n", "", "input-psu-smb-alert-n", "", + /*H0-H3*/ "", "", "", "", + /*H4-H7*/ "input-mfg-mode-n", "", "led-heartbeat-n", "input-case-open-n", + /*I0-I3*/ "", "", "", "", + /*I4-I7*/ "", "", "", "", + /*J0-J3*/ "output-bmc-ready-n", "", "", "", + /*J4-J7*/ "", "", "", "", + /*K0-K3*/ "", "", "", "", + /*K4-K7*/ "", "", "", "", + /*L0-L3*/ "", "", "", "", + /*L4-L7*/ "", "", "", "", + /*M0-M3*/ "", "", "", "", + /*M4-M7*/ "", "", "", "", + /*N0-N3*/ "", "", "", "", + /*N4-N7*/ "", "", "", "", + /*O0-O3*/ "", "", "", "", + /*O4-O7*/ "", "", "", "", + /*P0-P3*/ "", "", "", "", + /*P4-P7*/ "", "", "", "", + /*Q0-Q3*/ "", "", "", "", + /*Q4-Q7*/ "input-bmc-smb-present-n", "", "", "input-pcie-wake-n", + /*R0-R3*/ "", "", "", "", + /*R4-R7*/ "", "", "", "", + /*S0-S3*/ "input-bmc-pchhot-n", "", "", "", + /*S4-S7*/ "", "", "", "", + /*T0-T3*/ "", "", "", "", + /*T4-T7*/ "", "", "", "", + /*U0-U3*/ "", "", "", "", + /*U4-U7*/ "", "", "", "", + /*V0-V3*/ "", "", "", "", + /*V4-V7*/ "", "", "", "", + /*W0-W3*/ "", "", "", "", + /*W4-W7*/ "", "", "", "", + /*X0-X3*/ "", "", "", "", + /*X4-X7*/ "", "", "", "", + /*Y0-Y3*/ "input-sleep-s3-n", "input-sleep-s5-n", "", "", + /*Y4-Y7*/ "", "", "", "", + /*Z0-Z3*/ "", "", "led-fault-n", "output-bmc-throttle-n", + /*Z4-Z7*/ "", "", "", "", + /*AA0-AA3*/ "input-cpu1-thermtrip-latch-n", "", "input-cpu1-prochot-n", "", + /*AA4-AC7*/ "", "", "", "", + /*AB0-AB3*/ "", "input-power-good", "", "", + /*AB4-AC7*/ "", "", "", "", + /*AC0-AC3*/ "", "", "", "", + /*AC4-AC7*/ "", "", "", ""; }; &fmc { From patchwork Fri Mar 29 13:01:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13610621 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0415BCD128D for ; Fri, 29 Mar 2024 13:02:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id DDEB9C433F1; Fri, 29 Mar 2024 13:02:31 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 9C79CC43399 for ; Fri, 29 Mar 2024 13:02:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 9C79CC43399 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id A064A3793D7 for ; Fri, 29 Mar 2024 13:05:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 04_LhndWjTfq for ; Fri, 29 Mar 2024 14:05:47 +0100 (CET) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id 0672237947A; Fri, 29 Mar 2024 14:05:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1711717526; bh=5PYPUmi19U+0jj9vdpCCTkSTJgKRWQ8R0dIQUA2UZbQ=; h=From:To:Subject:Date:In-Reply-To:References; b=fBVHIO8hCb0A1p99N4Btml3jm86eC3uivf3DR0owUhSW/RIz4SyzKyclEFfEIRA9N e4bGLksiqZcXJvb1IK9ksr7jtCAnTY7rp5VYUzdcER72DPzZimAZz46tVqaI5MTp/Y Ug/v3hWNqdjOfWBLFEBcORdoxnLk+ecl5Kk3gwto= From: Renze Nicolai List-Id: To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au, renze@rnplus.nl Subject: [PATCH 2/3] ARM: dts: Disable unused ADC channels for Asrock X570D4U BMC Date: Fri, 29 Mar 2024 14:01:40 +0100 Message-ID: <20240329130152.878944-3-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240329130152.878944-1-renze@rnplus.nl> References: <20240329130152.878944-1-renze@rnplus.nl> MIME-Version: 1.0 This commit disables unused ADC channels and labels the ADC channels used with their function. Signed-off-by: Renze Nicolai --- .../dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index 34bc382bf492..e93c2f0b8414 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -358,20 +358,17 @@ fan@5 { &adc { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_adc0_default - &pinctrl_adc1_default - &pinctrl_adc2_default - &pinctrl_adc3_default - &pinctrl_adc4_default - &pinctrl_adc5_default - &pinctrl_adc6_default - &pinctrl_adc7_default - &pinctrl_adc8_default - &pinctrl_adc9_default - &pinctrl_adc10_default - &pinctrl_adc11_default - &pinctrl_adc12_default - &pinctrl_adc13_default - &pinctrl_adc14_default - &pinctrl_adc15_default>; + pinctrl-0 = <&pinctrl_adc0_default /* 3VSB */ + &pinctrl_adc1_default /* 5VSB */ + &pinctrl_adc2_default /* VCPU */ + &pinctrl_adc3_default /* VSOC */ + &pinctrl_adc4_default /* VCCM */ + &pinctrl_adc5_default /* APU-VDDP */ + &pinctrl_adc6_default /* PM-VDD-CLDO */ + &pinctrl_adc7_default /* PM-VDDCR-S5 */ + &pinctrl_adc8_default /* PM-VDDCR */ + &pinctrl_adc9_default /* VBAT */ + &pinctrl_adc10_default /* 3V */ + &pinctrl_adc11_default /* 5V */ + &pinctrl_adc12_default>; /* 12V */ }; From patchwork Fri Mar 29 13:01:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Renze Nicolai X-Patchwork-Id: 13610622 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F39CBCD128A for ; Fri, 29 Mar 2024 13:02:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id DDEF0C43394; Fri, 29 Mar 2024 13:02:31 +0000 (UTC) Received: from mail.rnplus.nl (mail.rnplus.nl [178.251.25.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 8E435C433C7 for ; Fri, 29 Mar 2024 13:02:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 8E435C433C7 Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=rnplus.nl Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=rnplus.nl Received: from localhost (unknown [127.0.0.1]) by mail.rnplus.nl (Postfix) with ESMTP id 9C4BD379499 for ; Fri, 29 Mar 2024 13:05:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at rnplus.nl Received: from mail.rnplus.nl ([127.0.0.1]) by localhost (mail.rnplus.nl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wrMAxan0SjKV for ; Fri, 29 Mar 2024 14:05:48 +0100 (CET) Received: from localhost.localdomain (184-179-179-143.ftth.glasoperator.nl [143.179.179.184]) by mail.rnplus.nl (Postfix) with ESMTPSA id F015C37947B; Fri, 29 Mar 2024 14:05:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rnplus.nl; s=dkim; t=1711717527; bh=fAvAnvABUo7HyKuMjevhf/jv5qC2EXV4aai6G+pLpAA=; h=From:To:Subject:Date:In-Reply-To:References; b=zujQAt4VCctGPhyNc7BqplQeCWC4PHXqkNF1G8Bp1BgJrkLCm78UrJpy3qm7nXQ6q ytsDDNWm9eQolzBUvRxMfFbd1CzWPMwEJj26tzsegM3jbO0JGB6/0p0ZWh7ycoixvC 21bFBmKbEFVoFxZZpz8WMrWmyf7GuIAOteC3T6vA= From: Renze Nicolai List-Id: To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, arnd@arndb.de, olof@lixom.net, soc@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, joel@jms.id.au, andrew@aj.id.au, renze@rnplus.nl Subject: [PATCH 3/3] ARM: dts: Modify I2C bus configuration Date: Fri, 29 Mar 2024 14:01:41 +0100 Message-ID: <20240329130152.878944-4-renze@rnplus.nl> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240329130152.878944-1-renze@rnplus.nl> References: <20240329130152.878944-1-renze@rnplus.nl> MIME-Version: 1.0 This commit enables I2C bus 8 which is exposed on the IPMB_1 connector on the X570D4U mainboard. Additionally it adds a descriptive comment to I2C busses 1 and 5. Signed-off-by: Renze Nicolai --- arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts index e93c2f0b8414..3b1c77a12605 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts @@ -183,6 +183,7 @@ &i2c0 { }; &i2c1 { + /* Hardware monitoring SMBus */ status = "okay"; w83773g@4c { @@ -240,6 +241,7 @@ i2c4mux0ch3: i2c@3 { }; &i2c5 { + /* SMBus on BMC connector (BMC_SMB_1) */ status = "okay"; }; @@ -264,6 +266,11 @@ eth1_macaddress: macaddress@3f88 { }; }; +&i2c8 { + /* SMBus on intelligent platform management bus header (IPMB_1) */ + status = "okay"; +}; + &gfx { status = "okay"; };