From patchwork Thu Dec 1 20:36:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 629955 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4186DC4321E for ; Thu, 1 Dec 2022 20:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230238AbiLAUhH (ORCPT ); Thu, 1 Dec 2022 15:37:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbiLAUhG (ORCPT ); Thu, 1 Dec 2022 15:37:06 -0500 Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11DFEBFCD4 for ; Thu, 1 Dec 2022 12:37:02 -0800 (PST) Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-13bd2aea61bso3588154fac.0 for ; Thu, 01 Dec 2022 12:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=HHhagubBU9I/eLAgfTTLb4aJShqjddvM8h9wwY5WXbk=; b=WOFAwNLlPMAJkPINQJWRTY8NNxpX2UsOwq/lRZ7LnqNfbPCPl0eoGZCVWqQAssTxo1 sMsqsGmPDPqYLYyKsmv2Kzn+jcE96esdcDcVbsTjbHxCqQxD3GuJVXSkVtz/Kv7u+3F6 JuWupgiHJuliheS4DsurKS5ocI4a8hAvp2nZDNfL2zXLmB/UuW3IDpi/EH2SGs8v62yg JK6lsIcAusewyCr+PFiK3GdvtIXE8qgC5PuIcE6/eyttzBt+uc+SZNou/ugsh5cXR2vy LlIyvb4WdBeMjbCPwEVDFks64mVxXTVdVi5DCg/7+wC+hM5bskdxgiaM1HZLUff9yLBV /yqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=HHhagubBU9I/eLAgfTTLb4aJShqjddvM8h9wwY5WXbk=; b=G0BRjmW1t3Xsq1IfSEESKT+eWA93sjHkm2sujwW1Ha6YVCOGBmcWgZO1w/XfbpKljR zpxppuJ2m3hJ6Dkm+r8QPFPaFcZXS47jZWF7atREHFikNx05uxuuIvjwhwbmc8b6qLIJ +LayfHPyxpfdlEkVrlhvYnJsNSLaZH1wM4hOBCPtW0ycAVLhQXNJoZ+D9r0IaqJlnrGd mcpzSp9oXDAuSZOhCU41IjjtnytEHLJVw1O7dck/xpj1qoUgnxFhnZIzTBUPQT6+Lg+e 1OQWM5WpkVrl3FjzuhzV/VN+j7sr0lrE9DMgaT7od1zGsvueSCRlXlC1gxXs4hFDuzPT HZ0Q== X-Gm-Message-State: ANoB5pl+Y1nPv/FQdVWOnaaSFfHkBCsBjPbe4338RIJANkjkon814iY6 4/xyGGl3syiflUdXnRmimYU= X-Google-Smtp-Source: AA0mqf7EnvyKcdI0cEdYMyvgGliVp9Y/xtR5JszOeeOoJnvBaEtCX5tleO0/+ysiEJLtYn5Q29AY4w== X-Received: by 2002:a05:6871:792:b0:141:c075:9346 with SMTP id o18-20020a056871079200b00141c0759346mr27877631oap.30.1669927021435; Thu, 01 Dec 2022 12:37:01 -0800 (PST) Received: from localhost.localdomain ([76.244.6.13]) by smtp.gmail.com with ESMTPSA id r81-20020a4a3754000000b0049fd73ccf72sm2142142oor.42.2022.12.01.12.37.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 12:37:00 -0800 (PST) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: devicetree@vger.kernel.org, maccraft123mc@gmail.com, heiko@sntech.de, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, Chris Morgan Subject: [PATCH 1/4] arm64: dts: rockchip: Change audio card name for Odroid Go Date: Thu, 1 Dec 2022 14:36:52 -0600 Message-Id: <20221201203655.1245-2-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201203655.1245-1-macroalpha82@gmail.com> References: <20221201203655.1245-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan Change the audio card name for the Odroid Go Advance series to rk817_int. This matches the audio card name of the Anbernic RG353V. This is done to provide a consistent card name so that a single ALSA UCM file can be used for all (identical) implementations of this codec and configuration combo. The rk817_int configuration is for when the internal speaker amplifier of the rk817 is used. The other Anbernic devices have the name as rk817_ext for when an external speaker amplifier is used. Signed-off-by: Chris Morgan --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi index fbc6bfbaa5c1..60063f4bb366 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi @@ -127,7 +127,7 @@ blue_led: led-0 { rk817-sound { compatible = "simple-audio-card"; - simple-audio-card,name = "Analog"; + simple-audio-card,name = "rk817_int"; simple-audio-card,format = "i2s"; simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>; simple-audio-card,mclk-fs = <256>; From patchwork Thu Dec 1 20:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 629953 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4BF8C4321E for ; Thu, 1 Dec 2022 20:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbiLAUhL (ORCPT ); Thu, 1 Dec 2022 15:37:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230338AbiLAUhH (ORCPT ); Thu, 1 Dec 2022 15:37:07 -0500 Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45DBEC054F for ; Thu, 1 Dec 2022 12:37:03 -0800 (PST) Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-13bd19c3b68so3503907fac.7 for ; Thu, 01 Dec 2022 12:37:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=kG+ctqd9teSCMiayuOxjPWFcl8agpohKd1uUpE0d4x0=; b=XFod0UnAcwD+9HZiFEkNVVUGDR7r1ylQFGkeOIptemvQBWaAm8mLU2oBy1tpxZxktJ NVFcw/h0kOr3HTw2wnyAaQlnuUoTNPQR9khmwGnmXNWy466LNGp9kbBckww6i48vwLfb nVZePvLt/0C2iqy1VDRpf4HUsRCh1OVFZfEnoZy0PBIw+x+RYNGeQCILCDwkoEiZPnvQ 9Gcq1B2V1O2Y3vK/3q+RfQQ5o0YYNjFdteTNFEF3TkK083ol/wmmCv/pbB3BdbXikwqh zby9Iy6GWBTDJOHBegLng3GTVXrLSkaVWNz3uHlxD6WPfOOB53QRTc0se7oJZgl6W9YZ Ojng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=kG+ctqd9teSCMiayuOxjPWFcl8agpohKd1uUpE0d4x0=; b=iIYw3Z73WAg2PhiBS6bNTi8yDt3Q+0GRyU0HxWmS+6QpbW7mXISt6qDTHRop9rXYzn atI4Ry26pQWQTaE71Qp6BdO5efzvrpEBUW77O9oRQOybAC85MzVrYIPhnRd+JBrAu72Q SlzMx0U7EDtGvlji+FEPAbyDRwcSXNBqUAwR1noZZWhEL+1cokUR2ppjAFHiJwCAg5a/ yPMT4XdUBMm5h+SppKUACphsqQ6Y2B+xWJgxgCK/FrkSiDKLAqEBlroaPZK+Rj1auGWS Ud0M9KWYza3l5fz4g4vbK2qAjGE3UtwWox5EcOInjuiYR2P0DNmELJ7QuwnDZ9ISLksv hzCg== X-Gm-Message-State: ANoB5pmzx3Xt1sphPEQDB0fByRlVsxVUm+pyXDdihmcPfjKZl2gFjPqf D2bN8giPzF9a84yuKYcJKYg= X-Google-Smtp-Source: AA0mqf4+24um7ZcR5CWbp77KpWBR42nA3acpMhuAqJ7rgMXGTdcB+7tCniwHGtESiGH09AMg14QD2Q== X-Received: by 2002:a05:6870:e88:b0:142:9422:84e4 with SMTP id mm8-20020a0568700e8800b00142942284e4mr29981790oab.57.1669927022468; Thu, 01 Dec 2022 12:37:02 -0800 (PST) Received: from localhost.localdomain ([76.244.6.13]) by smtp.gmail.com with ESMTPSA id r81-20020a4a3754000000b0049fd73ccf72sm2142142oor.42.2022.12.01.12.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 12:37:02 -0800 (PST) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: devicetree@vger.kernel.org, maccraft123mc@gmail.com, heiko@sntech.de, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, Chris Morgan Subject: [PATCH 2/4] arm64: dts: rockchip: don't set cpll rate for Odroid Go Date: Thu, 1 Dec 2022 14:36:53 -0600 Message-Id: <20221201203655.1245-3-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201203655.1245-1-macroalpha82@gmail.com> References: <20221201203655.1245-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan The Odroid Go Advance devicetree tries to set the rate for the cpll clock to 17MHz, which is not a supported rate. This fails, and triggers the error of "clk: couldn't set cpll clk rate to 17000000 (-22), current rate: 17000000" in the dmesg log. Remove the incorrect rate. Signed-off-by: Chris Morgan --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi index 60063f4bb366..802be64626d6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi @@ -192,14 +192,12 @@ &cru { assigned-clocks = <&cru PLL_NPLL>, <&cru ACLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, <&cru HCLK_BUS_PRE>, <&cru HCLK_PERI_PRE>, - <&cru PCLK_BUS_PRE>, <&cru SCLK_GPU>, - <&cru PLL_CPLL>; + <&cru PCLK_BUS_PRE>, <&cru SCLK_GPU>; assigned-clock-rates = <1188000000>, <200000000>, <200000000>, <150000000>, <150000000>, - <100000000>, <200000000>, - <17000000>; + <100000000>, <200000000>; }; &display_subsystem {