From patchwork Fri Sep 22 06:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delphine CC Chiu X-Patchwork-Id: 13395013 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 735C8E7D0D2 for ; Fri, 22 Sep 2023 06:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=F9b9oIitcaa3XjUH4j/IYRR/YYdA1vnrLAaC2vPOd+8=; b=MjvE0hz1IRksUn ASUkry9g7gQnvttLhXrW4LDxtLDBiSC8TT7xeEOmSWCIXQwt7M/6aW7O9WJtvK8ahCJewMpCAtwKk 22maswwHHP94vzaGnkkn4ORXDSljkxYD4nNmw7Q/FawJBoVANNP7bGjKpC24oCqwqZDKMUpm1EH9t dAUF/Lzu9xrTy1aAz3nloqHGQMJm3wQjF4xirQpE8ETulCS/LJo8AJxWCJDvtH40Y2E1Ts1danAp0 NsMMFQ5aLnmc4HRw4+pxiTL9pWcEmidYQ2sD9+/1xRs4srgPO9VIkjW9h8nLj+eEUVqEPoUsji6N8 f4VAMsXxfNBimniwBeGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjZrQ-0084N6-1j; Fri, 22 Sep 2023 06:41:56 +0000 Received: from mail-psaapc01on20617.outbound.protection.outlook.com ([2a01:111:f400:feae::617] helo=APC01-PSA-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qjZrJ-0084KU-01 for linux-arm-kernel@lists.infradead.org; Fri, 22 Sep 2023 06:41:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CmTv61u0ffnIOTavWud5eLll5z5GPbRk7ycj7fQkrlaFwFSYKf5z3O7MVdY9toVWb/jCOEp4BYSopWCjxDuPHt41Gn6JkUn/7AH57/YDoeFKYCuWT6zj3hw8AUsZad/iSN+GzB4kMUM5CrALVv5uw7PxkzYjjBElxlGaW0HtVYzrcu06LFGeYXvJc5YwZMviA9a8Y3DvbEPwBfANBUS0AE2/mlToMals+G07U5bvxorJBSqK3w256bpLWN8LGyMA2A+kWSveqmT6zZ8uCmZCPhjcrVAx+4IWvAC5OD658Dgr7mG7gsvpJczJ1rT+ugxbCXc6ILky7iacaUqrPfEDhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mFZHh1zztR7o6FMa5JNu1m472bTRmXys5ofCl/JbBA8=; b=YUaW/zJQZIaJVJvOQkZkqOKalo3TMdMu4ZuwZdWgLOGRO3JWw2B2/4Bpy3De8VLs2032e8JF5i1R0rr8MqIGIzGOSdWrPYop2TZ/vOw9oyQP/r7aQ+seJEWQG7uH89YPlrQxeHo2gNM8/ocXfokH+Jt3rkdl0oWLsXmx0Jh0S/yTPhhUR6vVkHPj6I1d3gSgXtOiiOdv86zVfholgxUQsBLf5hF30lZlK22LeBpmvgBaXULAb8orWxYSiX8emko8zk6BRByyb6R3obOiONYQrfFjV0SneUnHZMNbcKovzceNmRogq9GVerzwkzJU6hw3PnqzujCG4P0cUS9l/XQapw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 211.20.1.79) smtp.rcpttodomain=stwcx.xyz smtp.mailfrom=wiwynn.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=wiwynn.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wiwynn.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mFZHh1zztR7o6FMa5JNu1m472bTRmXys5ofCl/JbBA8=; b=BGMbfBWoXSgYBWl3jRtuulivd0yo2TduKmmCJ5AjgyO/i9EI8tM4Bdg9iwyqfE+TKl7HpCJSIsZ3glQzUlJ5cuznh21QtWmoPFXWldxKbgiRH8miPYNq03cCD5nG7IVcqdqTcbpbxmVuAwKH6jKYJPKA/QzMBQVxOf20ZD/1a7fwXKvbuOUB/gqVgnFm9455vGj0D1izCBSIrMbYsb5nTFs3Mk/tYvpYu2XTw52S8p6QFsSA4eVG1n9PHbKD0TqCQTHZPJZ8Lel0fEisttGafunxL6xO//5ts6wqMEO9oaZwlS+uyVAScNWQ08wTqomofXRPEBUXgruabxWoSPWOGQ== Received: from KL1PR01CA0099.apcprd01.prod.exchangelabs.com (2603:1096:820:3::15) by SEZPR04MB5729.apcprd04.prod.outlook.com (2603:1096:101:70::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.22; Fri, 22 Sep 2023 06:41:34 +0000 Received: from HK3PEPF00000221.apcprd03.prod.outlook.com (2603:1096:820:3:cafe::81) by KL1PR01CA0099.outlook.office365.com (2603:1096:820:3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.31 via Frontend Transport; Fri, 22 Sep 2023 06:41:34 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 211.20.1.79) smtp.mailfrom=wiwynn.com; dkim=none (message not signed) header.d=none;dmarc=fail action=quarantine header.from=wiwynn.com; Received-SPF: Fail (protection.outlook.com: domain of wiwynn.com does not designate 211.20.1.79 as permitted sender) receiver=protection.outlook.com; client-ip=211.20.1.79; helo=localhost.localdomain; Received: from localhost.localdomain (211.20.1.79) by HK3PEPF00000221.mail.protection.outlook.com (10.167.8.43) with Microsoft SMTP Server id 15.20.6792.20 via Frontend Transport; Fri, 22 Sep 2023 06:41:34 +0000 From: Delphine CC Chiu To: patrick@stwcx.xyz, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery Cc: Delphine CC Chiu , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/1] ARM: dts: aspeed: yosemite4: Add i2c-mux/eeprom devices Date: Fri, 22 Sep 2023 14:41:26 +0800 Message-Id: <20230922064127.283625-2-Delphine_CC_Chiu@wiwynn.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230922064127.283625-1-Delphine_CC_Chiu@wiwynn.com> References: <20230922064127.283625-1-Delphine_CC_Chiu@wiwynn.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK3PEPF00000221:EE_|SEZPR04MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 95802063-7398-4ea5-0c5f-08dbbb36f699 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wij/uhw4rDe5si8yM+0WmTL47qK0jPy+/8z64ahMrvk6tijNAwo/SgPdnSIO7Kv8Ham25QRxmiFD1PufK1J5JMIlDZCkFPf1xWCo6gnAEMdaS5SVYqRUf1ligC/MDl7uP18JDoaBvPa5ubTRIosYIrsRT7/SanwyvssJhC5r7adrbXn2tCruj5qBKlc4af3P1dyKD5fGM492LSf5FvBNAlbU56GK0YPC47rYZki7nYKK0Ck0pYj/FIMdbFE/JeoszWgn8UcAHyXuYRyJEa3NXDlH/g3dR/Vm+sO1G3rKRGCy2yV1g/nwTTH6XnR6XnY6fZVPIYY8EjDlx+upxbgK9Zn20cSOSJi7hYS6X983Izf94idj2t55mjpOHpik6gDWZ10g7yzJ4cRiviVR4IW/dSFWmJxVvAkc2piDh1jZVsrJZZ187CNh07XvWjTfDL7eioLlk1thxZhoNTyx0T+vJfvhxIkLHfW8alwLq1uN5Lz20OuPaXluPaAgFRdEVmgHWFO6Uknlh+YeEGLNfOCrRcCAicrecW6QyR+P1YN2E3YyunVKEGSx+vPA3F2jOXaTg+dd34EOk3bOWEApJwNMlMyb3pXueocGX3wYopfsYBdgKa3TWHLpSDMoYuiYR6NdQCi0m2vGG0CxkLb6ieJNTH2IlpcNMDSGLyEYUxF7E8iKeL7+x86RM8gL1NWGdINhJaFh8cFZx//UhVa2JL4ZSbuMCWIM2tDnHVIgAKYlU6movUKIEkYHrYGgTjppqosQ X-Forefront-Antispam-Report: CIP:211.20.1.79;CTRY:TW;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:localhost.localdomain;PTR:211-20-1-79.hinet-ip.hinet.net;CAT:NONE;SFS:(13230031)(6069001)(4636009)(136003)(376002)(39860400002)(396003)(346002)(451199024)(230921699003)(186009)(1800799009)(82310400011)(36840700001)(46966006)(6506007)(6666004)(6512007)(6486002)(36756003)(81166007)(40480700001)(356005)(86362001)(82740400003)(36860700001)(2616005)(30864003)(2906002)(7416002)(478600001)(956004)(83380400001)(47076005)(26005)(336012)(5660300002)(41300700001)(316002)(110136005)(8936002)(8676002)(4326008)(70206006)(1076003)(36736006)(9316004)(70586007);DIR:OUT;SFP:1101; X-OriginatorOrg: wiwynn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2023 06:41:34.0723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95802063-7398-4ea5-0c5f-08dbbb36f699 X-MS-Exchange-CrossTenant-Id: da6e0628-fc83-4caf-9dd2-73061cbab167 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=da6e0628-fc83-4caf-9dd2-73061cbab167;Ip=[211.20.1.79];Helo=[localhost.localdomain] X-MS-Exchange-CrossTenant-AuthSource: HK3PEPF00000221.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR04MB5729 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230921_234149_199801_7AF0C506 X-CRM114-Status: GOOD ( 10.50 ) 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 Revise Yosemite 4 devicetree for i2c-mux and eeprom, also the following changes: - Enable adc 15, tpm, wdt2 - Change spi-tx/rx-bus-width to duo mode - Add device mp5023, pmbus for Flex power module - Change ina230 to ina233, pca9846 to pca9546 - Set adc128d818 and max31790 config - Add jtag1 and gpio0 config Signed-off-by: Delphine CC Chiu --- Changelog: v1 - Add gpio and eeprom devices - Enable adc 15, tpm, wdt2 - Change spi-tx/rx-bus-width to duo mode - Add device mp5023, pmbus for Flex power module - Change ina230 to ina233, pca9846 to pca9546 - Set adc128d818 and max31790 config - Add jtag1 and gpio0 config - Separate binding dosument to corresponding driver patches --- .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 897 ++++++++++++++++-- 1 file changed, 843 insertions(+), 54 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts index 64075cc41d92..894ee25c2654 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts @@ -17,6 +17,25 @@ aliases { serial6 = &uart7; serial7 = &uart8; serial8 = &uart9; + + i2c16 = &imux16; + i2c17 = &imux17; + i2c18 = &imux18; + i2c19 = &imux19; + i2c20 = &imux20; + i2c21 = &imux21; + i2c22 = &imux22; + i2c23 = &imux23; + i2c24 = &imux24; + i2c25 = &imux25; + i2c26 = &imux26; + i2c27 = &imux27; + i2c28 = &imux28; + i2c29 = &imux29; + i2c30 = &imux30; + i2c31 = &imux31; + i2c32 = &imux32; + i2c33 = &imux33; }; chosen { @@ -32,7 +51,26 @@ iio-hwmon { compatible = "iio-hwmon"; io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>, <&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>, - <&adc1 0>, <&adc1 1>; + <&adc1 0>, <&adc1 1>, <&adc1 7>; + }; + + spi_gpio: spi-gpio { + status = "okay"; + compatible = "spi-gpio"; + #address-cells = <1>; + #size-cells = <0>; + + gpio-sck = <&gpio0 ASPEED_GPIO(X, 3) GPIO_ACTIVE_HIGH>; + gpio-mosi = <&gpio0 ASPEED_GPIO(X, 4) GPIO_ACTIVE_HIGH>; + gpio-miso = <&gpio0 ASPEED_GPIO(X, 5) GPIO_ACTIVE_HIGH>; + num-chipselects = <1>; + cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>; + + tpmdev@0 { + compatible = "tcg,tpm_tis-spi"; + spi-max-frequency = <33000000>; + reg = <0>; + }; }; }; @@ -83,6 +121,13 @@ &wdt1 { aspeed,ext-pulse-duration = <256>; }; +&wdt2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdtrst2_default>; + aspeed,reset-type = "system"; +}; + &mac2 { status = "okay"; pinctrl-names = "default"; @@ -105,15 +150,17 @@ flash@0 { status = "okay"; m25p,fast-read; label = "bmc"; - spi-rx-bus-width = <4>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; spi-max-frequency = <50000000>; -#include "openbmc-flash-layout-64.dtsi" +#include "openbmc-flash-layout-128.dtsi" }; flash@1 { status = "okay"; m25p,fast-read; label = "bmc2"; - spi-rx-bus-width = <4>; + spi-tx-bus-width = <2>; + spi-rx-bus-width = <2>; spi-max-frequency = <50000000>; }; }; @@ -262,6 +309,218 @@ i2c-mux@70 { idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x70>; + + imux16: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux17: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux18: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux19: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; }; }; @@ -273,23 +532,287 @@ i2c-mux@71 { idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x71>; + + imux20: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux21: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux22: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; + + imux23: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@49 { + compatible = "nxp,pca9537"; + reg = <0x49>; + }; + + eeprom@50 { + compatible = "atmel,24c128"; + reg = <0x50>; + }; + + eeprom@51 { + compatible = "atmel,24c128"; + reg = <0x51>; + }; + + eeprom@54 { + compatible = "atmel,24c128"; + reg = <0x54>; + }; + }; }; }; &i2c10 { status = "okay"; bus-frequency = <400000>; + i2c-mux@74 { + compatible = "nxp,pca9544"; + idle-state = <0>; + i2c-mux-idle-disconnect; + reg = <0x74>; + + imux28: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + + imux29: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@24 { + compatible = "nxp,pca9506"; + reg = <0x24>; + gpio-controller; + #gpio-cells = <2>; + }; + }; + }; }; &i2c11 { status = "okay"; power-sensor@10 { - compatible = "adi, adm1272"; + compatible = "adi,adm1272"; reg = <0x10>; }; power-sensor@12 { - compatible = "adi, adm1272"; + compatible = "adi,adm1272"; reg = <0x12>; }; @@ -321,6 +844,11 @@ gpio@23 { #gpio-cells = <2>; }; + power-sensor@40 { + compatible = "mps,mp5023"; + reg = <0x40>; + }; + temperature-sensor@48 { compatible = "ti,tmp75"; reg = <0x48>; @@ -331,20 +859,30 @@ temperature-sensor@49 { reg = <0x49>; }; - temperature-sensor@4a { - compatible = "ti,tmp75"; - reg = <0x4a>; - }; - - temperature-sensor@4b { - compatible = "ti,tmp75"; - reg = <0x4b>; - }; - eeprom@54 { compatible = "atmel,24c256"; reg = <0x54>; }; + + power-sensor@62 { + compatible = "pmbus"; + reg = <0x62>; + }; + + power-sensor@63 { + compatible = "pmbus"; + reg = <0x63>; + }; + + power-sensor@66 { + compatible = "pmbus"; + reg = <0x66>; + }; + + power-sensor@68 { + compatible = "pmbus"; + reg = <0x68>; + }; }; &i2c12 { @@ -361,6 +899,11 @@ eeprom@50 { reg = <0x50>; }; + eeprom@54 { + compatible = "atmel,24c64"; + reg = <0x54>; + }; + rtc@6f { compatible = "nuvoton,nct3018y"; reg = <0x6f>; @@ -370,6 +913,33 @@ rtc@6f { &i2c13 { status = "okay"; bus-frequency = <400000>; + gpio@20 { + compatible = "nxp,pca9506"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@21 { + compatible = "nxp,pca9506"; + reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@22 { + compatible = "nxp,pca9506"; + reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio@23 { + compatible = "nxp,pca9506"; + reg = <0x23>; + gpio-controller; + #gpio-cells = <2>; + }; }; &i2c14 { @@ -378,44 +948,54 @@ &i2c14 { adc@1d { compatible = "ti,adc128d818"; reg = <0x1d>; - ti,mode = /bits/ 8 <2>; + ti,mode = /bits/ 8 <1>; }; adc@35 { compatible = "ti,adc128d818"; reg = <0x35>; - ti,mode = /bits/ 8 <2>; + ti,mode = /bits/ 8 <1>; }; adc@37 { compatible = "ti,adc128d818"; reg = <0x37>; - ti,mode = /bits/ 8 <2>; + ti,mode = /bits/ 8 <1>; }; power-sensor@40 { - compatible = "ti,ina230"; + compatible = "ti,ina233"; reg = <0x40>; + resistor-calibration = /bits/ 16 <0x0a00>; + current-lsb= /bits/ 16 <0x0001>; }; power-sensor@41 { - compatible = "ti,ina230"; + compatible = "ti,ina233"; reg = <0x41>; + resistor-calibration = /bits/ 16 <0x0a00>; + current-lsb= /bits/ 16 <0x0001>; }; power-sensor@42 { - compatible = "ti,ina230"; + compatible = "ti,ina233"; reg = <0x42>; + resistor-calibration = /bits/ 16 <0x0a00>; + current-lsb= /bits/ 16 <0x0001>; }; power-sensor@43 { - compatible = "ti,ina230"; + compatible = "ti,ina233"; reg = <0x43>; + resistor-calibration = /bits/ 16 <0x0a00>; + current-lsb= /bits/ 16 <0x0001>; }; power-sensor@44 { - compatible = "ti,ina230"; + compatible = "ti,ina233"; reg = <0x44>; + resistor-calibration = /bits/ 16 <0x0a00>; + current-lsb= /bits/ 16 <0x0001>; }; temperature-sensor@4e { @@ -433,16 +1013,14 @@ eeprom@51 { reg = <0x51>; }; - i2c-mux@71 { - compatible = "nxp,pca9846"; + i2c-mux@74 { + compatible = "nxp,pca9546"; #address-cells = <1>; #size-cells = <0>; - - idle-state = <0>; i2c-mux-idle-disconnect; - reg = <0x71>; + reg = <0x74>; - i2c@0 { + imux30: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -450,26 +1028,26 @@ i2c@0 { adc@1f { compatible = "ti,adc128d818"; reg = <0x1f>; - ti,mode = /bits/ 8 <2>; + ti,mode = /bits/ 8 <1>; }; pwm@20{ - compatible = "max31790"; + compatible = "maxim,max31790"; + pwm-as-tach = <4 5>; reg = <0x20>; - #address-cells = <1>; - #size-cells = <0>; }; gpio@22{ compatible = "ti,tca6424"; reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; }; - pwm@23{ - compatible = "max31790"; - reg = <0x23>; - #address-cells = <1>; - #size-cells = <0>; + pwm@2f{ + compatible = "maxim,max31790"; + pwm-as-tach = <4 5>; + reg = <0x2f>; }; adc@33 { @@ -492,34 +1070,34 @@ gpio@61 { }; }; - i2c@1 { + imux31: i2c@1 { #address-cells = <1>; #size-cells = <0>; - reg = <0>; + reg = <1>; adc@1f { compatible = "ti,adc128d818"; reg = <0x1f>; - ti,mode = /bits/ 8 <2>; + ti,mode = /bits/ 8 <1>; }; pwm@20{ - compatible = "max31790"; + compatible = "maxim,max31790"; + pwm-as-tach = <4 5>; reg = <0x20>; - #address-cells = <1>; - #size-cells = <0>; }; gpio@22{ compatible = "ti,tca6424"; reg = <0x22>; + gpio-controller; + #gpio-cells = <2>; }; - pwm@23{ - compatible = "max31790"; - reg = <0x23>; - #address-cells = <1>; - #size-cells = <0>; + pwm@2f{ + compatible = "maxim,max31790"; + pwm-as-tach = <4 5>; + reg = <0x2f>; }; adc@33 { @@ -552,7 +1130,7 @@ i2c-mux@73 { i2c-mux-idle-disconnect; reg = <0x73>; - i2c@0 { + imux32: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -563,10 +1141,10 @@ adc@35 { }; }; - i2c@1 { + imux33: i2c@1 { #address-cells = <1>; #size-cells = <0>; - reg = <0>; + reg = <1>; adc@35 { compatible = "maxim,max11617"; @@ -592,6 +1170,30 @@ i2c-mux@72 { idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x72>; + + imux24: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + }; + + imux25: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + + imux26: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + }; + + imux27: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + }; }; }; @@ -607,7 +1209,8 @@ &pinctrl_adc4_default &pinctrl_adc5_default &adc1 { ref_voltage = <2500>; status = "okay"; - pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default>; + pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default + &pinctrl_adc15_default>; }; @@ -622,3 +1225,189 @@ &ehci1 { &uhci { status = "okay"; }; + +&jtag1 { + status = "okay"; +}; + +&sgpiom0 { + status = "okay"; + ngpios = <128>; + bus-frequency = <48000>; +}; + +&gpio0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiu2_default &pinctrl_gpiu3_default + &pinctrl_gpiu4_default &pinctrl_gpiu5_default + &pinctrl_gpiu6_default>; + gpio-line-names = + /*A0-A7*/ "","","","","","","","", + /*B0-B7*/ "FLT_HSC_SERVER_SLOT8_N","AC_ON_OFF_BTN_CPLD_SLOT5_N", + "PWRGD_SLOT1_STBY","PWRGD_SLOT2_STBY", + "PWRGD_SLOT3_STBY","PWRGD_SLOT4_STBY","","", + /*C0-C7*/ "PRSNT_NIC3_N","","","","FM_NIC0_WAKE_N", + "FM_NIC1_WAKE_N","","RST_PCIE_SLOT2_N", + /*D0-D7*/ "","","","","","","","", + /*E0-E7*/ "PRSNT_NIC1_N","PRSNT_NIC2_N","","RST_PCIE_SLOT1_N", + "","","","", + /*F0-F7*/ "FM_RESBTN_SLOT1_BMC_N","FM_RESBTN_SLOT2_BMC_N", + "FM_RESBTN_SLOT3_BMC_N","FM_RESBTN_SLOT4_BMC_N", + "PRSNT_SB_SLOT1_N","PRSNT_SB_SLOT2_N", + "PRSNT_SB_SLOT3_N","PRSNT_SB_SLOT4_N", + /*G0-G7*/ "","","","","","","","", + /*H0-H7*/ "","","","","","","","", + /*I0-I7*/ "","","","","","ALT_MEDUSA_ADC_N", + "ALT_SMB_BMC_CPLD2_N", + "INT_SPIDER_ADC_R_N", + /*J0-J7*/ "","","","","","","","", + /*K0-K7*/ "","","","","","","","", + /*L0-L7*/ "","","","","","","ALT_MEDUSA_P12V_EFUSE_N","", + /*M0-M7*/ "EN_NIC0_POWER_BMC_R","EN_NIC1_POWER_BMC_R", + "INT_MEDUSA_IOEXP_TEMP_N","FLT_P12V_NIC0_N", + "INT_SMB_BMC_SLOT1_4_BMC_N", + "AC_ON_OFF_BTN_CPLD_SLOT6_N","","", + /*N0-N7*/ "FLT_HSC_SERVER_SLOT1_N","FLT_HSC_SERVER_SLOT2_N", + "FLT_HSC_SERVER_SLOT3_N","FLT_HSC_SERVER_SLOT4_N", + "FM_BMC_READY_R2","FLT_P12V_STBY_BMC_N","","", + /*O0-O7*/ "AC_ON_OFF_BTN_CPLD_SLOT8_N","RST_SMB_NIC1_R_N", + "RST_SMB_NIC2_R_N","RST_SMB_NIC3_R_N", + "FLT_P3V3_NIC2_N","FLT_P3V3_NIC3_N", + "","", + /*P0-P7*/ "ALT_SMB_BMC_CPLD1_N","'BTN_BMC_R2_N", + "EN_P3V_BAT_SCALED_R","PWRGD_P5V_USB_BMC", + "FM_BMC_RTCRST_R","RST_USB_HUB_R_N", + "FLAG_P5V_USB_BMC_N","", + /*Q0-Q7*/ "AC_ON_OFF_BTN_CPLD_SLOT1_N","AC_ON_OFF_BTN_CPLD_SLOT2_N", + "AC_ON_OFF_BTN_CPLD_SLOT3_N","AC_ON_OFF_BTN_CPLD_SLOT4_N", + "PRSNT_SB_SLOT5_N","PRSNT_SB_SLOT6_N", + "PRSNT_SB_SLOT7_N","PRSNT_SB_SLOT8_N", + /*R0-R7*/ "AC_ON_OFF_BTN_CPLD_SLOT7_N","INT_SMB_BMC_SLOT5_8_BMC_N", + "FM_PWRBRK_NIC_BMC_R2","RST_PCIE_SLOT4_N", + "RST_PCIE_SLOT5_N","RST_PCIE_SLOT6_N", + "RST_PCIE_SLOT7_N","RST_PCIE_SLOT8_N", + /*S0-S7*/ "FM_NIC2_WAKE_N","FM_NIC3_WAKE_N", + "EN_NIC3_POWER_BMC_R","SEL_BMC_JTAG_MUX_R", + "","ALT_P12V_AUX_N","FAST_PROCHOT_N", + "SPI_WP_DISABLE_STATUS_R_N", + /*T0-T7*/ "","","","","","","","", + /*U0-U7*/ "","","FLT_P3V3_NIC1_N","FLT_P12V_NIC1_N", + "FLT_P12V_NIC2_N","FLT_P12V_NIC3_N", + "FLT_P3V3_NIC0_N","", + /*V0-V7*/ "FM_RESBTN_SLOT5_BMC_N","FM_RESBTN_SLOT6_BMC_N", + "FM_RESBTN_SLOT7_BMC_N","FM_RESBTN_SLOT8_BMC_N", + "","","","", + /*W0-W7*/ "PRSNT_TPM_BMC_N","PRSNT_OCP_DEBUG_BMC_N","ALT_TEMP_BMC_N","ALT_RTC_BMC_N", + "","","","", + /*X0-X7*/ "","LT_HSC_SERVER_SLOT6_N","FLT_HSC_SERVER_SLOT7_N","","","", + "PWRGD_SLOT5_STBY","PWRGD_SLOT6_STBY", + /*Y0-Y7*/ "","","SPI_LOCK_REQ_BMC_N","PWRGD_SLOT7_STBY","","","EN_NIC2_POWER_BMC_R","", + /*Z0-Z7*/ "EN_P5V_USB_CPLD_R","'FLT_HSC_SERVER_SLOT5_N", + "PWRGD_SLOT8_STBY","","","","",""; + + pin_gpio_b4 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_b5 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f0 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f1 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f2 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f3 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f4 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f5 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f6 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_f7 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_l6 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_l7 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_s0 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_s1 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_w0 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_w1 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_w2 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_w3 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_z3 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_z4 { + gpio-hog; + gpios = ; + input; + }; + pin_gpio_z5 { + gpio-hog; + gpios = ; + input; + }; +};