From patchwork Mon Apr 14 00:59:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3975621 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 99A3A9F2CC for ; Mon, 14 Apr 2014 00:59:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA96620170 for ; Mon, 14 Apr 2014 00:59:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E55482015D for ; Mon, 14 Apr 2014 00:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750784AbaDNA7f (ORCPT ); Sun, 13 Apr 2014 20:59:35 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:44148 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbaDNA7f (ORCPT ); Sun, 13 Apr 2014 20:59:35 -0400 Received: by mail-pd0-f170.google.com with SMTP id v10so7470226pde.15 for ; Sun, 13 Apr 2014 17:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:mime-version :content-type; bh=pZrQDh8hoQKGNAWrnKbeNKgr1q0wvhcyMBCygck7Pgk=; b=VG1LOdDRqjZTYyMsA314YFhzxHMSsMRlPtI9PqWk/D4F0YZNZV/FQ6fEOVPMbR/OYc 7NN6GEzawcjPFTqHfY5nKCvW+82EWgDK+2Yx7pNEryJJRFy2RnQeumT2rCCLnFtkKeGt jPLEWwK24N8a/AswmHNtY69+6Ehw+Xg8MDkzLr2Rk2e5ZDmvIgcS+Ha826SG5CVIL70q qcZgY2+30R3uWsga4HIPPnBRoLyJDogp9ynXkd0nNkRh8i/Pc7m/he1TG90bnjimIaru VxPn5Kp9Z4aTQMUThUvD1hFYlNBdsECG15rIyPhc8R+rXkXQE7FPk7ihlTEC/qZ4heaH DDnw== X-Received: by 10.68.239.137 with SMTP id vs9mr41198188pbc.84.1397437174835; Sun, 13 Apr 2014 17:59:34 -0700 (PDT) Received: from remon.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id vm3sm1447985pbc.45.2014.04.13.17.59.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 13 Apr 2014 17:59:34 -0700 (PDT) Date: Sun, 13 Apr 2014 17:59:34 -0700 (PDT) Message-ID: <87ha5w20b0.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH] ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto , Kuninori Morimoto MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto e1508289404ab6ca28e0dc931612600f0441c417 (ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags) corrected SND_SOC_DAIFMT_CBx_CFx definition. But then, Lager board was maintenanced other branch. This patch correct SND_SOC_DAIFMT_CBx_CFx flag for lager Signed-off-by: Kuninori Morimoto --- arch/arm/mach-shmobile/board-lager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 6af09e1..05c263b 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -595,14 +595,12 @@ static struct asoc_simple_card_info rsnd_card_info = { .card = "SSI01-AK4643", .codec = "ak4642-codec.2-0012", .platform = "rcar_sound", - .daifmt = SND_SOC_DAIFMT_LEFT_J, + .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, .cpu_dai = { .name = "rcar_sound", - .fmt = SND_SOC_DAIFMT_CBS_CFS, }, .codec_dai = { .name = "ak4642-hifi", - .fmt = SND_SOC_DAIFMT_CBM_CFM, .sysclk = 11289600, }, };