From patchwork Tue Jan 17 05:34:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Li X-Patchwork-Id: 1727398 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=JTdh6dCh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NwyKJ638yz23g6 for ; Tue, 17 Jan 2023 16:35:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 16BB9853BE; Tue, 17 Jan 2023 06:35:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="JTdh6dCh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 63BE483E5D; Tue, 17 Jan 2023 06:35:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2047.outbound.protection.outlook.com [40.107.247.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5C79D84231 for ; Tue, 17 Jan 2023 06:35:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nz/Rv62H2c+E7IH4wfE8YAzvk7YR2g9S0do+6s2v1x8ici82ylQPT+scLGtCiKkrZ2TFESadX2zDkc5rhebxvg5S51eJjxZ9Jc2JNUUcsvsjf33/ydEYTH3CJAtbdI3UMd4AUpsK6e1g87WjJlUGGCnNkfgUQb4MJCCHKBJIdAnRRAd/WLJdZ3MSc2eZZFU0zMb6ohHQ1Zq2vbLl+Rv11OrUcJ9wL9db0g/vJ6Sb9RTgqRAz5jyao86BtzGGC+xuNzetIc+zP5mQk1ELu0GurYHQMBiy+tyXtURJLmfkwNzZRFu/SQJDa3zeH/NbqIe4n7VKVXTBN8yiVA7eOXTcgA== 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=cAVUI8Ih6hkQqS1tH0+GrcwcTgojlifGIkVNPv/hk5c=; b=SXssB/tf6jEWRHNh9IBePRTFFiFvoaCisg/Hf957Io/fzZaVGg20ZOgZoup0OISeI7B1oV66IDJ8VZ2OTbUSo5nC3FA94kbONQjnxgJkrgp9cPSM9/0mSOSgCoWD5lV4/XtmdvV98Dn02L9EJuUSrya32nF5Q/JjtnztR7R6PGB1wlbiJZhnXWyJk/Su9tpvpzxxCAiNh7mr6xOC9rbDOI8IMFYfuOheAgl8T63YdevfTqvsGblr7sHzZzK0s7hB0zAUrNgDqLt0emRpRrvuxk+z3PGws5PK2P1PAiQzF9ZOK9TzuGjjZr2DylquYHnS0Vm5MtZ/3moZ4miNClBE4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cAVUI8Ih6hkQqS1tH0+GrcwcTgojlifGIkVNPv/hk5c=; b=JTdh6dCh6Ow4exMh8itKNUojxZ+bzaGenjPOHcgbNFCZEh1B5BH90Ypha8+n2cXhPcSS7hiMHWqyKH3toHeBaChTNpgDOuIMzvvsVyHJCNC+HP9SAAEHISFxO5Ekpq6UCYs2SJ2x3uc95Vmj9eCPtIgUI5UyChD0c2zsHkhkA7I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) by DB9PR04MB9674.eurprd04.prod.outlook.com (2603:10a6:10:306::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Tue, 17 Jan 2023 05:35:09 +0000 Received: from AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::a0bb:7c14:cb5c:3a09]) by AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::a0bb:7c14:cb5c:3a09%4]) with mapi id 15.20.6002.013; Tue, 17 Jan 2023 05:35:09 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com, marcel.ziswiler@toradex.com Subject: [PATCH] ARM: dts: imx8mm-evk: Fix wrong PMIC device for new EVK board Date: Tue, 17 Jan 2023 13:34:37 +0800 Message-Id: <1673933677-99962-1-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 X-ClientProxiedBy: SI1PR02CA0022.apcprd02.prod.outlook.com (2603:1096:4:1f4::16) To AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB5302:EE_|DB9PR04MB9674:EE_ X-MS-Office365-Filtering-Correlation-Id: 236668b4-352c-4264-ca2b-08daf84c98fb X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MVE3UiNogkD42QJn5mr8hcMc597wFg5V3sN0ZPC26W1ZqhxE1rPyvsS6L3LEx265/zpCZXi8VxwfMN/Iz6jF4tRWUFb0lqQr0/ACQYAp5M1l7L9dap2x77lkI7IP9hcTUXRGCbn+BWVV0C0AG0F5sng1BxIjtK9Z6iimu6YlJVM8ygwFcMavagegLRwBEbdaf1Vqbd3XwJW6Z71PzbHWVWXHB4P6713LozuCDMcHFmBx2MR8N7BOFMB5iXquMw1xvu9wrVk3m6Pu28AHUHDxaQ8Is1TFi6WKaRALGamyiXYai23Ka2HUxMGlmCsrFtpYFqAvpHhM4aoMfZUv2MJXrGqoh3yZkHjh33BegG93n+C5C+v6wygdqxl8gyd38vGS65rWO0wYSHxuqTwkOncSm3GGBOBHS9SrtUj8Cs0z3+dPoMBjBJf8F8mVIchhrnz6vmnU0BELgQn1hZT+6L/8AdOcHi/ZEXilrYXZJQ5t8c8vlqJd49K/tY1i+Sx2wNnKjWNXxrurLPZCuVd9bT4N/8pcDa3Ph4LHzzN6Hn4z9kW1eWm1WqDVNPglllN27exXMGHRzPhJW+vmImjHdBpsE1vyC/34pAIPb+uJyGoDfBZ57RqAaoXxLPKiP10fuabHxR/LS72gxez7w6qZ1Dq0G/6+QSL9zt+bhmi0aIw5DKGAw/uKY4jGICoGyVPAkWmUESW96l+mJdprXfeqT4kj6Wdw/FpbS8UN4LXDQbTcxzs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5302.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(136003)(396003)(366004)(376002)(39860400002)(451199015)(6506007)(316002)(86362001)(5660300002)(44832011)(41300700001)(8936002)(38100700002)(38350700002)(36756003)(478600001)(186003)(83380400001)(6486002)(52116002)(26005)(6512007)(6666004)(4326008)(66946007)(8676002)(66556008)(2616005)(66476007)(2906002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LnI1KsekGuRpGVurLUFlzitOXEBYQ/sNIHug+foJZpmFu5CZfNgznwevo3OsXF57KXw8JHivFEeAgHuyQAsirxYUtIOGSBUX2BiUmZAXEB85fW4Jxn2UM8BS9XKSJE1BreeQbk9I/2JGjNaYewe/cgdCdksnssTugUtPBFo6IpgDqveFEz6AiKv+NKv/5pdGENWrGO6t6dPp4ArGjhYjWgoUOYJvLrWcQhpljDBEeL8ZmGjxQS4vZI2wzK2d9kCJg7UBQ27TeDuuAoMUjXa107X3IAkBpREXYczSLTFpPnzyrmfzZv17T6wdKiRu+hLBR0vOQRtqCImVa6mtiFYz+wWe2hukHOVnbyMtcCmkpJElM31lnV5MYLxHVZYFp3v9lpECj3yokdMdS1KVy5gaUS6/VM0wvUxTAuJIwre3Im2IYq85kikN9iq1WD+aIT/mPG9uuiFCkJ5UQhi+Hai+yNqVPm2In9KEEHvAv+0T7Gc4YDUtuWKgPw8O/LZuJiQ/7viS7LG8tRtaUsKcenP8gT2QXqUHu0Xu/aJ0Gewn7HQOlSBK36r8lJ2rVLrFnVyTn6sh0SrzHXUxJIpHaKKblApBPu1Ij18nSeZvfMURuA6V/LBPbAGbFT7jFeq0CDbwfFj4ei6TmAo3j4n9XThnwxKYXo3CjRX0RNZT8BL+87SqsYu/jYQGb/RnwPux4ngrm18KZZSMNwpdSG4z34S4gXV+IPDQ48EVMzVtL/XGKvnmPQdO0cqhMu8g4JxezdT81J3lLQxSa6r37jeC87SbQLDJSvJPryWosFY2p+lHRHtD3xkT+PzTZ70W/Tc5wu7wp914LVvvpVIPNhcwkPFbE1kVVFS2zx4Ip4GpkHl2RUcXw8nXfS24M7JFc6D1HCRzIyYuTqdByUr6632/3Y0Llt5dGayahyjS6iR3ZGop6QqusBpE9V074pKeKA8mDZOQLqm9SMrdZUQq0dnAjKKcxNlYoPQqN8mgkS+Xlpk+SA4rfwpMUJlyil2/sSAg2x4rv49GpbUf+VspEf7x9C2MYi6931MDnnJnXk73MoapPprPylgRG5jjNg/OmhHumh2ePHteguBQhh0nYuTW1P/zK9dKRCMnhSm4ArCzqYnzs3D3V7BScLJFjMNiyQHWsiZwXu7FI2lvc0QX2X7uUwv01tBn0rB6kqG8zy0Ife6hTKnji6WhGChuc8Rp0S+PRgg0Xv0gnx3Ixo7Gd3zPNXp0F/Pac6xpBn0rWYr23VTdl7lljCYFKoB6FU6/xRoyLz1qUwOqayw77UAxLt7DHvoa+EZVpy8SxyN9CLQkRzSOeu/jggzDlNEXNAQwVKm1ngxOHt8Yz5Uk9VKSmmyNyEwTfIZVR67kOeXRiBRSqBORh/iYpuq3V5ef0tHvEiFo18+INYDyjxMDIGcdnMBBMDB5uJ7sAsjFlAZ+HlXe42RhmBsCSpcHmzKSCyZ+JR8joL+Kha5Kb9i2YMJWZUyjrFjONIFwspDytDUH20n6QgzwXqElAK7bqq78/OwET8zXFJT1YYkaGiAiiIu9kB6oV1BTtOUSV3JCbqdvoUcrYkP6N120A30kd316sZI7EZIySsdh X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 236668b4-352c-4264-ca2b-08daf84c98fb X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5302.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 05:35:09.7156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zuMc0103mZkxbsWminQayWpln/Hgt7e1EoYmIVI6ZX6M2xT6dQl5Oz2EeWZmOkjL X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9674 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean In commit 48ddafd (imx8mm_evk: Switch to new imx8mm evk board), the iMX8MM EVK support was updated to new EVK board which is using PCA9450A PMIC. But the commit 24a7a3c (imx8mm: synchronise device tree with linux) changed DTS node back to legacy PMIC which is not aligned with SPL codes and defconfig, then cause SPL boot failure. Signed-off-by: Ye Li --- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 4 +- arch/arm/dts/imx8mm-evk.dtsi | 127 +++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 63 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index d82428f..951017b 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -121,11 +121,11 @@ u-boot,dm-spl; }; -&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} { +&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25} { u-boot,dm-spl; }; -&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} { +&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25/regulators} { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mm-evk.dtsi b/arch/arm/dts/imx8mm-evk.dtsi index 7d6317d..766e29a 100644 --- a/arch/arm/dts/imx8mm-evk.dtsi +++ b/arch/arm/dts/imx8mm-evk.dtsi @@ -183,115 +183,120 @@ pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; - pmic@4b { - compatible = "rohm,bd71847"; - reg = <0x4b>; - pinctrl-names = "default"; + pmic: pca9450@25 { + reg = <0x25>; + compatible = "nxp,pca9450a"; + /* PMIC PCA9450 PMIC_nINT GPIO1_IO3 */ pinctrl-0 = <&pinctrl_pmic>; - interrupt-parent = <&gpio1>; - interrupts = <3 IRQ_TYPE_LEVEL_LOW>; - rohm,reset-snvs-powered; - - #clock-cells = <0>; - clocks = <&osc_32k 0>; - clock-output-names = "clk-32k-out"; + gpio_intr = <&gpio1 3 GPIO_ACTIVE_LOW>; regulators { - buck1_reg: BUCK1 { - regulator-name = "buck1"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; + #address-cells = <1>; + #size-cells = <0>; + + pca9450,pmic-buck2-uses-i2c-dvs; + /* Run/Standby voltage */ + pca9450,pmic-buck2-dvs-voltage = <950000>, <850000>; + + buck1_reg: regulator@0 { + reg = <0>; + regulator-compatible = "buck1"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; - regulator-ramp-delay = <1250>; + regulator-ramp-delay = <3125>; }; - buck2_reg: BUCK2 { - regulator-name = "buck2"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1300000>; + buck2_reg: regulator@1 { + reg = <1>; + regulator-compatible = "buck2"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; - regulator-ramp-delay = <1250>; - rohm,dvs-run-voltage = <1000000>; - rohm,dvs-idle-voltage = <900000>; + regulator-ramp-delay = <3125>; }; - buck3_reg: BUCK3 { - // BUCK5 in datasheet - regulator-name = "buck3"; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1350000>; + buck3_reg: regulator@2 { + reg = <2>; + regulator-compatible = "buck3"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; }; - buck4_reg: BUCK4 { - // BUCK6 in datasheet - regulator-name = "buck4"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3300000>; + buck4_reg: regulator@3 { + reg = <3>; + regulator-compatible = "buck4"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - buck5_reg: BUCK5 { - // BUCK7 in datasheet - regulator-name = "buck5"; - regulator-min-microvolt = <1605000>; - regulator-max-microvolt = <1995000>; + buck5_reg: regulator@4 { + reg = <4>; + regulator-compatible = "buck5"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - buck6_reg: BUCK6 { - // BUCK8 in datasheet - regulator-name = "buck6"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; + buck6_reg: regulator@5 { + reg = <5>; + regulator-compatible = "buck6"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; }; - ldo1_reg: LDO1 { - regulator-name = "ldo1"; + ldo1_reg: regulator@6 { + reg = <6>; + regulator-compatible = "ldo1"; regulator-min-microvolt = <1600000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo2_reg: LDO2 { - regulator-name = "ldo2"; + ldo2_reg: regulator@7 { + reg = <7>; + regulator-compatible = "ldo2"; regulator-min-microvolt = <800000>; - regulator-max-microvolt = <900000>; + regulator-max-microvolt = <1150000>; regulator-boot-on; regulator-always-on; }; - ldo3_reg: LDO3 { - regulator-name = "ldo3"; - regulator-min-microvolt = <1800000>; + ldo3_reg: regulator@8 { + reg = <8>; + regulator-compatible = "ldo3"; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo4_reg: LDO4 { - regulator-name = "ldo4"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; + ldo4_reg: regulator@9 { + reg = <9>; + regulator-compatible = "ldo4"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; }; - ldo6_reg: LDO6 { - regulator-name = "ldo6"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; + ldo5_reg: regulator@10 { + reg = <10>; + regulator-compatible = "ldo5"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; + }; }; };