From patchwork Tue Jul 23 09:22:42 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: 13739764 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 C762AC3DA63 for ; Tue, 23 Jul 2024 09:24:43 +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:Content-Type: Content-Transfer-Encoding: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=MpSriWfetK7algw9l4MNrHnpp7Z7wNyiJZzZzENk6Z0=; b=kT6l4KXCWXfOMtGAg/B6v69II0 vKHA3JjKON9nOp6CbAxI6AviU2LPdGYst526JgwtTDTaDpSMLFPKYYP1wNEtVo+RjLmf7fuJO7/1h ckL6/VwdOoEYDsuf9jtsV59ZOVNlNNmit1JX3wDTyqRHS2T/gQIDLtwjv+wx8nJmmPwZq++xK52xD CXbdV9oxUQ0ECOkiGAKN66aBp5s7717uXmDLdBRFSMI4CkeklAZ6Vs9hmPKyUa2YgoeY3BkF9YhK/ 00MluAnxoB1EGnquYSAokD1ZYTNkCl+GqnT4x9nDdif7G5iwmYNl7RZ0Rtf20zUuM7M8H3QINnptI OY2dfg9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWBl3-0000000ByJX-1EJz; Tue, 23 Jul 2024 09:24:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWBkK-0000000By27-0xwH for linux-arm-kernel@bombadil.infradead.org; Tue, 23 Jul 2024 09:23:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=MpSriWfetK7algw9l4MNrHnpp7Z7wNyiJZzZzENk6Z0=; b=O9Eq1bPe8Cx/Zz14brvrZIdmXE VSrlfiEl4fDuPbhxvDrTkdnj8J8fPyvqz6KyJ1OHUx+qpdaKvzZgfiUSx9KwSYk6KVVprHbpBEdne t78ISv18nXtL0CLXtHxcIRaogrzgKiO4XqFaMe+IIIdcXADG3QSrnl/aPOW/l6z4C/auzk5gE2iNW 0OgSs2SqgBJAqheWm4+N7ZEfFuVG7f2pKnL7qyNKCdo4vy1JHsMM27tsmNDEAMmWoFQnh/IQZ4nwO m8e+7JOWaZuwSwapmJLrJiK2olTC67ESqqIXlaXVpncHIHrNdHT5cru4+D4qWl2N3zZ5zCnHX1zuX EGJUyqWw==; Received: from mail-tyzapc01on20600.outbound.protection.outlook.com ([2a01:111:f403:2011::600] helo=APC01-TYZ-obe.outbound.protection.outlook.com) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWBkF-00000003ekg-2sKm for linux-arm-kernel@lists.infradead.org; Tue, 23 Jul 2024 09:23:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=n/6fZ1QPzCEgF5XDXYgvU5lGdQr9EyG1Q6jjZaEsG238UzVUodp5eUj8/u6J+43vh+VCZSXvmv5TAZ3VLRisdPDAfTja6LAlffBrDAvOhtL11QJHxyBoGfCthMYD5HvdkXUC4lBpj3m/Zgpzc8yXgCehbZRwJY7lU4VTUxAyuEjCUiBbm6APVxVKf++zNwvRV9M+cVAWeaymlucj3VlRFsm9hFPJBxWdbfaN4hopJB0Dc/Eq+bD0adfD3xJN292iYg3+QWpZInNIQs1YRps/k1pFbW2Hz8TMqhAX82lyWTXtz9Q/pqMRACiIqhCpPExsg7XBxlvu4PqHDTcWcHyVbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=MpSriWfetK7algw9l4MNrHnpp7Z7wNyiJZzZzENk6Z0=; b=uDiB1bjI9uqluXds189Y3PZ4Zc2Dw72+y9tNHN8bSW5+m5kfYE0dfEz6OGG1BWmsQWaf/+vHdewcqv2StJcm83pqbTpbeHyqtzXe43SLgttDpn9LY8bNN4l+MwBP2uv906lb0xnpBQWUORKl64h8iDnzDUmfQ1mKL35r1HLWQ7F0AFC/HGuyhh8Jzo5E7CqPSwex/mG07OjWLWwFP94YCG0etb6Pwg3Qf3EpfN1R/kqRTxPDm8Kf55fLj7bGLYyYRm3fn7mKKKGmE9gKYrKShtZdanqozBWJWlX8LUmxtB4K7+2hPYH+bo5Gonl/o3qSuK8QPR5n9pKcz3t2//AD0A== 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=MpSriWfetK7algw9l4MNrHnpp7Z7wNyiJZzZzENk6Z0=; b=kzuzx7UQJ/XdleyM9mdoqVDFM4OolRZB/shkqmSBlB1S/b3BvclrklgPIPMREXhRq7/iSl7S0zPB83td/HZ4soa6s4K5+c5loE+kKckYHBBMkA4cgyiq1dXCg892q0YBC0VQTGs86YIzS4xivmJIlA9eVnHP20xeGaEU6tmhcImkzklWGCF6ugg9fefsIQ2KT1Ua+Z85nTJ1cUkD54jKxq740N89FTHFszkSzbdyXW8N5a11DnwA+u+P2S0MEMWdbsiDJS9FxACjusnu5Pes8s49II1fo5cN8YHZKI68iWrLrTzca0PRaFuOEyBc+umRQyT3mRwZQngr1Sl5SlL7FQ== Received: from PS1PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:300:75::29) by TYSPR04MB8243.apcprd04.prod.outlook.com (2603:1096:405:cd::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.14; Tue, 23 Jul 2024 09:23:23 +0000 Received: from HK3PEPF00000221.apcprd03.prod.outlook.com (2603:1096:300:75:cafe::42) by PS1PR01CA0017.outlook.office365.com (2603:1096:300:75::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.20 via Frontend Transport; Tue, 23 Jul 2024 09:23:23 +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.7784.11 via Frontend Transport; Tue, 23 Jul 2024 09:23:23 +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 v11 01/27] ARM: dts: aspeed: yosemite4: Revise i2c-mux devices Date: Tue, 23 Jul 2024 17:22:42 +0800 Message-Id: <20240723092310.3565410-2-Delphine_CC_Chiu@wiwynn.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240723092310.3565410-1-Delphine_CC_Chiu@wiwynn.com> References: <20240723092310.3565410-1-Delphine_CC_Chiu@wiwynn.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK3PEPF00000221:EE_|TYSPR04MB8243:EE_ X-MS-Office365-Filtering-Correlation-Id: 54184e41-8253-449d-6e3b-08dcaaf919bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: 99gLjti4CQshWbNcvI6w3vPOWVsaiOAE2F3EjrDoLYUh/gBhqTsCDauXq2yfljFNIeIi86podFr+Z7RHyMUC6nhHz7e6T1j43fjGX3aAzqa6cMsirJHULbY5RzdJWBRStxsaspZ+K1fzzyMecSBbbXUUnu/IdqDQHu47Xh1U1ZVYD13Ibr00AM9s32irm+ri9DZMPPGrMQmCZwIEU0kzw8AL3unaApDD+iKQoJEaASFDfGOEiF0Ss3iYEuJHXa4WDpPCFiR2QRTSOhwPQkvSJ6S7rwJKOSC8SYUKLKb0ipYo849ccvUSLhmOmScC6MbnabbWeU1yzR32eHpqjZgOkhxIpjxxmQ5xWDBtU6bHpwh17DQ0eOMmpg7qp/YSpMkp7S3AiShZnauEfu7hTe9zzXApQvKdrBfjYiQzfDGbV9OuGehc+lHpEUiVp01hakiZ/A2azSwQyUVyI+A5HfVOZ2PeNIiYAm/zXoYF8vfyB94NPXrXDhYmAVlbGeAG/U6sqYNzVhzDJbeOy4xUW7UKwajTk2WBU8j4HRkVdk+mRkSQ8/THELDSDthJDeH0OH2SMW5p4uX5AtyUiZluNoIRyVBkMtOEeHYik3pPNWcWvblI7TzonzA6gi/lCP/ygKUHMoGAUx+lkfK+eaHKikTEzYAOGSIu8d+nWeLJFmGkVYw/BqU8Tghq/P93xwlwmClyeNzoxlDgdLp0ULUCn4IJ9tdWN7lgv88Nn/WaOz1ykVju9SkWqRlWwGE8isrcY+UFHg/Z6OWHmzmsztyuZfJJYU1Y3XhRFrf/INv+FTtuoCBi1Fl3q/8oBwd1MrhhWmY5nyyekLr3Cfe8vMJyzTwRsf2Y8nva5HY0e46QJ4Xfxfgq2SnF7CaWpKaogRqd1tdvwA91U5dRNOLprEctLSm476d4b+7ImM8KyfSFMkE2VowZRu+OAthmlCPLIjQQIpkdPsfqC96MddAcYeKUiYJS2cgtoLOa6PdvkHMLGSECiv6u8A83Dlgz54L3kq6LtNUFzy8Nw+hxR7mRIFG+BdzT8BJWoSFq4jAets9iZflEShdtXkQsC8pPjX+YNekNeqqODFdFNGTSh6AB9PVRKPBq6na52JLkbAfoSx25TpeDfGgPEtYjQalFW5RR1e/JnK6Ij5G6rVCEHNJblLib8teaEh0UjkeaN6O8nzhA9hcvub/UQz0YRMiDQsZauW5/nZpio2CkoOGX4nquYnngOyonIGKedsEwyL4kb9dCldMLJxXMUhpO7KZRPyKmVR3/C8PUOWcxXXHMvpWl1gJrw2RjuCzHaVgJ4IoW2/gB3ulrJlTLcoKcjiID3LGVr9l/w+fGaWquKgZ8q4x/+xt3wiOsdApHxlyn+R2AkKmCN54BZzCUGw0I5WqFN7FSLFeFizz7bjx3pWPzIryys9fJLCWAzT5tsI3zPdPcL9IYA+mB08+kDhNo2w7ZSaEUQ09awQqF 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:(13230040)(36860700013)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: wiwynn.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2024 09:23:23.3003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54184e41-8253-449d-6e3b-08dcaaf919bd 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: TYSPR04MB8243 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240723_102344_565241_FF6B9741 X-CRM114-Status: UNSURE ( 8.68 ) X-CRM114-Notice: Please train this message. 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 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 98477792aa00..ce206e2c461b 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 { @@ -440,16 +718,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>; @@ -457,26 +733,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 { @@ -499,34 +775,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 { @@ -554,12 +830,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>; @@ -570,10 +844,10 @@ adc@35 { }; }; - i2c@1 { + imux33: i2c@1 { #address-cells = <1>; #size-cells = <0>; - reg = <0>; + reg = <1>; adc@35 { compatible = "maxim,max11617"; @@ -596,9 +870,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>; + }; + }; }; };