From patchwork Wed Dec 12 09:25:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1011705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43FBJW1SlXz9sC7; Wed, 12 Dec 2018 20:26:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gX0mU-0000J0-Bd; Wed, 12 Dec 2018 09:26:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gX0mR-0000Gn-Pj for kernel-team@lists.ubuntu.com; Wed, 12 Dec 2018 09:26:11 +0000 Received: from [125.35.49.90] (helo=hwang4-Lenovo-V480c.bluefin) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gX0mQ-0002iI-Rj for kernel-team@lists.ubuntu.com; Wed, 12 Dec 2018 09:26:11 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic/OEM-B][PATCH 2/6] UBUNTU: SAUCE: ASoC: Intel: Kbl: (no-up) Add ACPI GPIO mapping for lineout-mute Date: Wed, 12 Dec 2018 17:25:55 +0800 Message-Id: <20181212092600.4505-3-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181212092600.4505-1-hui.wang@canonical.com> References: <20181212092600.4505-1-hui.wang@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Shrirang Bagul BugLink: https://bugs.launchpad.net/bugs/1807334 Signed-off-by: Shrirang Bagul Signed-off-by: Hui Wang --- sound/soc/intel/boards/kbl_rt5660.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 6f92dd9e522d..b0c6383d77ba 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -106,26 +106,31 @@ static const struct snd_soc_dapm_route kabylake_5660_map[] = { { "iDisp1 Tx", NULL, "iDisp1_out"}, }; +static const struct acpi_gpio_params lineout_mute_gpio = { 0, 0, true }; + +static const struct acpi_gpio_mapping acpi_rt5660_gpios[] = { + { "lineout-mute-gpios", &lineout_mute_gpio , 1 }, + { NULL }, +}; + static int kabylake_rt5660_codec_init(struct snd_soc_pcm_runtime *rtd) { int ret; struct kbl_rt5660_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_codec *codec = rtd->codec; + ret = devm_acpi_dev_add_driver_gpios(codec->dev, acpi_rt5660_gpios); + if (ret) + dev_warn(codec->dev, "Failed to add driver gpios\n"); + /* Request rt5660 GPIO for lineout mute control */ - ctx->gpio_lo_mute = devm_gpiod_get_index(codec->dev, - "lineout-mute", 0, 0); + ctx->gpio_lo_mute = devm_gpiod_get(codec->dev, "lineout-mute", + GPIOD_OUT_HIGH); if (IS_ERR(ctx->gpio_lo_mute)) { dev_err(rtd->card->dev, "Can't find GPIO_MUTE# gpio\n"); return PTR_ERR(ctx->gpio_lo_mute); } - ret = gpiod_direction_output(ctx->gpio_lo_mute, 1); - if (ret) { - dev_err(rtd->dev, "failed to set lineout-mute gpio %d\n", ret); - return ret; - } - return ret; }