From patchwork Wed Jul 26 07:03:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 126156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp236694vqo; Wed, 26 Jul 2023 00:41:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlG3ITsDpMmoFrJRzHZ2bIYS8X83J4LBmwL8Tn2oqfEkDGecOIN9uBI2YVaoVSFa0W2TpkVR X-Received: by 2002:a05:6358:279c:b0:132:d32d:d929 with SMTP id l28-20020a056358279c00b00132d32dd929mr1266659rwb.20.1690357274012; Wed, 26 Jul 2023 00:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690357273; cv=none; d=google.com; s=arc-20160816; b=GC2YBZ5lAUAqppZUssBv+z9hSx2V6urD8k5tHezNHPphz0wCEmWnDBB5CQSTDy/cIc osygngGoVox5YcWkxu5gjYbAp/m0nB2rTW9mI7ZMdgySB5f2qyN0T0h01TKdHKOcUiwN 28WrRRznze+QBwoYCY/C7bV0qt6lSNU8NNxalK9qYQ29dCgghMkLdgpKGsVhSJzn+AZH FreKHVpxTrbaVCgu/iamSbAnWtnmMwZl2GNEuMHMmKFvUKCr8argV0ZNTX0kY4r/Obn8 KC2s0mVh28eYNCpTtVAjbBmtm13dU0bD94zUFxEdXX/DjWeEyyD6/UoTuwodbeR8wMUS /Q+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yHJNnsXc4d/K/z6VhqA+wtVe+B6ZApclNDr3oVz3Qng=; fh=IitQIKDdY3BMj2TGQW0iAPy0s1dkksjDYTJj1MeHrvw=; b=UGVy2DpU07y/Z0L3gERFkRSmk51zKxhrlTRm0c1C8aX2TnV0vvRPJh+x/MQpJ/9Xs1 nGUVj5+Fm97y4ajSDtg0nu8hSx6vibfUvpsyv8WoKzl0REcPfWOuRnd/W3gH3PsW1Too YRgEdmPnE9/ikEQjX2htlGke32cNPECJuOYeU55cnCdwPw5q1x/3k9/QG61RdehqFEM8 5zP8JK6qX6E9DTERVMQ3Usa8YEThNvmMlTeaIJj7Ru3ORB7mqXPu3kw5cIepTp44kK/a 8A6HSF0efEpDa6mwVd79DOoiEVRUe4oHf48AAbFS7k6x0u+160SLqD3jvv/hlv9TQosL +rCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ue0Fwepu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k2-20020a63d102000000b0054fe2dfaabcsi12427649pgg.526.2023.07.26.00.40.52; Wed, 26 Jul 2023 00:41:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ue0Fwepu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232421AbjGZHGn (ORCPT + 99 others); Wed, 26 Jul 2023 03:06:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232361AbjGZHFt (ORCPT ); Wed, 26 Jul 2023 03:05:49 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF24849F7 for ; Wed, 26 Jul 2023 00:03:41 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5221f3affe4so5013531a12.0 for ; Wed, 26 Jul 2023 00:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690355019; x=1690959819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yHJNnsXc4d/K/z6VhqA+wtVe+B6ZApclNDr3oVz3Qng=; b=ue0FwepuEKanedIaHj88Eu2du8PJDtqjDGNpgDhpT2z4n0dS9MRxnqTskins8Gk9HF L6MK1edEEuji1HIuypxoDb1OCwJn4IbPxoy5xCEz+5gvcG8gC9cCcns9+rY4SDi+hqSK 1IqgDd4Ari2bRlA4wkExlMs6VP3NNa5XR2rqJgsxb6Qeo5TEN/xJnorg5SdT6tcYCgfd 8Zi5RHN6s3F2hj2Q4bU/JwgTyjgw9J+bXBlAgCLVZ97eu960x1t69oY7XksH3mEZZxvf 17yBbT7pOQZEPQ6O1v9ODy1zbB47ocmWKIwW3vwR80hiOJGDfT/fxIhJlOdpgIbQBiGq uV7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690355019; x=1690959819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yHJNnsXc4d/K/z6VhqA+wtVe+B6ZApclNDr3oVz3Qng=; b=dpT1GiAOJlwKRYKswIxgYbkWveiFGD4tgRUqmR6QFabd/YKKHVupbfRii0AkWcIDGA 1uLY/hIIj8ZiP26eYwXFsV/mu1bIdVvztzisH0BMx82vLx8Cjk/pb58LK0X+3cwgnlU5 a779lbuaEUjSp5NG4ZkK9c1Gg6/teYnK52usYC1Gj0HFBLrVpt/43l0k+me4TRXQ2ICV m05xtRagK4OIINKR+NgY1KcoC1ZWUC2R3PG4V4tbZoZSSgcHR28SEk7KPPx+3OO8NTgZ 6iSstb4VuVy1fsoZtjFj9SXRY4jmpL/aq7RcOlKLe5a4QTXPYd2UrNcKhri/1l6PqWEI qCLQ== X-Gm-Message-State: ABy/qLbd5Apq6GvNYruCflSOU+NvAzAI0q/okK63Oui3zgARYEKdDnQC O0CWTZzRWR+SmPEpLaARg6f4xA== X-Received: by 2002:a05:6402:744:b0:522:5873:d4aa with SMTP id p4-20020a056402074400b005225873d4aamr828651edy.23.1690355019657; Wed, 26 Jul 2023 00:03:39 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id dy16-20020a05640231f000b005224f840130sm1572003edb.60.2023.07.26.00.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 00:03:39 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Maxime Coquelin , Alexandre Torgue , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Cc: Krzysztof Kozlowski Subject: [PATCH 7/8] ARM: dts: imx27: drop incorrect reg in fixed regulators Date: Wed, 26 Jul 2023 09:03:21 +0200 Message-Id: <20230726070322.103871-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230726070322.103871-1-krzysztof.kozlowski@linaro.org> References: <20230726070322.103871-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 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_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772468068853138583 X-GMAIL-MSGID: 1772468068853138583 Fixed regulators are not in some bus and bindings do not allow a "reg" property. Move them out of "regulators" node to top-level. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts | 19 ++++-------- .../imx/imx27-eukrea-mbimxsd27-baseboard.dts | 25 ++++++---------- .../nxp/imx/imx27-phytec-phycard-s-rdk.dts | 19 ++++-------- .../dts/nxp/imx/imx27-phytec-phycore-rdk.dts | 21 ++++++------- .../dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 30 +++++++------------ 5 files changed, 41 insertions(+), 73 deletions(-) diff --git a/arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts b/arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts index 6f1e8ce9e76e..a21f1f7c24b8 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts +++ b/arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts @@ -54,19 +54,12 @@ user { }; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - reg_max5821: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "max5821-reg"; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - regulator-always-on; - }; + reg_max5821: regulator-0 { + compatible = "regulator-fixed"; + regulator-name = "max5821-reg"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts b/arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts index 9c3ec82ec7e5..145e459625b3 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts +++ b/arch/arm/boot/dts/nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts @@ -54,22 +54,15 @@ led2 { }; }; - regulators { - #address-cells = <1>; - #size-cells = <0>; - compatible = "simple-bus"; - - reg_lcd: regulator@0 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdreg>; - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "LCD"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; + reg_lcd: regulator-0 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdreg>; + regulator-name = "LCD"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>; + enable-active-high; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts index 188639738dc3..25442eba21c1 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts +++ b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts @@ -33,19 +33,12 @@ timing0: 640x480 { }; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - reg_3v3: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; + reg_3v3: regulator-0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; }; }; diff --git a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts index 344e77790152..7f0cd4d3ec2d 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts +++ b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts @@ -37,18 +37,15 @@ timing0: 240x320 { }; }; - regulators { - regulator@2 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_csien>; - reg = <2>; - regulator-name = "CSI_EN"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio2 24 GPIO_ACTIVE_LOW>; - regulator-always-on; - }; + regulator-2 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_csien>; + regulator-name = "CSI_EN"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio2 24 GPIO_ACTIVE_LOW>; + regulator-always-on; }; usbphy { diff --git a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi index 3d10273177e9..7191e10712b9 100644 --- a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi @@ -15,26 +15,18 @@ memory@a0000000 { reg = <0xa0000000 0x08000000>; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; + reg_3v3: regulator-0 { + compatible = "regulator-fixed"; + regulator-name = "3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; - reg_3v3: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "3V3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - reg_5v0: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "5V0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; + reg_5v0: regulator-1 { + compatible = "regulator-fixed"; + regulator-name = "5V0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; }; usbphy {