From patchwork Tue May 9 12:42:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan MacDonald X-Patchwork-Id: 13235782 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 2D8D4C7EE24 for ; Tue, 9 May 2023 12:43:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234716AbjEIMnJ (ORCPT ); Tue, 9 May 2023 08:43:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234704AbjEIMnF (ORCPT ); Tue, 9 May 2023 08:43:05 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67E1E4C1A; Tue, 9 May 2023 05:42:49 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3062db220a3so3753184f8f.0; Tue, 09 May 2023 05:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683636163; x=1686228163; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ogUelxBN/iBvkYaR2z1a5yJ9iiiICSJTX6onuQ39wKc=; b=bP7R25534DGHvBCha1PbVOLFyNyApN14uU0+rqLMNhnVLU10jdo0WpgiD4Fm5V0yAI qB9qqNDTJNCGQpxxKLifFkvcNrAT6QpRIzcuFAQOHfNsG4T1LJkdu9BJqroSTIQuCnSH hVmH8GmS4d3T4uHCkbAxE+GJfb+6wFmAyVPw8Qr8/MJJwoTr0DX3abclrKNkPLwDd3qq QnkES30ONz6qzfN90XpFKCc6PfH1ofxZHL/Kfgi8YzSg/5h5z+MdHLX6fTrmTadngxAg nsULLXonZPl8d+eq1IQ4r5tR/1ucDnjMokuQ606bWx9lLRVU7nOwih+KSmfHz8CWWfn8 2Ykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683636163; x=1686228163; 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=ogUelxBN/iBvkYaR2z1a5yJ9iiiICSJTX6onuQ39wKc=; b=IhkAgda/IgAVEFTtxKaJ7Z6LrvOQg85j5YFFXU+A+e4dgv4bjcJMlXn8vOiCSDOR8m Ttrmy4lXS8rmzIx44wk4xmUis6tjNyznFha/QS6aXbQap4OtljatYHFs2HUQLfcwyVPb oEKXLH98pYtt8vjuLhZ6x8ombL4uqWnFW6Id3xQ4cmSoGTk7z5TqjhpID1kB7Sio6QAe PZa+pXf75mSLeaHMOuu+elZ76jPDAco1y9C6woaNYccrI2x2eSVDzyjZ7msCU+51LcHZ X7XK5FcfLWt5qbYtTQ1t+moRgAAbc1ux3iOf5A057ibhRvEQghIzjyhL00I30RK5MNwH 5ykQ== X-Gm-Message-State: AC+VfDzV9AHiEwpazotJBtL/owgvtpbN/sESEuTkcBEa94MCTKfAVdrG 4nChmAW5loeJ+60dJDnZ6MI= X-Google-Smtp-Source: ACHHUZ4OvsksKT0JGRCaHiq1efo16lO58Z2ioXMGYLZCNfBtE3MpDpTy4POSymXX2RrynXBHt6s39g== X-Received: by 2002:a05:6000:1a48:b0:306:34e4:be40 with SMTP id t8-20020a0560001a4800b0030634e4be40mr8884827wry.33.1683636163178; Tue, 09 May 2023 05:42:43 -0700 (PDT) Received: from localhost ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id i14-20020a5d558e000000b003079f2c2de7sm3058083wrv.112.2023.05.09.05.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 05:42:42 -0700 (PDT) From: Aidan MacDonald To: broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, tsbogend@alpha.franken.de, paul@crapouillou.net Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH v1 1/3] ASoC: jz4740-i2s: Add support for X1000 SoC Date: Tue, 9 May 2023 13:42:36 +0100 Message-Id: <20230509124238.195191-1-aidanmacdonald.0x0@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The X1000's AIC is similar to the AIC found on other Ingenic SoCs. It has symmetric playback/capture rates like the JZ4740, but more flexible clocking when outputting the system or bit clocks. Signed-off-by: Aidan MacDonald --- sound/soc/jz4740/jz4740-i2s.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 6d9cfe0a5041..7cb563bb8b09 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -329,6 +329,14 @@ static const struct i2s_soc_info jz4760_i2s_soc_info = { .field_i2sdiv_playback = REG_FIELD(JZ_REG_AIC_CLK_DIV, 0, 3), }; +static const struct i2s_soc_info x1000_i2s_soc_info = { + .dai = &jz4740_i2s_dai, + .field_rx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 24, 27), + .field_tx_fifo_thresh = REG_FIELD(JZ_REG_AIC_CONF, 16, 20), + .field_i2sdiv_capture = REG_FIELD(JZ_REG_AIC_CLK_DIV, 0, 8), + .field_i2sdiv_playback = REG_FIELD(JZ_REG_AIC_CLK_DIV, 0, 8), +}; + static struct snd_soc_dai_driver jz4770_i2s_dai = { .probe = jz4740_i2s_dai_probe, .playback = { @@ -440,6 +448,7 @@ static const struct of_device_id jz4740_of_matches[] = { { .compatible = "ingenic,jz4760-i2s", .data = &jz4760_i2s_soc_info }, { .compatible = "ingenic,jz4770-i2s", .data = &jz4770_i2s_soc_info }, { .compatible = "ingenic,jz4780-i2s", .data = &jz4780_i2s_soc_info }, + { .compatible = "ingenic,x1000-i2s", .data = &x1000_i2s_soc_info }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, jz4740_of_matches); From patchwork Tue May 9 12:42:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan MacDonald X-Patchwork-Id: 13235783 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 646DEC7EE22 for ; Tue, 9 May 2023 12:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234828AbjEIMnK (ORCPT ); Tue, 9 May 2023 08:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230060AbjEIMnI (ORCPT ); Tue, 9 May 2023 08:43:08 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D91E525E; Tue, 9 May 2023 05:42:51 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3f42b984405so5181575e9.3; Tue, 09 May 2023 05:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683636164; x=1686228164; 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=5LNn6nFKtK6r2VL4gNamF8ksWMIm4Y9cfvJCgSo1awo=; b=mEu7EgzD3/wxi5z97BM9R3EjmlIs19wq/1FfH07l2LsO5IkpZQ4l/tM4OlRkLZ9JDw eUL0X6Tvu1vXGGcximjiZvAuzwh4Vbh6GDqhOEVihYT257kztfihiZbhAbVgx/vo+/sp DixHzNs3pZSUgi7Vm67heH0Ykzl+/VLRxsVsVFoH+gAKnbxYr4Qdp5Nk3IYbBwnLSh6+ whJXIpx7zZevmEWsn43U5IqzIFxtkMsFu4gaLq/xLA4EDTKn0kUnitRodUufZbcVQBG8 zEG2G9YqY1tL7WV7VmKkGzrA6DXucS4JDQifN+Qs3bSgPpbTwF5T6bVSn4kzhxvI3+bn u4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683636164; x=1686228164; 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=5LNn6nFKtK6r2VL4gNamF8ksWMIm4Y9cfvJCgSo1awo=; b=NjzE9tPCTqJBBtZ6JgayL9CYXl5NFD6uGVk4UelHnv7jkbSwIb91qSVSwAuVo37pxS pLV5qJbTNaaPWA3eKIlZ2LZqz3uTvGLZ/Qkk0QU0XT2OS2QcI+hLC+WeRBKnWMaq/pJb itawMyp7XiGfOY1b5C9DYEcL4DanHVfpYDGuj9GqpVyD+Hl2oeIqrh+xilztfn22oE9J QiuA+owl8zEP7yFK4tonrwihFEu/YC3VQ0KrQMmsXMc/3TQxMT8WmU3RRkwxrEffv69x Hlifydk4XUNNgzN3gN7/IFgzLICb/7kLJjE52I9zI+sZ/lgakmTIAD8OZKN3AI+2u8Uz rSTA== X-Gm-Message-State: AC+VfDz9qb9gJ+V2NruSKneqKRDFFVUBjTS28Bk/ybcN3NwJN/GtGz+p WqvYGi/4wnm66cOpu9IKafw= X-Google-Smtp-Source: ACHHUZ5v4zQ40dlTx6mNXK3VeBezN6RIEaQg7NiPAb4m+jPXMkfP5lNtAmdu9LWsI8jYR7LsFZ/pgg== X-Received: by 2002:a7b:cd99:0:b0:3f1:6757:6242 with SMTP id y25-20020a7bcd99000000b003f167576242mr9518973wmj.27.1683636164205; Tue, 09 May 2023 05:42:44 -0700 (PDT) Received: from localhost ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id s2-20020a5d4ec2000000b003063a92bbf5sm14401481wrv.70.2023.05.09.05.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 05:42:43 -0700 (PDT) From: Aidan MacDonald To: broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, tsbogend@alpha.franken.de, paul@crapouillou.net Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH v1 2/3] ASoC: ingenic: Add compatible string for X1000 SoC Date: Tue, 9 May 2023 13:42:37 +0100 Message-Id: <20230509124238.195191-2-aidanmacdonald.0x0@gmail.com> In-Reply-To: <20230509124238.195191-1-aidanmacdonald.0x0@gmail.com> References: <20230509124238.195191-1-aidanmacdonald.0x0@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The audio controller in the X1000 is similar to the JZ47xx SoCs. Signed-off-by: Aidan MacDonald Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/sound/ingenic,aic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/ingenic,aic.yaml b/Documentation/devicetree/bindings/sound/ingenic,aic.yaml index c59a7cd9eaa9..d15c000f14e1 100644 --- a/Documentation/devicetree/bindings/sound/ingenic,aic.yaml +++ b/Documentation/devicetree/bindings/sound/ingenic,aic.yaml @@ -23,6 +23,7 @@ properties: - ingenic,jz4760-i2s - ingenic,jz4770-i2s - ingenic,jz4780-i2s + - ingenic,x1000-i2s - items: - const: ingenic,jz4725b-i2s - const: ingenic,jz4740-i2s From patchwork Tue May 9 12:42:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aidan MacDonald X-Patchwork-Id: 13235784 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 6145AC7EE22 for ; Tue, 9 May 2023 12:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230060AbjEIMnP (ORCPT ); Tue, 9 May 2023 08:43:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235269AbjEIMnM (ORCPT ); Tue, 9 May 2023 08:43:12 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60F5549DE; Tue, 9 May 2023 05:42:53 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f420618d5bso20314845e9.1; Tue, 09 May 2023 05:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683636165; x=1686228165; 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=ZplJga8URR6w22NuOXzuaUfxRbCk+zusrF2eonp43Ic=; b=M8kM4F50Y4QTpse4LTLaTC1p2lmcHK/sWrXz58Uxbdofq75cCK6nNc6tPZC5QyUyuq itS6L8KsQbXQLFbX6rssoOqIJTKrxa+d5P4RUpP1y7jwIU+ae5TyoANwDKjMR2GfM1uz DQEmnv60HVaZyyHeULYvT/yZqvXaV8N3/nRaVtvvnuFsm9gMqt9M5UsjptXzOcC8aLJe 5VFkMJrUx1QzSQO1wBTorV4wBjQH/lJxtQ4HN9zf52oYG5ZFLVHp5maEVBBKuWh0G5fa M7/eIHccCIzaMzXED2bvBJYGn00JlpH1Y9bpXKsjk/1lmnhZGyl2HTv6acFjYShVQZWV 5U7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683636165; x=1686228165; 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=ZplJga8URR6w22NuOXzuaUfxRbCk+zusrF2eonp43Ic=; b=COYYWgEmlkHQZt2PqiCMO0QI3mzddFccjEwsm+88tl3UxeGcYmaYoLfNGZnl3MjCT6 MxbP/M8pFLgn2YvQ+ytRZv+N6HIDOcADkdVUFxkupVUe9ocSUiaTfkV7lsYGb0ylV9dp B2M7Kuuaswu0XHkkvf7jaRbHV5NiQFxgL/LQTgxgZCTJpRAxrWalKr5r4z4Ve9dJ++WA bvEwuhv7MzrVGF1MS3TPah7C+Iwgz2sATt/0v6tgm80nhFCLy5x8LhK4oAVysp83mTVd wN9CKhzDP81PGEI6uMDRSJWDNGNR8sv1CUmpQcM1idaqXhKjcArR6slw/uCDuIok64Xm ZERA== X-Gm-Message-State: AC+VfDy6pkaVSeZDYVUrUzLCE14Yxyh0qbhwozStnz29qSAPLOwvvekB Cek1vn49MRJLoat0KFj0Szs= X-Google-Smtp-Source: ACHHUZ5JuGl0TT7zoc5WZviOsoU/R1kF0RdwnsYbTD5iMTaRYgFq5PeC4oHx05osceUHEJ0tdlmpXw== X-Received: by 2002:a05:600c:22d9:b0:3f0:9a90:a5e7 with SMTP id 25-20020a05600c22d900b003f09a90a5e7mr8961042wmg.28.1683636165108; Tue, 09 May 2023 05:42:45 -0700 (PDT) Received: from localhost ([167.98.27.226]) by smtp.gmail.com with ESMTPSA id f1-20020a1cc901000000b003f25b40fc24sm19933419wmb.6.2023.05.09.05.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 May 2023 05:42:44 -0700 (PDT) From: Aidan MacDonald To: broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, tsbogend@alpha.franken.de, paul@crapouillou.net Cc: lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH v1 3/3] mips: dts: ingenic: x1000: Add AIC device tree node Date: Tue, 9 May 2023 13:42:38 +0100 Message-Id: <20230509124238.195191-3-aidanmacdonald.0x0@gmail.com> In-Reply-To: <20230509124238.195191-1-aidanmacdonald.0x0@gmail.com> References: <20230509124238.195191-1-aidanmacdonald.0x0@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add a node for the on-board I2S audio controller. Signed-off-by: Aidan MacDonald --- arch/mips/boot/dts/ingenic/x1000.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/mips/boot/dts/ingenic/x1000.dtsi b/arch/mips/boot/dts/ingenic/x1000.dtsi index 42e69664efd9..cc264cfff826 100644 --- a/arch/mips/boot/dts/ingenic/x1000.dtsi +++ b/arch/mips/boot/dts/ingenic/x1000.dtsi @@ -417,4 +417,22 @@ otg: usb@13500000 { status = "disabled"; }; + + aic: audio-controller@10020000 { + compatible = "ingenic,x1000-i2s"; + reg = <0x10020000 0x38>; + + #sound-dai-cells = <0>; + + interrupt-parent = <&intc>; + interrupts = <1>; + + clocks = <&cgu X1000_CLK_AIC>, + <&cgu X1000_CLK_I2S>; + clock-names = "aic", "i2s"; + + dmas = <&pdma X1000_DMA_I2S0_RX 0xffffffff>, + <&pdma X1000_DMA_I2S0_TX 0xffffffff>; + dma-names = "rx", "tx"; + }; };