From patchwork Wed Jan 31 08:41:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delphine CC Chiu X-Patchwork-Id: 194585 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1751742dyb; Wed, 31 Jan 2024 00:44:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgfjiZqVPnHaTOxbCDBp/MqRoaPdJTA0zA1uyOf2uBXDJsia8Nt+z9aNpBbVZcjiOQOjT+ X-Received: by 2002:a05:6a00:2d16:b0:6d9:b385:26f9 with SMTP id fa22-20020a056a002d1600b006d9b38526f9mr1079103pfb.2.1706690654110; Wed, 31 Jan 2024 00:44:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWzSAGc3y5PNjcgY2DjayaJkaY60Wi6XrS0S0VL1mVRNFhGBDWlvKducnaOwKmGQxZNWuVTWYFQiz8aaI1J5dnOf5F4fg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id f31-20020a056a000b1f00b006dddb17d2absi9048984pfu.68.2024.01.31.00.44.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 00:44:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46018-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@wiwynn.com header.s=selector2 header.b=kPcfGupr; arc=fail (signature failed); spf=pass (google.com: domain of linux-kernel+bounces-46018-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46018-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=wiwynn.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 61EF7287B21 for ; Wed, 31 Jan 2024 08:44:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ECFE669D2E; Wed, 31 Jan 2024 08:41:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wiwynn.com header.i=@wiwynn.com header.b="kPcfGupr" Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2053.outbound.protection.outlook.com [40.107.117.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F102F5DF1F; Wed, 31 Jan 2024 08:41:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.117.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706690511; cv=fail; b=p6z0m0yyKzCKMp5PtDliqQxCkML15782vh9jBnUwP9lD4NIfyq1MeRYCdh+d/Up8YtmkdvhXQfZfMahZyo7wWosRutaK+ro/4fiVr85Prevszs1RZYQbu5hRehb4jMkhkgoNxX/aBvbk/CV9IBrjNy/h00bxmeOdqVL/wN6beOA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706690511; c=relaxed/simple; bh=RbEp8iWyRNW1ouNoom+lkaMMUChP085aF1AKhPNS890=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hQ53jDS579S9HMQP19O73DybQnznIKFZ8WN0KANnH4xogTE83w0HVrmPCRj103Gi3KZdYFhm3XKuPQ2G3cbs3xiAeBqaXl5kw+Tpwcpm8kpRm+tdn11QUY/nfHRFGhGb7rAESLu73BoeRAtgO5BR3v2h2HYsf2VQPEThMAuEvIo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wiwynn.com; spf=pass smtp.mailfrom=wiwynn.com; dkim=pass (2048-bit key) header.d=wiwynn.com header.i=@wiwynn.com header.b=kPcfGupr; arc=fail smtp.client-ip=40.107.117.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wiwynn.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wiwynn.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTlEzwX79zG9cjQm0mn278jhuU1zbQ6Ys4zCG/PEHb0w/l1s6Hs3q2NyERjq8iPET7682pbHO8AU/a9VXSIQZ9DvS6JeiBESo3O5X3GX800h8M7lKVNnsTWk3ogWbqSuFvmfSP0q5VlyPddJ9StIKasqPARstxIHU5Oie8vveF874819FI5iAIflsKecwyEuO90JuSJmuamKbYiYOHCuVWTpbESJ73LpV5ELlWwlNSHqon7hXguA3xc6+sugl2Hxj28eP0tg55V+2VV1qZahvChPMXqDjaS8ITNNjGS9itMOJFGLw26x9uiAIRtFi8u1Rey4oeYg4jfXnkw99YdZlw== 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=EmSKcEEWKURPlkS19SqAb+0saPQht4EwjxaRbHrRzNY=; b=f+B+hwiMoJ5yqUErc9Nv/3bXjvFmNczvueSTKum/J+iXmEm69yO0YzhuaQhRFc4xwYjCM2PFSl6aOsOmS4z7btmPJXrttuggvUpwZI4fKn34efyxImXbmgJnjz3KQFNdRfpXn9JwFn+0QlqteA6VFeCM19hbefMQqt2r0VnpeWUtgAlRurechQ2q7zxK8coYYGLR9h3pIcCo4BzrgOBRu/3+/Q9jqdvFk61KTqi7nPjhEI1OQelBEevrtOWyknGjiUoPcO4xIQlErUU0tZtTMpwiAs2SAp3rTIXyAxSoQBr2EUwngoEU/h+uFlZ4vKHzIkZyD0EDIFi6dpl9dnDngw== 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 (0) 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=EmSKcEEWKURPlkS19SqAb+0saPQht4EwjxaRbHrRzNY=; b=kPcfGupr8QKjk0DwsiBp21w0kDk/7/Xudp+akMdlhdrOTuDMi0z2rtYlyjRJZkr1RwT3qXR3zXU51CUhoT6p8KLjdufjRKm/QF6Cv6u2sRXbCwigeTSYt4iPyy82wvw5seCu18Nn6qlrxDzmivB1yxXCwUyZE8+M6uDdUpuZYrX2ZX0uamzs6SS2/U4I0jJ14dEiBaOCBPJ7Vy62fVFMGqZ3SUgbeV92prvcTlCVm40ft+fs9H5jwsrUx6Oqbuqm57E/nb1yaPM6iPms+n8MWczhUTt/rIS4eGUuYaJifuDnTlD6zCidEtyiFFDZDhFcp6plkMDKsLVqF2zdyyi2JQ== Received: from SG2P153CA0026.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::13) by TYSPR04MB8389.apcprd04.prod.outlook.com (2603:1096:405:d0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.23; Wed, 31 Jan 2024 08:41:43 +0000 Received: from HK2PEPF00006FB2.apcprd02.prod.outlook.com (2603:1096:4:c7:cafe::21) by SG2P153CA0026.outlook.office365.com (2603:1096:4:c7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.6 via Frontend Transport; Wed, 31 Jan 2024 08:41:43 +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 HK2PEPF00006FB2.mail.protection.outlook.com (10.167.8.8) with Microsoft SMTP Server id 15.20.7228.16 via Frontend Transport; Wed, 31 Jan 2024 08:41:42 +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 v5 01/21] ARM: dts: aspeed: yosemite4: Revise i2c-mux devices Date: Wed, 31 Jan 2024 16:41:12 +0800 Message-Id: <20240131084134.328307-2-Delphine_CC_Chiu@wiwynn.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240131084134.328307-1-Delphine_CC_Chiu@wiwynn.com> References: <20240131084134.328307-1-Delphine_CC_Chiu@wiwynn.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK2PEPF00006FB2:EE_|TYSPR04MB8389:EE_ X-MS-Office365-Filtering-Correlation-Id: e1c9af5b-6db1-42f3-29be-08dc223873b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AKL+f5o+t7sU7+4lh7dxDd812OZQ/MhsVt1yDqphX+l+rRYVbkK0zraen4K2oKF2QghvO1CwluYavGBSD+8iHg9n1lApTh4N2B2c7R95UdPoKHXPUV1yPBESdNqqEPqHAbusUYhpHR2vYhuY8Nm0Oe+w1aeNoHfxArCtucSG0FGWxKSzqrBAMb0ub00UtReXbFHVtGGlAkRL3arhfNDlDwLhlASATsS5ja8Uz45hsQ5CBI9MguazkWUL+WD+Mm1bv9UYyJCKz+ARaW07U8aLu1hd5o6UHTBFIKiMZYltXzLU+u57oyw6bZXvznBe2B0lgqMHubgLuj4Nj3VmkD/f5u5BgoOWNMyj9srCadwyUqTfV+fDoZgxxKvKpawuXFpVirjk2/QQzBj4u32+/1OUBE1upbg0Gq3nm/oo0ODrMzB7ufe8fZtTjIkMlkgRYwL3lwn8tlKtXUvcPlA5qmSwn8wWAvscaY9TwTZGLSQ5y8VlZPdKQ5+raPRGqdRlmyIUEZOR2ZzKu6RgCW7G4lLRYGA7cWQoHH4sWBHE9LPxf7VWmo8+k8Io3pCoU0RbIMmtxI4E4IyBdWXfv7I68aLR1sLJW3ce3btZCZRAoqQAwMd4EzoJ4CukJz+8wZiF1XNv0CCOpOvNeRDRoilR2rtk+oPIz/vd9Dp8QH/Gg4ev7//v3bicO5j6P9znHd3X5cvuOMnp6QxTKfTm4828H0M3oQ== 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)(346002)(136003)(39860400002)(396003)(376002)(230922051799003)(1800799012)(82310400011)(64100799003)(451199024)(186009)(36840700001)(46966006)(26005)(956004)(1076003)(41300700001)(336012)(40480700001)(2616005)(9316004)(47076005)(36860700001)(6486002)(316002)(36756003)(478600001)(6512007)(6506007)(83380400001)(6666004)(82740400003)(81166007)(356005)(86362001)(7416002)(110136005)(2906002)(5660300002)(70206006)(70586007)(36736006)(4326008)(8676002)(8936002);DIR:OUT;SFP:1101; X-OriginatorOrg: wiwynn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 08:41:42.3792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1c9af5b-6db1-42f3-29be-08dc223873b8 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: HK2PEPF00006FB2.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR04MB8389 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789594858897771373 X-GMAIL-MSGID: 1789594858897771373 Revise Yosemite 4 devicetree for devices behind i2c-mux - Add gpio and eeprom behind i2c-mux - Remove redundant idle-state setting for i2c-mux Signed-off-by: Delphine CC Chiu --- .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 381 ++++++++++++++++-- 1 file changed, 347 insertions(+), 34 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..dac58d3ea63c 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 { @@ -259,9 +278,109 @@ &i2c8 { bus-frequency = <400000>; i2c-mux@70 { compatible = "nxp,pca9544"; - idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x70>; + + imux16: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + 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@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@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@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>; + }; + }; }; }; @@ -270,15 +389,174 @@ &i2c9 { bus-frequency = <400000>; i2c-mux@71 { compatible = "nxp,pca9544"; - idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x71>; + + imux20: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + 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@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@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@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"; + i2c-mux-idle-disconnect; + reg = <0x74>; + + imux28: 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@24 { + compatible = "nxp,pca9506"; + reg = <0x24>; + gpio-controller; + #gpio-cells = <2>; + gpio-line-names = + "","","","", + "NIC0-MAIN-PWR-EN","NIC1-MAIN-PWR-EN", + "NIC2-MAIN-PWR-EN","NIC3-MAIN-PWR-EN", + "","","","","","","","", + "","","","","","","","", + "","","","","","","",""; + }; + }; + + imux29: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + }; + }; }; &i2c11 { @@ -433,16 +711,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 +726,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 +768,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 { @@ -547,12 +823,10 @@ i2c-mux@73 { compatible = "nxp,pca9544"; #address-cells = <1>; #size-cells = <0>; - - idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x73>; - i2c@0 { + imux32: i2c@0 { #address-cells = <1>; #size-cells = <0>; reg = <0>; @@ -563,10 +837,10 @@ adc@35 { }; }; - i2c@1 { + imux33: i2c@1 { #address-cells = <1>; #size-cells = <0>; - reg = <0>; + reg = <1>; adc@35 { compatible = "maxim,max11617"; @@ -589,9 +863,48 @@ mctp@10 { i2c-mux@72 { compatible = "nxp,pca9544"; - idle-state = <0>; i2c-mux-idle-disconnect; reg = <0x72>; + + imux24: i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; + }; + + imux25: i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; + }; + + imux26: i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <2>; + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; + }; + + imux27: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; + temperature-sensor@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; + }; }; };