From patchwork Fri Jan 14 23:02:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 12714195 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 86393C433EF for ; Fri, 14 Jan 2022 23:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zGlKU+5FVqRz2iE4rmvnBAMMhf+/aE1cW+wi6Z0UY/M=; b=jWG/wfT5BDiX9W uAuYFNiKCdWkF+1vR9dsg7wWK3Cw5pqCsUDoDuaMHAUMyyM1IVTWwMSZ4UtAiwG71XsY+Czbbc3s0 AVGXRKmHF31UZUjxMxcmWFPVgvMDrN9SOUZ1bsRQDv8vkyoc+k6R80oZbXlmckct72LXbxEkhwSvM UErZmFMa/mgSvCJfk3Llzpi8iUNbYM47WIcS5wSwoZOvsFerhA85KoPS+uNIMGH62eSI9pm+Rgcip QPOliMpCLfYC51Ke4Rx+dv6iVyewwM/tXFRjNl5m4yFII7d1rCtfT1SVwAKStebFh/CSXHXkR/CCS kERGNXDBi/DtMc6wlVow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8Vas-00ANPk-Mp; Fri, 14 Jan 2022 23:02:50 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n8VaX-00ANEp-KX for linux-arm-kernel@lists.infradead.org; Fri, 14 Jan 2022 23:02:31 +0000 Received: by mail-pf1-x42a.google.com with SMTP id i65so4062779pfc.9 for ; Fri, 14 Jan 2022 15:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o2h9cZxYJ3emYpUIj++uO1rilt4TStZ87q6578VwqZA=; b=htS6cflFJn1ZL5Y0EPBeN6hbyK7QvRLQG6rL5+hf+Wyp/p/OwvwAl+Evj2ZQ1THw8U UC6WEz/EhH69UAKuS4Z7gffz1k2LATR0EJgozsv2LnARXXrqxKBBQ4ABYZcLLxPDoo6k 9jAJ1rcvLoaJTprwBOkTnDB9oHf7Sk8iuKDJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o2h9cZxYJ3emYpUIj++uO1rilt4TStZ87q6578VwqZA=; b=J8I2o3ESRwXfQZV1WLD5QYMZcNviV8jIIVxl8vwqHJDNagHXM2ECUhEkHK+Ar6W+at e7x60uQBd7V0yNqpclLtyB+yg+85vuL65VLDqeoUwXW1KJ65dxfnFTvC4yiCw54ShgoC k5Eizvr1dgbPOj33L+BU3kNgKjn5Xnd6T9mnb84U+ddfhplkjBTzh5/GF3bpx56PSsR2 IHMJpW04Z4DMSORcKwN+M3bVdXyb0BrCEajq5uwkTh2a/SWBDZDsyuNDqQUtBdQN4ieR RnE58KZb+fs87xPY2jhJa/A0Pl0Bgcyqlxr1474mnsg4zOZqKpF41dF6E/HrUF5i+qat 7iCA== X-Gm-Message-State: AOAM533/WwhnAFQmXvN294Q+b3567rFBuI7RRxbnv5lxGW9WwlJxI6Gf YQBUKS8bKqk+GX+qsBSgpdVHig== X-Google-Smtp-Source: ABdhPJyUUCEgb915ys8+J2HAqJSVrMJLFjTcoRKHgsU+KV+w14oykK1ZzYgHLlzxpYzPiETOK+okYA== X-Received: by 2002:a05:6a00:2408:b0:4c1:e1a1:770 with SMTP id z8-20020a056a00240800b004c1e1a10770mr10548879pfh.70.1642201348060; Fri, 14 Jan 2022 15:02:28 -0800 (PST) Received: from localhost ([2620:15c:202:201:76ab:ede1:503d:1c39]) by smtp.gmail.com with UTF8SMTPSA id h11sm6161656pjs.10.2022.01.14.15.02.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 15:02:27 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Liam Girdwood , Mark Brown , David Airlie , Daniel Vetter Cc: linux-rockchip@lists.infradead.org, Lin Huang , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Rob Herring , Sandy Huang , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, Brian Norris Subject: [PATCH v2 1/3] arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output Date: Fri, 14 Jan 2022 15:02:07 -0800 Message-Id: <20220114150129.v2.1.I46f64b00508d9dff34abe1c3e8d2defdab4ea1e5@changeid> X-Mailer: git-send-email 2.34.1.703.g22d0c6ccf7-goog In-Reply-To: <20220114230209.4091727-1-briannorris@chromium.org> References: <20220114230209.4091727-1-briannorris@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220114_150229_695697_FD7490D9 X-CRM114-Status: GOOD ( 16.78 ) 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 Commit b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") switched the platform to SPDIF, but we didn't fix up the device tree. Drop the pinctrl settings, because the 'spdif_bus' pins are either: * unused (on kevin, bob), so the settings is ~harmless * used by a different function (on scarlet), which causes probe failures (!!) Fixes: b18c6c3c7768 ("ASoC: rockchip: cdn-dp sound output use spdif") Signed-off-by: Brian Norris Reviewed-by: Chen-Yu Tsai --- Changes in v2: - (Un)set pinctrl, because the default assumes we're routing out to external pins arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 45a5ae5d2027..162f08bca0d4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -286,7 +286,7 @@ max98357a: max98357a { sound: sound { compatible = "rockchip,rk3399-gru-sound"; - rockchip,cpu = <&i2s0 &i2s2>; + rockchip,cpu = <&i2s0 &spdif>; }; }; @@ -437,10 +437,6 @@ &i2s0 { status = "okay"; }; -&i2s2 { - status = "okay"; -}; - &io_domains { status = "okay"; @@ -537,6 +533,17 @@ &sdmmc { vqmmc-supply = <&ppvar_sd_card_io>; }; +&spdif { + status = "okay"; + + /* + * SPDIF is routed internally to DP; we either don't use these pins, or + * mux them to something else. + */ + /delete-property/ pinctrl-0; + /delete-property/ pinctrl-names; +}; + &spi1 { status = "okay";