From patchwork Tue May 23 21:38:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 685165 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 3B17BC7EE23 for ; Tue, 23 May 2023 21:38:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238629AbjEWVig (ORCPT ); Tue, 23 May 2023 17:38:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237819AbjEWVif (ORCPT ); Tue, 23 May 2023 17:38:35 -0400 Received: from mail-oo1-xc2b.google.com (mail-oo1-xc2b.google.com [IPv6:2607:f8b0:4864:20::c2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79DFA11A for ; Tue, 23 May 2023 14:38:33 -0700 (PDT) Received: by mail-oo1-xc2b.google.com with SMTP id 006d021491bc7-54feb6cb568so175781eaf.0 for ; Tue, 23 May 2023 14:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684877913; x=1687469913; 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=VI4om0ZWAsAxPDpD0mRnXUe2apysOtTyxuri6O2D2jQ=; b=IxRFm84jrNoDiWcn5yW738bsCP5iCB0+EmH3a0i5BluwYlfXaNm4/LO8GY3bKEzmJk aCUSC36WK9GhGYMwwepdNTbFoMHV+9TH1Ejv1JYzw5H3OvwuyM24dFrcbPcCDReJJ6Kr 8cvW4zgnlcdef4f+/ud0PKulsS+offM0b4j5G/PpjSgQvaMfFsEU1iSRwDnvXhDXcRTe 46yPBK/3n5BC8K/XM8nT30CAWlpnUdlK4IHeL9973nRjPXGsjhek9YbZ+zWCLD1/L+ew iHluVRTd64DZ++VBCcP8GyEJxneQgfoWmLWDH2UJdk4ZZDp6zVOqV7imaCV51v09G+Cr f/kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684877913; x=1687469913; 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=VI4om0ZWAsAxPDpD0mRnXUe2apysOtTyxuri6O2D2jQ=; b=RYgXZNT1MR81lCtUjeIA6gsxoxeUSToJLEH1Ss34fsTR3KEvtBrWFAKgija9lTueWE 1SIUFe0XhIDDUrKQWCtWI5dfJbbuP6LyoO70wkQIIRwzEc7HFjhkrWDroen8rXiGltUd 97BqT72NdMI+oDJvRQR2LJUQDUNuQCVU92h/IhdoI6aVHNpGjlbn5Qex3/m4rzUbZ3ey MLdC7FRLeq93mSU102VTMZOyTWxsyxYL1sXymVDG+MuKe5L07gTG/hzmoaLrguDHlWRN wFVxmUcf0Ld9SqZ/pavI7oxIEAPtYJgc2bN4xg452vLOJDHlO4tBgbitxBdnApsnPAYC ELSg== X-Gm-Message-State: AC+VfDyuRNO1ohY9XZlpvG0lHKVN2+11ZtMktEIih8cE+pkF7YHudage avHcDl8S3F0BApI4odBnFOk= X-Google-Smtp-Source: ACHHUZ49snHGywQm22s3ZruIpUwwW0LIO0zG7T/h5lkdyPqari17yoPFvSZJS3L1hb8wzc7tjabbWQ== X-Received: by 2002:a05:6808:4043:b0:398:9ae:50cc with SMTP id cz3-20020a056808404300b0039809ae50ccmr4312004oib.41.1684877912654; Tue, 23 May 2023 14:38:32 -0700 (PDT) Received: from localhost.localdomain ([75.28.21.198]) by smtp.gmail.com with ESMTPSA id y83-20020acae156000000b0037832f60518sm4442359oig.14.2023.05.23.14.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 14:38:32 -0700 (PDT) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, zyw@rock-chips.com, sebastian.reichel@collabora.com, andyshrk@163.com, jagan@amarulasolutions.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, heiko@sntech.de, conor+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, Chris Morgan Subject: [PATCH 1/6] ASoC: es8328: Enabling support for 12Mhz sysclk Date: Tue, 23 May 2023 16:38:20 -0500 Message-Id: <20230523213825.120077-2-macroalpha82@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523213825.120077-1-macroalpha82@gmail.com> References: <20230523213825.120077-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan Enable support for 12Mhz sysclk on es8328. This sysclk value is used on the Indiedroid Nova rk3588s based single board computer. Signed-off-by: Chris Morgan Signed-off-by: Chris Zhong --- sound/soc/codecs/es8328.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index 160adc706cc6..3918be5fc3f1 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -36,6 +36,16 @@ static const struct snd_pcm_hw_constraint_list constraints_12288 = { .list = rates_12288, }; +static unsigned int ratios_12000[] = { + 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, + 48000, 88235, 96000, +}; + +static struct snd_pcm_hw_constraint_list constraints_12000 = { + .count = ARRAY_SIZE(ratios_12000), + .list = ratios_12000, +}; + static const unsigned int rates_11289[] = { 8018, 11025, 22050, 44100, 88200, }; @@ -577,6 +587,13 @@ static int es8328_set_sysclk(struct snd_soc_dai *codec_dai, es8328->sysclk_constraints = &constraints_12288; es8328->mclk_ratios = ratios_12288; break; + case 24000000: + mclkdiv2 = 1; + fallthrough; + case 12000000: + es8328->sysclk_constraints = &constraints_12000; + es8328->mclk_ratios = ratios_12000; + break; default: return -EINVAL; } From patchwork Tue May 23 21:38:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 685164 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 52241C7EE30 for ; Tue, 23 May 2023 21:38:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238204AbjEWVih (ORCPT ); Tue, 23 May 2023 17:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238625AbjEWVig (ORCPT ); Tue, 23 May 2023 17:38:36 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B700119 for ; Tue, 23 May 2023 14:38:35 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-392116ae103so210382b6e.0 for ; Tue, 23 May 2023 14:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684877914; x=1687469914; 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=0Mgi1xCWZGOa//ARDGoMV+dgV7iPjlGc+gvDlG8j5pY=; b=hXs8XQ+VsM0uKKwxB8QRLNQNK78Qca3/YA7XW2GEi+5SxI1BvHOMq29cvWlDDyWCRx LQMPDyJicTszBjUZFqQyb8dBZSRpecRDiOFuHGbfBALS3FpsWm/qn0i8U0+sb2ugQiaN Vv0EFEe1LsPAVWJn/ZvOxE5NGXNnhhLg8+ZW61HWZD/lfitjOcL8lAx9rcHrS39YkMek OT/pvEmzZ7UiwrzhchcRME1csW3c6bfihfCgAS0D6GGK48WYYcwk8jR6U40GO1xuTxwo QwWzLRpHI1F3C1g50tKvyelhXzCwSq63TCB6ACBIZ/w5MQa29W26kACfzo0c7lXYY3oz mgXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684877914; x=1687469914; 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=0Mgi1xCWZGOa//ARDGoMV+dgV7iPjlGc+gvDlG8j5pY=; b=JFR3dDXNPtVnLLCZB9VdC6TfBEN/abl5Z0d57Y1nWhaGnOIJWMB7asLae3VzJXfXcW WxV7xMW7bAKXrP8qYvfEpimPezvKjplOX+WUZZuuGYMjLVEtfeJiin6sQtekM7a2b8T4 BAJ2tsyVMbF/uqXgmvILhKRvWXyWXQn18iZU4sDWNnHjxOwRkw3diRSooO7BODYZTaqh W3OVcRdDDkfpEQXXWzBjKuXuWXOumysreAoAZV7leNEJq8lOUfxljz/2Mi+kCr1rKvUh VuiqHX03oC3Jlu2BefI6dC0RjPdhVJKrBdtWIPohV7oiReXroDhtuTaOxIyxxpun2UTP V8uQ== X-Gm-Message-State: AC+VfDyicSEM/lNnJTyG4SL8s9mV+mWx+Uvg/pN6zdvBQYgZkbLvmMhp 4ze8Uy0+xZAl1IQO9h/ryYc= X-Google-Smtp-Source: ACHHUZ5j0wmMDzm4NXi9K7ZqQmj6d+e/UrUvMChhWlONqjQFtk+tG5LyXBhsF5o/9phbxLMt9cM1iA== X-Received: by 2002:a05:6808:4c4:b0:394:2868:d51f with SMTP id a4-20020a05680804c400b003942868d51fmr7767223oie.4.1684877914232; Tue, 23 May 2023 14:38:34 -0700 (PDT) Received: from localhost.localdomain ([75.28.21.198]) by smtp.gmail.com with ESMTPSA id y83-20020acae156000000b0037832f60518sm4442359oig.14.2023.05.23.14.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 14:38:33 -0700 (PDT) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, zyw@rock-chips.com, sebastian.reichel@collabora.com, andyshrk@163.com, jagan@amarulasolutions.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, heiko@sntech.de, conor+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, Chris Morgan Subject: [PATCH 3/6] arm64: dts: rockchip: Add sdio node to rk3588 Date: Tue, 23 May 2023 16:38:22 -0500 Message-Id: <20230523213825.120077-4-macroalpha82@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523213825.120077-1-macroalpha82@gmail.com> References: <20230523213825.120077-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan Add SDIO node for rk3588/rk3588s. Signed-off-by: Chris Morgan --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 571cdec24a66..6335d5648bc3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -1176,6 +1176,21 @@ sdmmc: mmc@fe2c0000 { status = "disabled"; }; + sdio: mmc@fe2d0000 { + compatible = "rockchip,rk3588-dw-mshc", "rockchip,rk3288-dw-mshc"; + reg = <0x00 0xfe2d0000 0x00 0x4000>; + interrupts = ; + clocks = <&cru HCLK_SDIO>, <&cru CCLK_SRC_SDIO>, + <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; + clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; + fifo-depth = <0x100>; + max-frequency = <200000000>; + pinctrl-names = "default"; + pinctrl-0 = <&sdiom1_pins>; + power-domains = <&power RK3588_PD_SDIO>; + status = "disabled"; + }; + sdhci: mmc@fe2e0000 { compatible = "rockchip,rk3588-dwcmshc"; reg = <0x0 0xfe2e0000 0x0 0x10000>; From patchwork Tue May 23 21:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 685163 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 9B9BCC7EE23 for ; Tue, 23 May 2023 21:38:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238615AbjEWVij (ORCPT ); Tue, 23 May 2023 17:38:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238617AbjEWVih (ORCPT ); Tue, 23 May 2023 17:38:37 -0400 Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6835CFA for ; Tue, 23 May 2023 14:38:36 -0700 (PDT) Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-19c7e1acf9eso141782fac.1 for ; Tue, 23 May 2023 14:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684877915; x=1687469915; 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=Ix+1iyVwvq5YDYEbZ/aFgQhyfZBXx0DvBnZd+gR5Wcw=; b=ikhR7QD/PWZ9AYHLbDesyyyoL21t6ku6E+41m6IIb3rJAyTZa4y97wt1OdHqmM/ThV dQNCAVfTtqpH/ur0Wb+768h9L/sIAADrlZX3mccXAGngeKayrYtjU9zNcfWOQ6C+Rrah 2BQ4Q1uqiJKhlh5ISf7UUQjMpS46akCCq8YUceSJVYEj/GTljoX7zPSE/Ecw85KHwTJX ElFjA9JBheP0pXhfqpRKOro/LgIxsgBYO0Wqq2l2aFP4eT/ukIy0Q/3GYBg4rVWfruF3 wFnd6DlYtg0KKBb+J7/iIO3oxGX3S57WsL4Gl4Oz0tWMop4ljmmrYDPZREebi80HEV6Z DPUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684877915; x=1687469915; 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=Ix+1iyVwvq5YDYEbZ/aFgQhyfZBXx0DvBnZd+gR5Wcw=; b=NyWrQDpMoso9GXoUSdCWqwTRBLXPTHHphsTJyIwi/il7s1SovPTDEVEiNJvdsRthMW tdN/AzNpL12D/2IN0LMVWeQgbkhMZ5y8vzQF+lYOcns+9nomyH2Y/rUjK0cIbh2YOfRz jmU0mI3bDQlKjceVSPYD5FvtNZ4S9+U/r6ZCcAvcpwXglT6dU+ixLFw6pxZ+Ec+eZ2cL 4i25S6w/JUtM6ehMdD+FyG3dJmQgK1PTlRHN6Txkh/EHh4CAnvsVjp1pcNrz6+fX6CFY tum6zv/M3aE0sGJc2MDfI5ZA/hsGvANqy/K/Wl+Oc2x79oDcByHdxP8vV1sAKOJ+C56x D5Lw== X-Gm-Message-State: AC+VfDyEcJJ2Ddpv0z1uALLv+nbmy2rNH521rYxaQ1ifRK4EOsvrZcMy UzcJOZGoQjhRG+UC2rcGqp0= X-Google-Smtp-Source: ACHHUZ5MneObFTHYZ+sAb7c/LwLONHBsL0zmQRw5S21Rr5FCtGfmJRScWF1vi/l6oY18WrpSERHDSQ== X-Received: by 2002:a05:6808:4293:b0:397:fc20:385 with SMTP id dq19-20020a056808429300b00397fc200385mr4226191oib.28.1684877915719; Tue, 23 May 2023 14:38:35 -0700 (PDT) Received: from localhost.localdomain ([75.28.21.198]) by smtp.gmail.com with ESMTPSA id y83-20020acae156000000b0037832f60518sm4442359oig.14.2023.05.23.14.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 14:38:35 -0700 (PDT) From: Chris Morgan To: linux-rockchip@lists.infradead.org Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, zyw@rock-chips.com, sebastian.reichel@collabora.com, andyshrk@163.com, jagan@amarulasolutions.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, heiko@sntech.de, conor+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, Chris Morgan Subject: [PATCH 5/6] dt-bindings: arm: rockchip: Add Indiedroid Nova Date: Tue, 23 May 2023 16:38:24 -0500 Message-Id: <20230523213825.120077-6-macroalpha82@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230523213825.120077-1-macroalpha82@gmail.com> References: <20230523213825.120077-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Chris Morgan Add Indiedroid Nova, an rk3588s based single board computer. Signed-off-by: Chris Morgan --- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index ec141c937b8b..3c5a204bcd81 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -542,6 +542,11 @@ properties: - khadas,edge-v - const: rockchip,rk3399 + - description: Indiedroid Nova SBC + items: + - const: indiedroid,nova + - const: rockchip,rk3588s + - description: Khadas Edge2 series boards items: - const: khadas,edge2