From patchwork Tue Oct 8 08:21:59 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: 13825992 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 46BEECED274 for ; Tue, 8 Oct 2024 08:38:41 +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: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:In-Reply-To:References:List-Owner; bh=AEmpf1Qh2kfZRDBsrgiylITiUd0y+4rTAJ+KrYJvhnY=; b=FYtMiPxk7jIjN3uiD9UOsEztkX GsLB70+1bH5O1b9EfXprvNCwuskWqj74WcYixP9ShkQOyPYLCZlnW0FpckQDDU0em8cRZ/CP6WyHO gTyrn0FTyVDQVqCtE64gpBiI2GkWklQ5m/5OPMGrem2Z1BYyTCyrbNNR+/fR4HgoG0d9dMyTmWz7a TMhBEWqS4u2C4sshuLV/pSl9F39DdaMNvtIgHAA2XvhCsJeJUFEM7bMm3TU83DS0Pv/PYJS/WoYfd UGm6nvKJVgHPseG6rilvZx28oAH2CMNKdeYdVGCRuA28OUEZT3ajS+HTAm8VMFZp7HTx9itRXiT7U o813yfTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sy5je-000000055MK-11tz; Tue, 08 Oct 2024 08:38:26 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sy5Tq-000000050Fo-3VGs for linux-arm-kernel@lists.infradead.org; Tue, 08 Oct 2024 08:22:08 +0000 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-71df7632055so2549197b3a.3 for ; Tue, 08 Oct 2024 01:22:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728375726; x=1728980526; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=AEmpf1Qh2kfZRDBsrgiylITiUd0y+4rTAJ+KrYJvhnY=; b=cFYxltDo26RPeZA/E4Exu6yd4KjUiAJcjpeO2y+ijqjpVCfHeR5QLUCwVIK3XAMenL S4aqopsBu8uBEeW0d7CpG/+fJss75SkbllQd58G07PCJq3oEhWDCo4FvqyVPC4Wba4VY YybmYVRpjyq60I7sPV3nDDC1NZeRKdYoUIrqw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728375726; x=1728980526; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AEmpf1Qh2kfZRDBsrgiylITiUd0y+4rTAJ+KrYJvhnY=; b=Av6h4xkt+VB201SBfImIjb0JQK5nDpyWxTMKyQlc8pYyb0zsTX5/GDU5X56aaIJfYp JDQf694qQxi5Bq3Au1190HEaxbk8ytabkSCOnteoZwqijYpfEBWvMVGoYm3uHD9NgvuQ bkIN3Zrb91Id7zQP+7movq+P/2xGXZl34RUM6IJu+r6ryM8rO9OWSy5yuwOgGHw2MJWg CRp3wYOfsmbism8j5cSkbHkbWlOZxjASiLIUO6FNdTGCOP6YA0UlLUnv4BLGJrrnge1j dDPSp2Sg0ZaY7CAgaJB4eMyhK4Pqt0LtAnTf/xp+FALLzixdBy8yI2rqBfmb0bQ5evLM 7KWg== X-Forwarded-Encrypted: i=1; AJvYcCWfIGPuLsgwHkBcRxaRVcGYjIxdgVnz1URGSHq5EyY4QD3ZzjYsm0W3SQUvOV2NL+5Yetfzt8dENqo6/DeKSoKV@lists.infradead.org X-Gm-Message-State: AOJu0Yz0yqGG1Seu/frabUJjhfCqZmMEbRstGJ3whcnUusd/O8CzjWWE /32AlMGq5OlA+9f8ipjqD7V1vblunK1Hg/BcaBPpr6SCmLPEZJjsXi5XatFTXw== X-Google-Smtp-Source: AGHT+IGs6ruuA946P6zuVAHheO6fA4ce2N15T5/3R5m2iMP4gQbVW50etvU9cRYSthEEe6bgR250uQ== X-Received: by 2002:a05:6a00:c8b:b0:71e:cb:e7b2 with SMTP id d2e1a72fcca58-71e00cbe85amr2649580b3a.21.1728375725616; Tue, 08 Oct 2024 01:22:05 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:10df:d27e:8d4b:6740]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e9f6c4ce2bsm6247176a12.83.2024.10.08.01.22.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 01:22:05 -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, stable@vger.kernel.org Subject: [PATCH] arm64: dts: mediatek: mt8186-corsola-voltorb: Merge speaker codec nodes Date: Tue, 8 Oct 2024 16:21:59 +0800 Message-ID: <20241008082200.4002798-1-wenst@chromium.org> X-Mailer: git-send-email 2.47.0.rc0.187.ge670bccf7e-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241008_012206_897976_A5146484 X-CRM114-Status: GOOD ( 13.52 ) 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 The Voltorb device uses a speaker codec different from the original Corsola device. When the Voltorb device tree was first added, the new codec was added as a separate node when it should have just replaced the existing one. Merge the two nodes. The only differences are the compatible string and the GPIO line property name. This keeps the device node path for the speaker codec the same across the MT8186 Chromebook line. Fixes: 321ad586e607 ("arm64: dts: mediatek: Add MT8186 Voltorb Chromebooks") Cc: Signed-off-by: Chen-Yu Tsai --- .../dts/mediatek/mt8186-corsola-voltorb.dtsi | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi index 52ec58128d56..fbcd97069df9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi @@ -10,12 +10,6 @@ / { chassis-type = "laptop"; - - max98360a: max98360a { - compatible = "maxim,max98360a"; - sdmode-gpios = <&pio 150 GPIO_ACTIVE_HIGH>; - #sound-dai-cells = <0>; - }; }; &cpu6 { @@ -59,19 +53,14 @@ &cluster1_opp_15 { opp-hz = /bits/ 64 <2200000000>; }; -&rt1019p{ - status = "disabled"; +&rt1019p { + compatible = "maxim,max98360a"; + sdmode-gpios = <&pio 150 GPIO_ACTIVE_HIGH>; + /delete-property/ sdb-gpios; }; &sound { compatible = "mediatek,mt8186-mt6366-rt5682s-max98360-sound"; - status = "okay"; - - spk-hdmi-playback-dai-link { - codec { - sound-dai = <&it6505dptx>, <&max98360a>; - }; - }; }; &spmi {