Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1975921pxb; Fri, 5 Mar 2021 04:34:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZtdKReH2InISrt3MHirPEQa6tEiDb4BRTPadj1U93+rJkEyHyOUQrRT73ar2BQwaRwXpm X-Received: by 2002:aa7:cd6a:: with SMTP id ca10mr8956028edb.7.1614947684421; Fri, 05 Mar 2021 04:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614947684; cv=none; d=google.com; s=arc-20160816; b=O5YFw/urOhCpFOB9HCCIalHlCs6RtGCNLOsOrQpsg75OjZ62c2oUnerKWUrLaecUHN COYmwtqp3niyLRJD+LpHkV8N9f5MvKr5lk1M+HSpxvHdyrXhUXUBcK9ueOOO1wmbDwB6 9ZrxRSmiOcBl4zTVtguCNnX3qYaMPuSG2MjWPP/rB/9RMUmky7YQlbp/zPbw8mfPtD9Y oxz5lWQafsPpY1k37T27AESECtq4bU2oeGREor4DPCTtq6PM5U2Od8Cko0pBUZjp4xqt yJSgF9lRI+Ykxr5ogXtjG+R7AJJWb1AquaR8tHdrbT44D8fQYKqfu4H5OBeM5qClBcQQ 3Pmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wo2DrORCs9wc50Wh5Zqu4oKJTFPVmILNt4UQ43LRIQM=; b=x1xQve+rLXhrdsR1Augn/7ub0LgTJiwADyYfyQ9EC0T+4c+mGEbzQQgtUzyroxHAhD qljeUfgjTj5KhNUCD8RvM+WbXCVlSR0cn1Gyo+3CTYVYd9I5F5F1ROZfZecsZI46coFD /hjIqOjUsri3zgo49tASeIhm0txGy7FzSvM6qk/34yNuP1nO1gxNiWKoLYld4ST5bBjl n11dtEJUi+HLzl27iT/KMMA72hcoCbuuQIsvvPUf+1OwLir8a2Q4qJf5q19pvp/2D5E1 mm5v9QIcpPAlWumR+hM56bmKL9Wmkbx9xKdbAoghJ3grRuf/ieZ7Ad8ut9dYcdPSYIiK GZ+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="BYe/hxoR"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n23si1192806ejs.705.2021.03.05.04.34.19; Fri, 05 Mar 2021 04:34:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="BYe/hxoR"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232213AbhCEMdY (ORCPT + 99 others); Fri, 5 Mar 2021 07:33:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:43226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232326AbhCEMcv (ORCPT ); Fri, 5 Mar 2021 07:32:51 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 68A9465037; Fri, 5 Mar 2021 12:32:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614947571; bh=zIzfEiICqLUOFy4wuynwo4ABZqY1RAf4/tgVevZVm+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BYe/hxoRYG7gp7feN8e7Q9RV+iRxNLBqeZD/+6WeHp5lqWc9Iw+fiebrykvCup0h+ X3Z4uJnjqTmqgtLpFL2cWIox048gOYU6Ol52vFSzcJtCjkVErJeKz/K5cKAZjZvrIB DSQNTdBQNdZNnrbpng7+0aVCPZU4MfAvj8fM6tX0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pierre-Louis Bossart , Guennadi Liakhovetski , Kai Vehmanen , Mark Brown , Sasha Levin Subject: [PATCH 5.10 075/102] ASoC: Intel: sof-sdw: indent and add quirks consistently Date: Fri, 5 Mar 2021 13:21:34 +0100 Message-Id: <20210305120906.965585571@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305120903.276489876@linuxfoundation.org> References: <20210305120903.276489876@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart [ Upstream commit 8caf37e2be761688c396c609880936a807af490f ] Use the same style for all quirks to avoid misses and errors Signed-off-by: Pierre-Louis Bossart Reviewed-by: Guennadi Liakhovetski Reviewed-by: Kai Vehmanen Link: https://lore.kernel.org/r/20210208233336.59449-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/sof_sdw.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 07e72ca1dfbc..d441ef324c06 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -115,9 +115,10 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Tiger Lake Client Platform"), }, - .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 | - SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC | - SOF_SSP_PORT(SOF_I2S_SSP2)), + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_RT711_JD_SRC_JD1 | + SOF_SDW_PCH_DMIC | + SOF_SSP_PORT(SOF_I2S_SSP2)), }, { .callback = sof_sdw_quirk_cb, @@ -141,7 +142,8 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), DMI_MATCH(DMI_PRODUCT_NAME, "Volteer"), }, - .driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC | + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_SDW_PCH_DMIC | SOF_SDW_FOUR_SPK), }, { @@ -150,7 +152,8 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), DMI_MATCH(DMI_PRODUCT_NAME, "Ripto"), }, - .driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC | + .driver_data = (void *)(SOF_SDW_TGL_HDMI | + SOF_SDW_PCH_DMIC | SOF_SDW_FOUR_SPK), }, -- 2.30.1