From patchwork Wed Oct 25 09:38:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 157962 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2476981vqx; Wed, 25 Oct 2023 02:38:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaxTIrPoN7O07HeehG8+s7ULweQG8eb3d+x15AJ/wLXgy5tkPKck2+IWf9RjhRRNlJvV4n X-Received: by 2002:a0d:df13:0:b0:59b:cd92:779f with SMTP id i19-20020a0ddf13000000b0059bcd92779fmr17105006ywe.6.1698226729798; Wed, 25 Oct 2023 02:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698226729; cv=none; d=google.com; s=arc-20160816; b=vzY7Owd7H2CPLeFCgmJeSlRGxwH3fQ6iVccPpIN5Dh56kRy+LF9hfhdiYgzdFs530O bjVdSKRqsBe79r61T/1JIOQTmLhJ7UqtjgoFE+4+M+SKqNwyS+1PrOXdpZb6F12ciCtK pSsTEer8V6s8i9ar2lWDdNYh3tAkyZpH5F3p4hY9OF5oMNbnWtnkTP3DH+1HgD9O4P7b 3EWd1y4BODpVHm7rIZfIhdFiOuZHVmyF/sCQWFokqvl/O2btRfaPXY/Yta6MoUkQCgFH ArIgZ44OXvey5VHdURMKTCGlz3VUcA0s0P6Qq7BslquW14U+ET6BhSohwSUpECANwBBf ATcg== 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=MatzgOf7PbhCmZ2actbMwjSD4SoxiQ5GK8jq2Yu9SsA=; fh=ayhlp0U6+hAxjkLBlKEPH7IIc0C8EMfuxO2q4E9E+mM=; b=Pu8Z7hfWnzzaiEOw+aZBK7cUYOIg/OvibNLT+W5wrsKRwTwq46K6vvSwkTwg5Bc2H7 2yNQpUS9/Uwr3S/6U3uYdMAZPA3jRZrcXXMwgtIexvH3ZW1/6TCX2c/cezpkcSBk14I/ Ywfe16My09gbV0AW0PQdtR4cd9fQSdnkUziWUrIxUTWw+vlLBimgv6LCkq9xBHwOWbYi Xw6mgerk66AGRyJ3ogMrr4DNqk/9M0ZpSO7ItUprm//qXmqT4k+PCzvOj6FMEqzH7jFS PfTFfyoCTHMIc3X9fBAknAzTvvNXyzpqICZ7EQVhdc35sF0KY9FHw7DuaHIYL23SrKJq myKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=hNT9Y9ku; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z20-20020a81c214000000b00589e0b45eebsi10224391ywc.568.2023.10.25.02.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 02:38:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=hNT9Y9ku; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4A8CA801B425; Wed, 25 Oct 2023 02:38:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234587AbjJYJip (ORCPT + 26 others); Wed, 25 Oct 2023 05:38:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232584AbjJYJig (ORCPT ); Wed, 25 Oct 2023 05:38:36 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAB6FDD; Wed, 25 Oct 2023 02:38:33 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 233C36607343; Wed, 25 Oct 2023 10:38:31 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698226712; bh=AFlEOUVjbOzAnHyui64UF1ujgtQlWC3TJ1hlamraKoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hNT9Y9kuwhXIGmrEymlSH/2fhjhdokV6gsZXipbzAPcb4ieCXyW1cdP3PzCdF4/ib XzJO8ZV0UNeI467iyy4ZfTVDW+esaQM/FHrq/yx6jdn0lxPyuiyWS0Y46KowCLQe5S 9m9C5R1gXlCIXAZYue+thNVJqBQZcfr5Qz2jTraSLN8iTe9ImnCikFk5EjBMBZCZ3G BYquAIN4IfqtE4r4nvQqi1/gV83P2gccKIUc1P2793707iPS6pMLOO25fewgxOhopp sPhpVJu1n/jf9awmWFLp4+4q22OReZ28kZnHQDec7oZGN6h5IEDDSIHi8be/Xvhn2b 674KlWjagUcvg== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: hsinyi@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, angelogioacchino.delregno@collabora.com, erin.lo@mediatek.com, eddie.huang@mediatek.com, pihsun@chromium.org, fparent@baylibre.com, chunfeng.yun@mediatek.com, gregkh@linuxfoundation.org, michael.kao@mediatek.com, mka@chromium.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH 2/8] arm64: dts: mediatek: mt8173: Use interrupts-extended where possible Date: Wed, 25 Oct 2023 11:38:10 +0200 Message-ID: <20231025093816.44327-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231025093816.44327-1-angelogioacchino.delregno@collabora.com> References: <20231025093816.44327-1-angelogioacchino.delregno@collabora.com> 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,SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 02:38:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780719791199032730 X-GMAIL-MSGID: 1780719791199032730 Change all instances of interrupt-parent + interrupts to one line as interrupts-extended where possible across all MT8173 DTs to both simplify and reduce code size. Signed-off-by: AngeloGioacchino Del Regno --- .../boot/dts/mediatek/mt8173-elm-hana.dtsi | 9 +++---- arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 24 +++++++------------ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 +-- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi index bdcd35cecad9..90cbbc18a483 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi @@ -13,8 +13,7 @@ &i2c3 { touchscreen2: touchscreen@34 { compatible = "melfas,mip4_ts"; reg = <0x34>; - interrupt-parent = <&pio>; - interrupts = <88 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>; }; /* @@ -26,8 +25,7 @@ touchscreen3: touchscreen@20 { compatible = "hid-over-i2c"; reg = <0x20>; hid-descr-addr = <0x0020>; - interrupt-parent = <&pio>; - interrupts = <88 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>; }; }; @@ -39,8 +37,7 @@ &i2c4 { */ trackpad2: trackpad@2c { compatible = "hid-over-i2c"; - interrupt-parent = <&pio>; - interrupts = <117 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>; reg = <0x2c>; hid-descr-addr = <0x0020>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index 111495622cac..8d614ac2c58e 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -245,8 +245,7 @@ rt5650: audio-codec@1a { reg = <0x1a>; avdd-supply = <&mt6397_vgp1_reg>; cpvdd-supply = <&mt6397_vcama_reg>; - interrupt-parent = <&pio>; - interrupts = <3 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&pio 3 IRQ_TYPE_EDGE_BOTH>; pinctrl-names = "default"; pinctrl-0 = <&rt5650_irq>; #sound-dai-cells = <1>; @@ -308,8 +307,7 @@ &i2c1 { da9211: da9211@68 { compatible = "dlg,da9211"; reg = <0x68>; - interrupt-parent = <&pio>; - interrupts = <15 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 15 IRQ_TYPE_LEVEL_LOW>; regulators { da9211_vcpu_reg: BUCKA { @@ -353,8 +351,7 @@ &i2c3 { touchscreen: touchscreen@10 { compatible = "elan,ekth3500"; reg = <0x10>; - interrupt-parent = <&pio>; - interrupts = <88 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 88 IRQ_TYPE_LEVEL_LOW>; }; }; @@ -366,8 +363,7 @@ &i2c4 { trackpad: trackpad@15 { compatible = "elan,ekth3000"; - interrupt-parent = <&pio>; - interrupts = <117 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 117 IRQ_TYPE_LEVEL_LOW>; reg = <0x15>; vcc-supply = <&mt6397_vgp6_reg>; wakeup-source; @@ -439,8 +435,7 @@ &mmc3 { btmrvl: btmrvl@2 { compatible = "marvell,sd8897-bt"; reg = <2>; - interrupt-parent = <&pio>; - interrupts = <119 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 119 IRQ_TYPE_LEVEL_LOW>; marvell,wakeup-pin = /bits/ 16 <0x0d>; marvell,wakeup-gap-ms = /bits/ 16 <0x64>; }; @@ -448,8 +443,7 @@ btmrvl: btmrvl@2 { mwifiex: mwifiex@1 { compatible = "marvell,sd8897"; reg = <1>; - interrupt-parent = <&pio>; - interrupts = <38 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 38 IRQ_TYPE_LEVEL_LOW>; marvell,wakeup-pin = <3>; }; }; @@ -933,8 +927,7 @@ pmic: pmic { compatible = "mediatek,mt6397"; #address-cells = <1>; #size-cells = <1>; - interrupt-parent = <&pio>; - interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_HIGH>; interrupt-controller; #interrupt-cells = <2>; @@ -1160,8 +1153,7 @@ cros_ec: ec@0 { compatible = "google,cros-ec-spi"; reg = <0x0>; spi-max-frequency = <12000000>; - interrupt-parent = <&pio>; - interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + interrupts-extended = <&pio 0 IRQ_TYPE_LEVEL_LOW>; google,cros-ec-spi-msg-delay = <500>; i2c_tunnel: i2c-tunnel0 { diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts index 5122963d8743..692e8173c9eb 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -303,8 +303,7 @@ &pwrap { pmic: pmic { compatible = "mediatek,mt6397"; - interrupt-parent = <&pio>; - interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + interrupts-extended = <&pio 11 IRQ_TYPE_LEVEL_HIGH>; interrupt-controller; #interrupt-cells = <2>;