From patchwork Sun Aug 4 06:44:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dani Krishna Mohan X-Patchwork-Id: 268116 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 273DF2C0122 for ; Mon, 19 Aug 2013 16:44:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5A1474A098; Mon, 19 Aug 2013 08:44:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zP72-vm11dVt; Mon, 19 Aug 2013 08:44:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 373484A0AD; Mon, 19 Aug 2013 08:43:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5637A4A092 for ; Mon, 19 Aug 2013 08:43:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9LaA8IOe6ofD for ; Mon, 19 Aug 2013 08:43:33 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id 43EE44A08E for ; Mon, 19 Aug 2013 08:43:23 +0200 (CEST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MRR00BEIMNT0PS0@mailout2.samsung.com> for u-boot@lists.denx.de; Mon, 19 Aug 2013 15:43:20 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 29.42.11618.88EB1125; Mon, 19 Aug 2013 15:43:20 +0900 (KST) X-AuditID: cbfee691-b7fef6d000002d62-76-5211be88fcdd Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 66.8C.32250.88EB1125; Mon, 19 Aug 2013 15:43:20 +0900 (KST) Received: from krishnna-desktop.sisodomain.com ([107.108.73.88]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MRR00182MNZLTC0@mmp2.samsung.com>; Mon, 19 Aug 2013 15:43:20 +0900 (KST) From: Dani Krishna Mohan To: u-boot@lists.denx.de Date: Sun, 04 Aug 2013 12:14:41 +0530 Message-id: <1375598683-3174-5-git-send-email-krishna.md@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1375598683-3174-1-git-send-email-krishna.md@samsung.com> References: <1375598683-3174-1-git-send-email-krishna.md@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkWrdjn2CQwbXJhhYdR1oYLVrWHmC1 +LZlG6PF272d7A4sHrMbLrJ4nL2zg9Gjb8sqxgDmKC6blNSczLLUIn27BK6Ms6s+sxV0iVTc vSncwDhboIuRk0NCwESid+1UZghbTOLCvfVsXYxcHEICSxkl1k2ZywZT9PfgbRYQW0hgOqPE 9tN5EEX9TBKzPh9lB0mwCRhKXD26nwnEFhGQkPjVf5URxGYWcJF49n83K4gtLOAq8ebke7B6 FgFVibsHj4DFeYHir3+sBlrAAbRMQWLOJBuQMKeAm8SlU78ZIfa6ShyetoAVZK+EwHc2iZvP j7JAzBGQ+Db5EFSvrMSmA1DPSEocXHGDZQKj8AJGhlWMoqkFyQXFSelFpnrFibnFpXnpesn5 uZsYgSF7+t+ziTsY7x+wPsSYDDRuIrOUaHI+MOTzSuINjc2MLExNTI2NzC3NSBNWEudVb7EO FBJITyxJzU5NLUgtii8qzUktPsTIxMEp1cB4+sJn9esmxdZ9zS3Ldp4ry7wt/UEo53ncpZWp MaUmdVmnr3EFJp7YpGmTc950cTH3zV9H2Gw/Tdgf6WhRviiQdZlF6ctD2ZVO+p6PsvaYWb49 M2HqzZk7bxyfZac6wW/zFm6hw/WzDLfus2vqtigNrSkKTKlNVrW9WPGPJ2NW9W+bjarC4YZK LMUZiYZazEXFiQB8dlhQbwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsVy+t9jQd2OfYJBBtO+alp0HGlhtGhZe4DV 4tuWbYwWb/d2sjuweMxuuMjicfbODkaPvi2rGAOYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPj neNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA9ikplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ 9Q0JgusxMkADCWsYM86u+sxW0CVScfemcAPjbIEuRk4OCQETib8Hb7NA2GISF+6tZwOxhQSm M0psP53XxcgFZPczScz6fJQdJMEmYChx9eh+JhBbREBC4lf/VUYQm1nAReLZ/92sILawgKvE m5PvwepZBFQl7h48AhbnBYq//rEaaBkH0DIFiTmTbEDCnAJuEpdO/WaE2OsqcXjaAtYJjLwL GBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+duYgRHxDOpHYwrGywOMQpwMCrx8Fq4CQYJsSaW FVfmHmKU4GBWEuFlUQMK8aYkVlalFuXHF5XmpBYfYkwGOmois5Rocj4wWvNK4g2NTcxNjU0t TSxMzCxJE1YS5z3Qah0oJJCeWJKanZpakFoEs4WJg1OqgXH/2Rv36v3j61vXbtvEKhpuIrzy /YyDO3NDXh/9N3mC4uwX76ZYrDNSKDda+Nu45LWw6/1vX06c/HFQnM9yh8b1/O0XUufvYDSr OizQ9fPeYeaDK1vmxyx6ITXrzEoFoy8T+rXn3slcc2/mncAre1cItlv75a062qdppVzEzfpB M9u77ttH1Y+7lFiKMxINtZiLihMBhwjBocwCAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: rajeshwari.s@samsung.com Subject: [U-Boot] [PATCH 4/6 V2] Sound: I2S: Replacing I2S1 with I2S0 channel. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch makes required changes to make use of I2S0 channel instead of I2S1 channel on exynos5250. Signed-off-by: Dani Krishna Mohan --- changes in V2: - None arch/arm/include/asm/arch-exynos/i2s-regs.h | 6 ++++++ drivers/sound/samsung-i2s.c | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/i2s-regs.h b/arch/arm/include/asm/arch-exynos/i2s-regs.h index 613b9b7..4a4a7a0 100644 --- a/arch/arm/include/asm/arch-exynos/i2s-regs.h +++ b/arch/arm/include/asm/arch-exynos/i2s-regs.h @@ -8,10 +8,12 @@ #ifndef __I2S_REGS_H__ #define __I2S_REGS_H__ +#define CON_RESET (1 << 31) #define CON_TXFIFO_FULL (1 << 8) #define CON_TXCH_PAUSE (1 << 4) #define CON_ACTIVE (1 << 0) +#define MOD_OP_CLK (3 << 30) #define MOD_BLCP_SHIFT 24 #define MOD_BLCP_16BIT (0 << MOD_BLCP_SHIFT) #define MOD_BLCP_8BIT (1 << MOD_BLCP_SHIFT) @@ -24,6 +26,7 @@ #define MOD_BLC_MASK (3 << 13) #define MOD_SLAVE (1 << 11) +#define MOD_RCLKSRC (0 << 10) #define MOD_MASK (3 << 8) #define MOD_LR_LLOW (0 << 7) #define MOD_LR_RLOW (1 << 7) @@ -47,4 +50,7 @@ #define FIC_TXFLUSH (1 << 15) #define FIC_RXFLUSH (1 << 7) +#define PSREN (1 << 15) +#define PSVAL (3 << 8) + #endif /* __I2S_REGS_H__ */ diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c index 49921e5..8e8a2bc 100644 --- a/drivers/sound/samsung-i2s.c +++ b/drivers/sound/samsung-i2s.c @@ -303,21 +303,25 @@ int i2s_tx_init(struct i2stx_info *pi2s_tx) (struct i2s_reg *)pi2s_tx->base_address; /* Initialize GPIO for I2s */ - exynos_pinmux_config(PERIPH_ID_I2S1, 0); + exynos_pinmux_config(PERIPH_ID_I2S0, 0); /* Set EPLL Clock */ - ret = set_epll_clk(pi2s_tx->audio_pll_clk); + ret = set_epll_clk(pi2s_tx->samplingrate * pi2s_tx->rfs * 4); if (ret != 0) { debug("%s: epll clock set rate falied\n", __func__); return -1; } - /* Select Clk Source for Audio1 */ + /* Select Clk Source for Audio0 */ set_i2s_clk_source(); - /* Set Prescaler to get MCLK */ - set_i2s_clk_prescaler(pi2s_tx->audio_pll_clk, - (pi2s_tx->samplingrate * (pi2s_tx->rfs))); + /*Reset the i2s module */ + writel(CON_RESET, &i2s_reg->con); + + writel(MOD_OP_CLK | MOD_RCLKSRC, &i2s_reg->mod); + + /* set i2s prescaler */ + writel(PSREN | PSVAL, &i2s_reg->psr); /* Configure I2s format */ ret = i2s_set_fmt(i2s_reg, (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |