From patchwork Wed Oct 30 07:02:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 13856046 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 7F772D74951 for ; Wed, 30 Oct 2024 07:11:07 +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-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=lij+PC1fLvJixrLcoV9Z1Urjyzf4HaJGb+O+EycfkvQ=; b=BAdC4tIE9yvA0aRcFFv3qFtkfX yzCSH70/Qp+Q3RLt46XMHHKTKhdfxepV112MpVscUSm4Yjkbdycf/2AxldSP7G5rHihag165YI+D7 B7VudwJhbhk1LPRZqVjr5GCxPFRR2lHXMzGxNeyKXIGbxNihX6Q2qLHTSkebTvlhx9dVhVESEtClV 9wrK7O8QFRzpXhpa7ei/nZZvgexRAzIFDcaM6XW/+ZUsx5tU1/pGzsluiGcXkNxA5gW1ytLhpy9MX sdALcxacg1LBebNEWACb2xV5Faro6dRjwCzhykAMDBHTJl7mxw9UyJzcq3/2XHoembTR2kk58Cp3s 30q31JMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t62r1-0000000H5Uw-47Wx; Wed, 30 Oct 2024 07:10:55 +0000 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t62iz-0000000H49t-1Ufr for linux-arm-kernel@lists.infradead.org; Wed, 30 Oct 2024 07:02:39 +0000 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-7d4fa972cbeso5379288a12.2 for ; Wed, 30 Oct 2024 00:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730271757; x=1730876557; darn=lists.infradead.org; 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=lij+PC1fLvJixrLcoV9Z1Urjyzf4HaJGb+O+EycfkvQ=; b=M/9PM5JYwIqfi1R5tTIyomr1xnqXw/A0xQFQzv4+iydHbvC8nqniWEwDc/GtV4RAkO skM3p8pCbLtaJcl1TEzy3yBvGrtS7WDbBh9566ouYiXHjEPqsJSaug5lDaYS3QxtVFMg JNRASELGjhpopqq1RJYjOUHfCFURVr3Vm3FkI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730271757; x=1730876557; 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=lij+PC1fLvJixrLcoV9Z1Urjyzf4HaJGb+O+EycfkvQ=; b=gncfILy7mf7jXvQU4Q23QaeeNmKY1XV34dLBJHqTlS41Bmpxy5A3Z+wXY/v8cUIFSU c4TZiHdNByKb7wFp4eiMm4PlZomygPe/wK1crsa9oDP9g3VUypDHmugKBttp5s3yMkIC bzShK+mIMrvNqFQLjFCZ32U4F/crgQojFW3d9bcpQj1nHXTguWXVgw3o0NQ5jloJS8Mx l1huLl5slpSgbR6p47F/73YhbLo5tOwEdX7OkoHt9C2K7OZdjvN6wJr6BBNjaikbCMgp GjSA31Bl/nNp2Nr0yRhKIv+1xa8NboZJq3wBMUk+tuF0qSoyjjM2tOMgOQasYuwzdUgu Pcaw== X-Forwarded-Encrypted: i=1; AJvYcCU/WJUKUl/mDP87xXNppReB4SrMKDmjM6Hs1j3wcjwDyCixRgVgKDZhjfHOA4G26VtmIBFHpz7s+QSauK/csov7@lists.infradead.org X-Gm-Message-State: AOJu0YyayKD+3yNUx+JOXJuV49VQmC7b8EccSWFVZUbizJ+YiqXa6kwd Lymd+dR+aQA31ImVnS04Uytui2+ontKGwtr7IbUww13fVMXZk9YGjLcvt3y05Q== X-Google-Smtp-Source: AGHT+IEMIHQ8npyjfU/99fAX2NsP9PaKHpba5mfPSOR0IqSW7YKOpbx3Zp8jaGt7KFeqZbuG5u4Y4w== X-Received: by 2002:a05:6a20:e605:b0:1d9:69cb:9f90 with SMTP id adf61e73a8af0-1d9a83d10bdmr20483336637.19.1730271756808; Wed, 30 Oct 2024 00:02:36 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:d1f3:aa64:657f:d8a8]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72057931a94sm8635848b3a.68.2024.10.30.00.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 00:02:36 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] arm64: dts: mediatek: mt8183-kukui: Drop bogus fixed regulators Date: Wed, 30 Oct 2024 15:02:23 +0800 Message-ID: <20241030070224.1006331-5-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog In-Reply-To: <20241030070224.1006331-1-wenst@chromium.org> References: <20241030070224.1006331-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241030_000237_419545_673A3CF0 X-CRM114-Status: GOOD ( 13.42 ) 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 A couple of the fixed regulators in the Kukui dtsi do not actually exist in the hardware design; they are simply power rails connected together with 0 ohm bridges. Drop them and assign their upstream supplies to their consumers instead. Signed-off-by: Chen-Yu Tsai --- .../dts/mediatek/mt8183-kukui-katsu-sku32.dts | 2 +- .../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 2 +- .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 25 ++----------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts index 05361008e8ac..2b5a8d1f900e 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts @@ -23,7 +23,7 @@ touchscreen1: touchscreen@5d { interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>; - vdd-supply = <&lcd_pp3300>; + vdd-supply = <&pp3300_alw>; }; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts index cf008ed82878..75fadf2c7059 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts @@ -23,7 +23,7 @@ touchscreen1: touchscreen@5d { interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>; - vdd-supply = <&lcd_pp3300>; + vdd-supply = <&pp3300_alw>; }; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index e9e6253141c6..0cf50b1f59c8 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -52,27 +52,6 @@ it6505_pp18_reg: regulator0 { vin-supply = <&pp1800_alw>; }; - lcd_pp3300: regulator1 { - compatible = "regulator-fixed"; - regulator-name = "lcd_pp3300"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-boot-on; - }; - - mmc1_fixed_power: regulator3 { - compatible = "regulator-fixed"; - regulator-name = "mmc1_power"; - vin-supply = <&pp3300_alw>; - }; - - mmc1_fixed_io: regulator4 { - compatible = "regulator-fixed"; - regulator-name = "mmc1_io"; - vin-supply = <&pp1800_alw>; - }; - pp1800_alw: regulator5 { compatible = "regulator-fixed"; regulator-name = "pp1800_alw"; @@ -373,8 +352,8 @@ &mmc1 { pinctrl-names = "default", "state_uhs"; pinctrl-0 = <&mmc1_pins_default>; pinctrl-1 = <&mmc1_pins_uhs>; - vmmc-supply = <&mmc1_fixed_power>; - vqmmc-supply = <&mmc1_fixed_io>; + vmmc-supply = <&pp3300_alw>; + vqmmc-supply = <&pp1800_alw>; mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; max-frequency = <200000000>;