From patchwork Fri Jun 20 08:03:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 4387281 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 E6DCD9F433 for ; Fri, 20 Jun 2014 08:07:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0032920397 for ; Fri, 20 Jun 2014 08:07:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 242FB2026D for ; Fri, 20 Jun 2014 08:07:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755808AbaFTIGj (ORCPT ); Fri, 20 Jun 2014 04:06:39 -0400 Received: from mail-pb0-f49.google.com ([209.85.160.49]:42567 "EHLO mail-pb0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbaFTIGg (ORCPT ); Fri, 20 Jun 2014 04:06:36 -0400 Received: by mail-pb0-f49.google.com with SMTP id rr13so2840298pbb.36 for ; Fri, 20 Jun 2014 01:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=O5ukqXJ6Xn+k2cbF1Wv3dmePsljWKSqfG3AeGZPiUZY=; b=PUl2fkUUdsUyU3c55Ld0TBQJhV7BmDK0P0bJ//zE1a6FyVtxdPWxNqF+OxHPqaeKr9 vUTejd7MgM4OC/3IsIQVp2Qwr3ReGHM6gistJq/QmNo/g3SXvog6BTJDtFY21+bzBgX7 GmPe9NUzYrHCirKZOHk5Vv69AaeNZEeovfyUwPjN39iiknizdqvBCqn7Lr8dNLNqwNyn ii6apZnw/wVC8tA/8+gK68ax5eR31Qx6cJEicw7wA1obiSsvcmm0rjyNE885zFJgirWh dzBi2jTuTNvBSioV2wOP+lE6OoIzPLr1kmhTxpVRi8dU6qPD8d83yo5g9nMBjoYX8fOO MZdw== X-Received: by 10.68.166.36 with SMTP id zd4mr167423pbb.54.1403251595603; Fri, 20 Jun 2014 01:06:35 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id rc3sm12188937pbc.5.2014.06.20.01.06.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Jun 2014 01:06:35 -0700 (PDT) From: Tushar Behera To: linux-samsung-soc@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: dianders@chromium.org, kgene.kim@samsung.com, tiwai@suse.de, broonie@kernel.org, lgirdwood@gmail.com, galak@codeaurora.org, ijc+devicetree@hellion.org.uk, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org, trblinux@gmail.com, Wonjoon Lee Subject: [PATCH 1/2] ASoC: max98090: Add max98091 compatible string Date: Fri, 20 Jun 2014 13:33:15 +0530 Message-Id: <1403251396-17487-1-git-send-email-tushar.b@samsung.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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: Wonjoon Lee The MAX98091 CODEC is the same as MAX98090 CODEC, but with an extra microphone. Existing driver for MAX98090 CODEC already has support for MAX98091 CODEC. Adding proper compatible string so that MAX98091 CODEC can be specified from device tree. Signed-off-by: Wonjoon Lee Signed-off-by: Doug Anderson Signed-off-by: Tushar Behera Reviewed-by: Doug Anderson --- Picked from https://chromium-review.googlesource.com/#/c/184091/ .../devicetree/bindings/sound/max98090.txt | 2 +- sound/soc/codecs/max98090.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt index a5e63fa..c454e67 100644 --- a/Documentation/devicetree/bindings/sound/max98090.txt +++ b/Documentation/devicetree/bindings/sound/max98090.txt @@ -4,7 +4,7 @@ This device supports I2C only. Required properties: -- compatible : "maxim,max98090". +- compatible : "maxim,max98090" or "maxim,max98091". - reg : The I2C address of the device. diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index f5fccc7..4f5534d 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2460,12 +2460,14 @@ static const struct dev_pm_ops max98090_pm = { static const struct i2c_device_id max98090_i2c_id[] = { { "max98090", MAX98090 }, + { "max98091", MAX98091 }, { } }; MODULE_DEVICE_TABLE(i2c, max98090_i2c_id); static const struct of_device_id max98090_of_match[] = { { .compatible = "maxim,max98090", }, + { .compatible = "maxim,max98091", }, { } }; MODULE_DEVICE_TABLE(of, max98090_of_match);