From patchwork Mon Oct 15 16:09:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 984255 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UMk/1nut"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Yk0p4Kb4z9sDX for ; Tue, 16 Oct 2018 03:09:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726588AbeJOXzh (ORCPT ); Mon, 15 Oct 2018 19:55:37 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:37496 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726525AbeJOXzh (ORCPT ); Mon, 15 Oct 2018 19:55:37 -0400 Received: by mail-pf1-f193.google.com with SMTP id j23-v6so9915039pfi.4 for ; Mon, 15 Oct 2018 09:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qG6QWtKIuzDYWSHXOcuwaWHfSliZPpSCA0nPwEReY3E=; b=UMk/1nutQ3D3lXz8wP12gYuzx1RiEj394vux1IAyxu3X0j2IZxEhMVrqXjKCwEzyiy N18aevy6P0zEdk0xrM63Hf9X5lhMRZp6W8NS52qesWnxTON0pIBHzZkJY6g8v8qNSCAM 8q4/gis3qFGff8dGXWrT88LUhNaHiDVu8o2zPkqpLXboWu4MnRAsZ7gZuArON97/LNI4 IVGw7MIHrNbon1IRtO+DLaXL22NtH9o7GFLfJZoXenfe+gLNxIhj8BmH/Q7n/aAew+zT muflpT4rcs7QdVeH6zbNCXTW1rXTjhNgoGDQ0vum4xDhYym2rd/u6SoZkmDosXf69PG3 2EMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qG6QWtKIuzDYWSHXOcuwaWHfSliZPpSCA0nPwEReY3E=; b=dR3KCk/AwV05PPluuJGFT4WDHfgAKtXsMXIUoHEzIQPNTe43/po4iHraudVU6B7J44 FZEtp+HgVKH5szlMjmuhhDTsF2U6euHfks7KKW68mXwSwnZclRcaUbJdY2EPkHuGpMM0 LtBlqVBYgR6zC8jN8xjIS1zXetLrCVTEovLr+X4BZAIRfK5eYBupRimxaq7vphow5MaW T62dltXk74m3sxXOnREiqgZR7Vg8IZFQJppSW282WWDnWD2W+wAvBAnFsV69JeupngEm s/AUyfWvg82CRG5x5CohMnQ9SsMwlwDKw1jim2LHcZDLWFY9KsitdYixUF1gPhoSC9bF 0LUw== X-Gm-Message-State: ABuFfojm06CIoTkGtSgQ3olzhUiKPASX5VCp+7LFU3lsqCBXe9y6JW9A BKq+1HPqupIfHj8OtZbJFwo= X-Google-Smtp-Source: ACcGV612GUTvhc2RaGbv1Ba4vL8eHJcPq7VmUdgJ3aJX5JGODE2xyEeU9inF5jqkU3jQmBeilI0HUQ== X-Received: by 2002:a62:ac15:: with SMTP id v21-v6mr18173371pfe.126.1539619784977; Mon, 15 Oct 2018 09:09:44 -0700 (PDT) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id 84-v6sm17513962pfs.108.2018.10.15.09.09.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 09:09:44 -0700 (PDT) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Mylene JOSSERAND , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Cc: Vasily Khoruzhick Subject: [PATCH v3 1/9] ASoC: sun4i-i2s: Add compatibility with A64 codec I2S Date: Mon, 15 Oct 2018 09:09:26 -0700 Message-Id: <20181015160934.20948-2-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181015160934.20948-1-anarsoul@gmail.com> References: <20181015160934.20948-1-anarsoul@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Marcus Cooper The I2S block used for the audio codec in the A64 differs from other 3 I2S modules in A64 and isn't compatible with H3. But it is very similar to what is found in A10(sun4i). However, its TX FIFO is located at a different address. Signed-off-by: Marcus Cooper Signed-off-by: Vasily Khoruzhick --- .../devicetree/bindings/sound/sun4i-i2s.txt | 2 ++ sound/soc/sunxi/sun4i-i2s.c | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt index b9d50d6cdef3..61e71c1729e0 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt @@ -10,6 +10,7 @@ Required properties: - "allwinner,sun6i-a31-i2s" - "allwinner,sun8i-a83t-i2s" - "allwinner,sun8i-h3-i2s" + - "allwinner,sun50i-a64-codec-i2s" - reg: physical base address of the controller and length of memory mapped region. - interrupts: should contain the I2S interrupt. @@ -26,6 +27,7 @@ Required properties for the following compatibles: - "allwinner,sun6i-a31-i2s" - "allwinner,sun8i-a83t-i2s" - "allwinner,sun8i-h3-i2s" + - "allwinner,sun50i-a64-codec-i2s" - resets: phandle to the reset line for this codec Example: diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index ed30d30ac720..83374617962c 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -967,6 +967,23 @@ static const struct sun4i_i2s_quirks sun8i_h3_i2s_quirks = { .field_rxchansel = REG_FIELD(SUN8I_I2S_RX_CHAN_SEL_REG, 0, 2), }; +static const struct sun4i_i2s_quirks sun50i_a64_codec_i2s_quirks = { + .has_reset = true, + .reg_offset_txdata = SUN8I_I2S_FIFO_TX_REG, + .sun4i_i2s_regmap = &sun4i_i2s_regmap_config, + .has_slave_select_bit = true, + .field_clkdiv_mclk_en = REG_FIELD(SUN4I_I2S_CLK_DIV_REG, 7, 7), + .field_fmt_wss = REG_FIELD(SUN4I_I2S_FMT0_REG, 2, 3), + .field_fmt_sr = REG_FIELD(SUN4I_I2S_FMT0_REG, 4, 5), + .field_fmt_bclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 6, 6), + .field_fmt_lrclk = REG_FIELD(SUN4I_I2S_FMT0_REG, 7, 7), + .field_fmt_mode = REG_FIELD(SUN4I_I2S_FMT0_REG, 0, 1), + .field_txchanmap = REG_FIELD(SUN4I_I2S_TX_CHAN_MAP_REG, 0, 31), + .field_rxchanmap = REG_FIELD(SUN4I_I2S_RX_CHAN_MAP_REG, 0, 31), + .field_txchansel = REG_FIELD(SUN4I_I2S_TX_CHAN_SEL_REG, 0, 2), + .field_rxchansel = REG_FIELD(SUN4I_I2S_RX_CHAN_SEL_REG, 0, 2), +}; + static int sun4i_i2s_init_regmap_fields(struct device *dev, struct sun4i_i2s *i2s) { @@ -1175,6 +1192,10 @@ static const struct of_device_id sun4i_i2s_match[] = { .compatible = "allwinner,sun8i-h3-i2s", .data = &sun8i_h3_i2s_quirks, }, + { + .compatible = "allwinner,sun50i-a64-codec-i2s", + .data = &sun50i_a64_codec_i2s_quirks, + }, {} }; MODULE_DEVICE_TABLE(of, sun4i_i2s_match); From patchwork Mon Oct 15 16:09:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 984256 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GIzLYxkt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Yk0s60tMz9sDX for ; Tue, 16 Oct 2018 03:09:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726651AbeJOXzl (ORCPT ); Mon, 15 Oct 2018 19:55:41 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41524 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726525AbeJOXzk (ORCPT ); Mon, 15 Oct 2018 19:55:40 -0400 Received: by mail-pg1-f194.google.com with SMTP id 23-v6so9378047pgc.8 for ; Mon, 15 Oct 2018 09:09:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+zU3F+3HUNskC02tr5l8egTduscDKoYaVaz1eaU76RY=; b=GIzLYxktL/yJNGOvK1yiKQIdVCKnWhCaYGOB2r4iRNCQoYpO/BtsNU2iY2T0srZzOc EVUC/ctrGw49PdrtzhYNzZNnuU8ZsPR4cgldgZ7+xS+Xh1Pi2LCVHzye1yLx3lAbMS6H 3HiyNbN8MNRjt7AfDanb0wOwR6LEvg8q+v1LHYA9DwtLUguSJjjnRfr5lh4ScuOBRIwq Q1S0hw7nye3Skw14b/TerqEeP5ywitQ7fszWSuQJub7aC/c/DkpYTr77RBU7ZuqQtSUU DXbw/bA0my6XK9fBc5/7PnS2U3rMm4bjFab40nyD1EEt4BL+9/QZPnWpkCLAC8a81prq kVvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+zU3F+3HUNskC02tr5l8egTduscDKoYaVaz1eaU76RY=; b=Wc8+hVhlpVa6bsvzMtzwCrtEFxXMeSCHgceGQqR+2gQ+OxldYqHqJBtn4bd3X9QzNg 34H0haRqDitgWmweiSm32TvzsmdGI7jG0BV8vi/4Sa7S277REv/NnTGeGQx3k09qMEcV DnReFzcynl8DdP/HumnTRXlyCyg7D3Jk9BxzQ6urBr3y9NV3AAUI4V37OVeh8ibTheAS ATbHRkVLtGkv1BocUcL8UWhbvZZTwWgLIZtaN01Jq2/xnlzlsBLwAfYpGfzesNPjuPf8 AJlIhCJSd/gmT4JXCmESwLgHfFqYP5xPGIjn+ZOcaeFn1mX2rxn1E/Rm1d8iC4c02e8d O13w== X-Gm-Message-State: ABuFfogzqhFKL5nxhquftpIYwJ6zW7uztCP18Yr2yqM1DeeVPmH/Ss9q YR3+j+48b2v3K0E/QTuC/s7GlvSfc4Y6YA== X-Google-Smtp-Source: ACcGV62W9B2VcBu1C3t49NmKNZccKMyxQxNXViQdC1Ro9KhJMH0JAci0SUVAKCCq/g+q8Uk3SdMYMg== X-Received: by 2002:a63:1919:: with SMTP id z25-v6mr16230853pgl.135.1539619788221; Mon, 15 Oct 2018 09:09:48 -0700 (PDT) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id 84-v6sm17513962pfs.108.2018.10.15.09.09.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 09:09:47 -0700 (PDT) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Mylene JOSSERAND , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Cc: Vasily Khoruzhick Subject: [PATCH v3 4/9] ASoC: dt-binding: Add bindings for Allwinner A64 codec's analog path controls Date: Mon, 15 Oct 2018 09:09:29 -0700 Message-Id: <20181015160934.20948-5-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181015160934.20948-1-anarsoul@gmail.com> References: <20181015160934.20948-1-anarsoul@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The internal codec on Allwinner A64 is split into 2 parts. The analog path controls are routed through an embedded custom register bus accessed through the PRCM block just as on A23/A33/H3. Add a binding for this hardware. Signed-off-by: Vasily Khoruzhick --- .../bindings/sound/sun50i-codec-analog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt diff --git a/Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt new file mode 100644 index 000000000000..4f8ad0e04d20 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt @@ -0,0 +1,12 @@ +* Allwinner A64 Codec Analog Controls + +Required properties: +- compatible: must be one of the following compatibles: + - "allwinner,sun50i-a64-codec-analog" +- reg: must contain the registers location and length + +Example: + codec_analog: codec-analog@1f015c0 { + compatible = "allwinner,sun50i-a64-codec-analog"; + reg = <0x01f015c0 0x4>; + };