From patchwork Thu Feb 28 13:57:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengcheng Li X-Patchwork-Id: 10833207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B46251805 for ; Thu, 28 Feb 2019 14:26:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DFEC2ECCA for ; Thu, 28 Feb 2019 14:26:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 919D22ECFF; Thu, 28 Feb 2019 14:26:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F1CF62ECCA for ; Thu, 28 Feb 2019 14:26:51 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1677584F; Thu, 28 Feb 2019 15:26:00 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1677584F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551364010; bh=lI5hPIYErhEEXMvgaSavFR98/+GG7ASe7JvgyrJFXNI=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=lHTjUU28cCac5Gj7DZnJO6EUkUPYthybcbZXFVSpZinQqN9Jy0Mo6Khwh/etP6Wlo bdoXQvw1bF75jI2c+x9wO+ITb6augEooDwD+CS5DkCElPwa4Qvri35GAJUHcvzweSm jzaE2fz/9WI3Wm4f0I/FBM+A5X7aoD95aOCWJbpI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7ACD5F896C3; Thu, 28 Feb 2019 15:25:59 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id D9EC9F896C3; Thu, 28 Feb 2019 15:13:22 +0100 (CET) Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id CD49EF896BB for ; Thu, 28 Feb 2019 15:13:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CD49EF896BB Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id E009AA0249BC92B6DAB9; Thu, 28 Feb 2019 22:13:13 +0800 (CST) Received: from HSH1000045364.huawei.com (10.177.181.43) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.408.0; Thu, 28 Feb 2019 22:13:07 +0800 From: Pengcheng Li To: , , , , , , Date: Thu, 28 Feb 2019 21:57:00 +0800 Message-ID: <1551362220-99351-1-git-send-email-lipengcheng8@huawei.com> X-Mailer: git-send-email 2.8.0 MIME-Version: 1.0 X-Originating-IP: [10.177.181.43] X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 28 Feb 2019 15:25:57 +0100 Cc: ninggaoyu@hisilicon.com, suzhuangluan@hisilicon.com, hantanglei@huawei.com, kongfei@hisilicon.com, lipengcheng8@huawei.com, liyuequan@hisilicon.com, xuwei5@huawei.com, huangli295@hisilicon.com, wangyoulin1@hisilicon.com, cash.qianli@hisilicon.com Subject: [alsa-devel] [PATCH 1/3] sound: Add hikey960 i2s audio driver X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Youlin Wang Add i2s driver for hisi3660 soc found on the hikey960 board. Add conpile line in make file. Technical support by Guangke Ji. Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han Signed-off-by: Guangke Ji Signed-off-by: Feng Chen Signed-off-by: Kaihua Zhong Signed-off-by: Jun Chen Signed-off-by: John Stultz Signed-off-by: Yiping Xu Signed-off-by: Pengcheng Li Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai --- sound/soc/hisilicon/Kconfig | 8 +- sound/soc/hisilicon/Makefile | 1 + sound/soc/hisilicon/hi3660-i2s.c | 448 +++++++++++++++++++++++++++++++++++++++ sound/soc/hisilicon/hi3660-i2s.h | 99 +++++++++ 4 files changed, 555 insertions(+), 1 deletion(-) create mode 100644 sound/soc/hisilicon/hi3660-i2s.c create mode 100644 sound/soc/hisilicon/hi3660-i2s.h diff --git a/sound/soc/hisilicon/Kconfig b/sound/soc/hisilicon/Kconfig index 4356d5a..b023ef9 100644 --- a/sound/soc/hisilicon/Kconfig +++ b/sound/soc/hisilicon/Kconfig @@ -1,5 +1,11 @@ config SND_I2S_HI6210_I2S - tristate "Hisilicon I2S controller" + tristate "Hisilicon Hi6210 I2S controller" + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Hisilicon I2S + +config SND_I2S_HI3660_I2S + tristate "Hisilicon 960 I2S controller" select SND_SOC_GENERIC_DMAENGINE_PCM help Hisilicon I2S diff --git a/sound/soc/hisilicon/Makefile b/sound/soc/hisilicon/Makefile index e8095e2..6800516 100644 --- a/sound/soc/hisilicon/Makefile +++ b/sound/soc/hisilicon/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_SND_I2S_HI6210_I2S) += hi6210-i2s.o +obj-$(CONFIG_SND_I2S_HI3660_I2S) += hi3660-i2s.o diff --git a/sound/soc/hisilicon/hi3660-i2s.c b/sound/soc/hisilicon/hi3660-i2s.c new file mode 100644 index 0000000..b894007 --- /dev/null +++ b/sound/soc/hisilicon/hi3660-i2s.c @@ -0,0 +1,448 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * linux/sound/soc/hisilicon/hi3660-i2s.c + * + * I2S IP driver for hi3660. + * + * Copyright (c) 2001-2021, Huawei Tech. Co., Ltd. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hi3660-i2s.h" + +struct hi3660_i2s { + struct device *dev; + struct reset_control *rc; + int clocks; + struct regulator *regu_asp; + struct pinctrl *pctrl; + struct pinctrl_state *pin_default; + struct pinctrl_state *pin_idle; + struct clk *asp_subsys_clk; + struct snd_soc_dai_driver dai; + void __iomem *base; + void __iomem *base_syscon; + phys_addr_t base_phys; + struct snd_dmaengine_dai_dma_data dma_data[2]; + spinlock_t lock; + int rate; + int format; + int bits; + int channels; + u32 master; + u32 status; +}; + +static void update_bits(struct hi3660_i2s *i2s, u32 ofs, u32 reset, u32 set) +{ + u32 val = readl(i2s->base + ofs) & ~reset; + + writel(val | set, i2s->base + ofs); +} + +static void update_bits_syscon(struct hi3660_i2s *i2s, + u32 ofs, u32 reset, u32 set) +{ + u32 val = readl(i2s->base_syscon + ofs) & ~reset; + + writel(val | set, i2s->base_syscon + ofs); +} + +static int enable_format(struct hi3660_i2s *i2s, + struct snd_pcm_substream *substream) +{ + switch (i2s->format & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + i2s->master = false; + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK_SEL_REG, + 0, HI_ASP_CFG_R_CLK_SEL_EN); + break; + case SND_SOC_DAIFMT_CBS_CFS: + i2s->master = true; + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK_SEL_REG, + HI_ASP_CFG_R_CLK_SEL_EN, 0); + break; + default: + return -EINVAL; + } + + return 0; +} + +static int startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *cpu_dai) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + + /* deassert reset on sio_bt*/ + update_bits_syscon(i2s, HI_ASP_CFG_R_RST_CTRLDIS_REG, + 0, BIT(2)|BIT(6)|BIT(8)|BIT(16)); + + /* enable clk before frequency division */ + update_bits_syscon(i2s, HI_ASP_CFG_R_GATE_EN_REG, + 0, BIT(5)|BIT(6)); + + /* enable frequency division */ + update_bits_syscon(i2s, HI_ASP_CFG_R_GATE_CLKDIV_EN_REG, + 0, BIT(2)|BIT(5)); + + /* select clk */ + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK_SEL_REG, + HI_ASP_MASK, HI_ASP_CFG_R_CLK_SEL); + + /* select clk_div */ + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK1_DIV_REG, + HI_ASP_MASK, HI_ASP_CFG_R_CLK1_DIV_SEL); + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK4_DIV_REG, + HI_ASP_MASK, HI_ASP_CFG_R_CLK4_DIV_SEL); + update_bits_syscon(i2s, HI_ASP_CFG_R_CLK6_DIV_REG, + HI_ASP_MASK, HI_ASP_CFG_R_CLK6_DIV_SEL); + + /* sio config */ + update_bits(i2s, HI_ASP_SIO_MODE_REG, HI_ASP_MASK, 0x0); + update_bits(i2s, HI_ASP_SIO_DATA_WIDTH_SET_REG, HI_ASP_MASK, 0x9); + update_bits(i2s, HI_ASP_SIO_I2S_POS_MERGE_EN_REG, HI_ASP_MASK, 0x1); + update_bits(i2s, HI_ASP_SIO_I2S_START_POS_REG, HI_ASP_MASK, 0x0); + + return 0; +} + +static void shutdown(struct snd_pcm_substream *substream, + struct snd_soc_dai *cpu_dai) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + + if (!IS_ERR_OR_NULL(i2s->asp_subsys_clk)) + clk_disable_unprepare(i2s->asp_subsys_clk); +} + +static void txctrl(struct snd_soc_dai *cpu_dai, int on) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + + spin_lock(&i2s->lock); + + if (on) { + /* enable SIO TX */ + update_bits(i2s, HI_ASP_SIO_CT_SET_REG, 0, + HI_ASP_SIO_TX_ENABLE | + HI_ASP_SIO_TX_DATA_MERGE | + HI_ASP_SIO_TX_FIFO_THRESHOLD | + HI_ASP_SIO_RX_ENABLE | + HI_ASP_SIO_RX_DATA_MERGE | + HI_ASP_SIO_RX_FIFO_THRESHOLD); + } else { + /* disable SIO TX */ + update_bits(i2s, HI_ASP_SIO_CT_CLR_REG, 0, + HI_ASP_SIO_TX_ENABLE | HI_ASP_SIO_RX_ENABLE); + } + spin_unlock(&i2s->lock); +} + +static void rxctrl(struct snd_soc_dai *cpu_dai, int on) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + + spin_lock(&i2s->lock); + if (on) + /* enable SIO RX */ + update_bits(i2s, HI_ASP_SIO_CT_SET_REG, 0, + HI_ASP_SIO_TX_ENABLE | + HI_ASP_SIO_TX_DATA_MERGE | + HI_ASP_SIO_TX_FIFO_THRESHOLD | + HI_ASP_SIO_RX_ENABLE | + HI_ASP_SIO_RX_DATA_MERGE | + HI_ASP_SIO_RX_FIFO_THRESHOLD); + else + /* disable SIO RX */ + update_bits(i2s, HI_ASP_SIO_CT_CLR_REG, 0, + HI_ASP_SIO_TX_ENABLE | HI_ASP_SIO_RX_ENABLE); + spin_unlock(&i2s->lock); +} + +static int set_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + return 0; +} + +static int set_format(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + + i2s->format = fmt; + i2s->master = (i2s->format & SND_SOC_DAIFMT_MASTER_MASK) == + SND_SOC_DAIFMT_CBS_CFS; + + return 0; +} + +static int hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *cpu_dai) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(cpu_dai->dev); + struct snd_dmaengine_dai_dma_data *dma_data; + + dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream); + + enable_format(i2s, substream); + + dma_data->maxburst = 4; + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + dma_data->addr = i2s->base_phys + + HI_ASP_SIO_I2S_DUAL_TX_CHN_REG; + else + dma_data->addr = i2s->base_phys + + HI_ASP_SIO_I2S_DUAL_RX_CHN_REG; + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U16_LE: + case SNDRV_PCM_FORMAT_S16_LE: + i2s->bits = 16; + dma_data->addr_width = 4; + break; + + case SNDRV_PCM_FORMAT_U24_LE: + case SNDRV_PCM_FORMAT_S24_LE: + i2s->bits = 32; + dma_data->addr_width = 4; + break; + default: + dev_err(cpu_dai->dev, "Bad format\n"); + return -EINVAL; + } + + return 0; +} + +static int trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *cpu_dai) +{ + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + rxctrl(cpu_dai, 1); + else + txctrl(cpu_dai, 1); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + rxctrl(cpu_dai, 0); + else + txctrl(cpu_dai, 0); + break; + default: + dev_err(cpu_dai->dev, "unknown cmd\n"); + return -EINVAL; + } + + return 0; +} + +static int dai_probe(struct snd_soc_dai *dai) +{ + struct hi3660_i2s *i2s = snd_soc_dai_get_drvdata(dai); + + snd_soc_dai_init_dma_data(dai, + &i2s->dma_data[SNDRV_PCM_STREAM_PLAYBACK], + &i2s->dma_data[SNDRV_PCM_STREAM_CAPTURE]); + + return 0; +} + + +static struct snd_soc_dai_ops dai_ops = { + .trigger = trigger, + .hw_params = hw_params, + .set_fmt = set_format, + .set_sysclk = set_sysclk, + .startup = startup, + .shutdown = shutdown, +}; + +static struct snd_soc_dai_driver dai_init = { + .name = "hi3660_i2s", + .probe = dai_probe, + .playback = { + .channels_min = 2, + .channels_max = 2, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE, + .rates = SNDRV_PCM_RATE_48000, + }, + .capture = { + .channels_min = 2, + .channels_max = 2, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE, + .rates = SNDRV_PCM_RATE_48000, + }, + .ops = &dai_ops, +}; + +static const struct snd_soc_component_driver component_driver = { + .name = "hi3660_i2s", +}; + +#include + +static const struct snd_pcm_hardware sound_hardware = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_HALF_DUPLEX, + .period_bytes_min = 4096, + .period_bytes_max = 4096, + .periods_min = 4, + .periods_max = UINT_MAX, + .buffer_bytes_max = SIZE_MAX, +}; + +static const struct snd_dmaengine_pcm_config dmaengine_pcm_config = { + .pcm_hardware = &sound_hardware, + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, + .prealloc_buffer_size = 64 * 1024, +}; + +static int hi3660_i2s_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct hi3660_i2s *i2s; + struct resource *res; + int ret; + + i2s = devm_kzalloc(dev, sizeof(*i2s), GFP_KERNEL); + if (!i2s) + return -ENOMEM; + + i2s->dev = dev; + spin_lock_init(&i2s->lock); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + ret = -ENODEV; + return ret; + } + i2s->base_phys = (phys_addr_t)res->start; + + i2s->dai = dai_init; + dev_set_drvdata(&pdev->dev, i2s); + + i2s->base = devm_ioremap_resource(dev, res); + if (IS_ERR(i2s->base)) { + dev_err(&pdev->dev, "ioremap failed\n"); + ret = PTR_ERR(i2s->base); + return ret; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!res) { + ret = -ENODEV; + return ret; + } + i2s->base_syscon = devm_ioremap(dev, res->start, resource_size(res)); + if (IS_ERR(i2s->base_syscon)) { + dev_err(&pdev->dev, "ioremap failed\n"); + ret = PTR_ERR(i2s->base_syscon); + return ret; + } + + /* i2s iomux config */ + i2s->pctrl = devm_pinctrl_get(dev); + if (IS_ERR(i2s->pctrl)) { + dev_err(dev, "could not get pinctrl\n"); + ret = -EIO; + return ret; + } + + i2s->pin_default = pinctrl_lookup_state(i2s->pctrl, + PINCTRL_STATE_DEFAULT); + if (IS_ERR(i2s->pin_default)) { + dev_err(dev, + "could not get default state (%li)\n", + PTR_ERR(i2s->pin_default)); + ret = -EIO; + return ret; + } + + if (pinctrl_select_state(i2s->pctrl, i2s->pin_default)) { + dev_err(dev, "could not set pins to default state\n"); + ret = -EIO; + return ret; + } + + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, + &dmaengine_pcm_config, 0); + if (ret) + return ret; + + ret = snd_soc_register_component(&pdev->dev, &component_driver, + &i2s->dai, 1); + if (ret) { + dev_err(&pdev->dev, "Failed to register dai\n"); + return ret; + } + + return 0; +} + +static int hi3660_i2s_remove(struct platform_device *pdev) +{ + struct hi3660_i2s *i2s = dev_get_drvdata(&pdev->dev); + + snd_soc_unregister_component(&pdev->dev); + dev_set_drvdata(&pdev->dev, NULL); + + pinctrl_put(i2s->pctrl); + + return 0; +} + +static const struct of_device_id dt_ids[] = { + { .compatible = "hisilicon,hi3660-i2s-1.0" }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(of, dt_ids); + +static struct platform_driver local_platform_driver = { + .probe = hi3660_i2s_probe, + .remove = hi3660_i2s_remove, + .driver = { + .name = "hi3660_i2s", + .owner = THIS_MODULE, + .of_match_table = dt_ids, + }, +}; + +module_platform_driver(local_platform_driver); + +MODULE_DESCRIPTION("Hisilicon I2S driver"); +MODULE_AUTHOR("Guangke Ji "); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/hisilicon/hi3660-i2s.h b/sound/soc/hisilicon/hi3660-i2s.h new file mode 100644 index 0000000..1874855 --- /dev/null +++ b/sound/soc/hisilicon/hi3660-i2s.h @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0+ + * + * linux/sound/soc/hisilicon/hi3660-i2s.c + * + * I2S IP driver for hi3660. + * + * Copyright (c) 2001-2021, Huawei Tech. Co., Ltd. + * + */ + +#ifndef _HI3660_I2S_H +#define _HI3660_I2S_H + +enum hisi_bits { + HII2S_BITS_16, + HII2S_BITS_18, + HII2S_BITS_20, + HII2S_BITS_24, +}; + +enum hisi_i2s_rates { + HII2S_FS_RATE_8KHZ = 0, + HII2S_FS_RATE_16KHZ = 1, + HII2S_FS_RATE_32KHZ = 2, + HII2S_FS_RATE_48KHZ = 4, + HII2S_FS_RATE_96KHZ = 5, + HII2S_FS_RATE_192KHZ = 6, +}; + +#define HI_ASP_CFG_R_RST_CTRLEN_REG 0x0 +#define HI_ASP_CFG_R_RST_CTRLDIS_REG 0x4 +#define HI_ASP_CFG_R_GATE_EN_REG 0xC +#define HI_ASP_CFG_R_GATE_DIS_REG 0x10 +#define HI_ASP_CFG_R_GATE_CLKEN_REG 0x14 +#define HI_ASP_CFG_R_GATE_CLKSTAT_REG 0x18 +#define HI_ASP_CFG_R_GATE_CLKDIV_EN_REG 0x1C +#define HI_ASP_CFG_R_CLK1_DIV_REG 0x20 +#define HI_ASP_CFG_R_CLK2_DIV_REG 0x24 +#define HI_ASP_CFG_R_CLK3_DIV_REG 0x28 +#define HI_ASP_CFG_R_CLK4_DIV_REG 0x2C +#define HI_ASP_CFG_R_CLK5_DIV_REG 0x30 +#define HI_ASP_CFG_R_CLK6_DIV_REG 0x34 +#define HI_ASP_CFG_R_CLK_SEL_REG 0x38 +#define HI_ASP_CFG_R_SEC_REG 0x100 + + +#define HI_ASP_SIO_VERSION_REG (0x3C) +#define HI_ASP_SIO_MODE_REG (0x40) +#define HI_ASP_SIO_INTSTATUS_REG (0x44) +#define HI_ASP_SIO_INTCLR_REG (0x48) +#define HI_ASP_SIO_I2S_LEFT_XD_REG (0x4C) +#define HI_ASP_SIO_I2S_RIGHT_XD_REG (0x50) +#define HI_ASP_SIO_I2S_LEFT_RD_REG (0x54) +#define HI_ASP_SIO_I2S_RIGHT_RD_REG (0x58) +#define HI_ASP_SIO_CT_SET_REG (0x5C) +#define HI_ASP_SIO_CT_CLR_REG (0x60) +#define HI_ASP_SIO_RX_STA_REG (0x68) +#define HI_ASP_SIO_TX_STA_REG (0x6C) +#define HI_ASP_SIO_DATA_WIDTH_SET_REG (0x78) +#define HI_ASP_SIO_I2S_START_POS_REG (0x7C) +#define HI_ASP_SIO_I2S_POS_FLAG_REG (0x80) +#define HI_ASP_SIO_SIGNED_EXT_REG (0x84) +#define HI_ASP_SIO_I2S_POS_MERGE_EN_REG (0x88) +#define HI_ASP_SIO_INTMASK_REG (0x8C) +#define HI_ASP_SIO_I2S_DUAL_RX_CHN_REG (0xA0) +#define HI_ASP_SIO_I2S_DUAL_TX_CHN_REG (0xC0) + + +#define HI_ASP_CFG_R_CLK_SEL_EN BIT(2) +#define HI_ASP_CFG_R_CLK_SEL 0x140010 +#define HI_ASP_CFG_R_CLK1_DIV_SEL 0xbcdc9a +#define HI_ASP_CFG_R_CLK4_DIV_SEL 0x00ff000f +#define HI_ASP_CFG_R_CLK6_DIV_SEL 0x00ff003f +#define HI_ASP_CFG_SIO_MODE 0 +#define HI_ASP_SIO_MODE_SEL_EN BIT(0) +#define HI_ASP_MASK 0xffffffff + +#define HI_ASP_SIO_RX_ENABLE BIT(13) +#define HI_ASP_SIO_TX_ENABLE BIT(12) +#define HI_ASP_SIO_RX_FIFO_DISABLE BIT(11) +#define HI_ASP_SIO_TX_FIFO_DISABLE BIT(10) +#define HI_ASP_SIO_RX_DATA_MERGE BIT(9) +#define HI_ASP_SIO_TX_DATA_MERGE BIT(8) +#define HI_ASP_SIO_RX_FIFO_THRESHOLD (0x5 << 4) +#define HI_ASP_SIO_TX_FIFO_THRESHOLD (0xB << 0) +#define HI_ASP_SIO_RX_FIFO_THRESHOLD_CLR (0xF << 4) +#define HI_ASP_SIO_TX_FIFO_THRESHOLD_CLR (0xF << 0) +#define HI_ASP_SIO_BURST (0x4) + + +enum hisi_i2s_formats { + HII2S_FORMAT_I2S, + HII2S_FORMAT_PCM_STD, + HII2S_FORMAT_PCM_USER, + HII2S_FORMAT_LEFT_JUST, + HII2S_FORMAT_RIGHT_JUST, +}; + +#endif/* _HI3660_I2S_H */ From patchwork Thu Feb 28 13:57:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengcheng Li X-Patchwork-Id: 10833215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25C521575 for ; Thu, 28 Feb 2019 14:27:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D7052ECCA for ; Thu, 28 Feb 2019 14:27:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0119C2ECFF; Thu, 28 Feb 2019 14:27:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2F1BB2ECCA for ; Thu, 28 Feb 2019 14:27:49 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 424BE85B; Thu, 28 Feb 2019 15:26:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 424BE85B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1551364067; bh=Bb8zS8qF8rROp8UpviTXs+3rBXkxusjMA4r53h/L9vk=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=jZTOkwNfE4gcKVdq85qkR1wXpOSPTPw01nkAOknTHptp9BnxDhXvySscQCmZU0w+j vr/EYmFNkz/2BmYlGsGt0qWJ4Igx04xlU43IUpF+U1K8vO2Sgln1seSFXXfvMCLqn7 kAVmEvCeZf1YJOp0WZX3e76HvKYUZIsKAxDJ/pPg= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D62E2F896CC; Thu, 28 Feb 2019 15:26:00 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2513EF896C3; Thu, 28 Feb 2019 15:14:04 +0100 (CET) Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5743DF896BB for ; Thu, 28 Feb 2019 15:14:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5743DF896BB Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 62A53BE6DA68D04EEF05; Thu, 28 Feb 2019 22:13:57 +0800 (CST) Received: from HSH1000045364.huawei.com (10.177.181.43) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.408.0; Thu, 28 Feb 2019 22:13:49 +0800 From: Pengcheng Li To: , , , , , , Date: Thu, 28 Feb 2019 21:57:41 +0800 Message-ID: <1551362261-99422-1-git-send-email-lipengcheng8@huawei.com> X-Mailer: git-send-email 2.8.0 MIME-Version: 1.0 X-Originating-IP: [10.177.181.43] X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 28 Feb 2019 15:25:57 +0100 Cc: ninggaoyu@hisilicon.com, suzhuangluan@hisilicon.com, hantanglei@huawei.com, kongfei@hisilicon.com, lipengcheng8@huawei.com, liyuequan@hisilicon.com, xuwei5@huawei.com, huangli295@hisilicon.com, wangyoulin1@hisilicon.com, cash.qianli@hisilicon.com Subject: [alsa-devel] [PATCH 2/3] ASoC: add hikey960-i2s DT bindings X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Youlin Wang Adds DT bindings documentation for the hikey960-i2s driver and audio card device. Signed-off-by: Youlin Wang Signed-off-by: Tanglei Han Signed-off-by: Guangke Ji Signed-off-by: Feng Chen Signed-off-by: Kaihua Zhong Signed-off-by: Jun Chen Signed-off-by: John Stultz Signed-off-by: Yiping Xu Signed-off-by: Pengcheng Li --- .../bindings/sound/hisilicon,hi3660-i2s.txt | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/hisilicon,hi3660-i2s.txt diff --git a/Documentation/devicetree/bindings/sound/hisilicon,hi3660-i2s.txt b/Documentation/devicetree/bindings/sound/hisilicon,hi3660-i2s.txt new file mode 100644 index 0000000..654c234 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/hisilicon,hi3660-i2s.txt @@ -0,0 +1,49 @@ +* Hisilicon 6210 i2s controller + +Required properties: + +- compatible: should be one of the following: + - "hisilicon,hi3660-i2s-1.0" +- reg: physical base address of the i2s controller unit and length of + memory mapped region. +- interrupts: should contain the i2s interrupt. +- clocks: a list of phandle + clock-specifier pairs, one for each entry + in clock-names. +- clock-names: should contain following: + - "dacodec" + - "i2s-base" +- dmas: DMA specifiers for tx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt +- dma-names: should be "tx" and "rx" +- hisilicon,sysctrl-syscon: phandle to sysctrl syscon +- #sound-dai-cells: Should be set to 1 (for multi-dai) + +Example for the hi3660 i2s controller: + + i2s2: hisi_i2s { + compatible = "hisilicon,hi3660-i2s-1.0"; + reg = <0x0 0xe804f800 0x0 0x400>, + <0x0 0xe804e000 0x0 0x400>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s2_pmx_func &i2s2_cfg_func>; + dmas = <&asp_dmac 18 &asp_dmac 19>; + dma-names = "rx", "tx"; + #sound-dai-cells = <0>; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "hikey-hdmi"; + simple-audio-card,format = "i2s"; + + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + + sound_master: simple-audio-card,cpu { + sound-dai = <&i2s2>; + }; + + simple-audio-card,codec { + sound-dai = <&adv7533>; + }; + };