From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1247250-1520120778-2-2056921351387344239 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520120777; b=JamiGrSKE04oQCHwJzVb0PUJ0OtnycqL//Rxjn0B92fFqiw JnZhMM0P7CuRRYHHi7xRCoNKmANQmjz6K/IePbXjKxucDNFz9tgGaDKEKuJkoAAY +UaoZs4y3fwWrSiFq6ToRyQixbuXVsFGByNM5/LocljVjGuGZ2h/2YGluVDTeN8y KCZMZ3eLSatyhNuj9DwOTCJL6KGw/+qEIucLJPpzAN7MmDvLZmg//DhR4zVfWUUN FF/7T40qAPjwBpYiDVVZPaKaTXG1mYccngZbCzkzyhzhdZAH0TfeSnV9Sz2gGf9x 1xLPHM7Ocdq4KKGsc2EuGlg4TGavqcbS+ysdw2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520120777; bh=RqdZnS F0vmXZItsH/vyVyCvMNNOimqmhXQI1ogwF120=; b=IdaqVaQvc+GGKFw8W00ZiY rEA3BJkwZsMylk9DdH5etowIeDBnEaWj3OQbKLm13Z6TNYctkzF4vsQO8gf7zcHk oB4qMiDtZazjvwrbHna2oN3OydVKy2JhQr1qdCZoOsUSL0TNGaKbkBh+lo4CGa6R pSLasHoForhbxJ9ybE6iOamcXwTLiJAB19sZCNOR36WkW3uW9nQpQOGOBkXjETNa 2al6uxc6snpyKIpsxnJHQwEUHG+8Q+lSe5ZZ6KlJ3oH9t870GEbygAs1io6J2Xkg uV+357HZpnhhkxIlPoqMfR2dzNbVi1Ud8FZeHcv1uG5VTTzmEk7L7sRvsX+pJOnQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GbcnC+Dh x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GbcnC+Dh x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933870AbeCCXqN (ORCPT ); Sat, 3 Mar 2018 18:46:13 -0500 Received: from mail-by2nam03on0113.outbound.protection.outlook.com ([104.47.42.113]:51939 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934081AbeCCWeJ (ORCPT ); Sat, 3 Mar 2018 17:34:09 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Javier Martinez Canillas , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 112/219] ASoC: ssm4567: Add OF device ID table Thread-Topic: [PATCH AUTOSEL for 4.9 112/219] ASoC: ssm4567: Add OF device ID table Thread-Index: AQHTsz8H47heRhuSxEKAfndCa08tgQ== Date: Sat, 3 Mar 2018 22:29:00 +0000 Message-ID: <20180303222716.26640-112-alexander.levin@microsoft.com> References: <20180303222716.26640-1-alexander.levin@microsoft.com> In-Reply-To: <20180303222716.26640-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1068;7:CBIAWbyDdsXfu7tms1lGWDNblxzh9qnWHX6RqygCkolffFb1r/D2bf+pjc6El9kdxp5EbQ9fDwaAOk1ZckPX7hYh9SFOnhjgXxd3Y/6Bptud77sdfWUmahsRDECqnv9HeHd5r+PW5pgzuRYtyZOT3y2neo8i+0vrxciQer83+JK4Vb8wJ1yEeXc6kjbJzmHhk4xlalsPrv5S1YaKfIM0gwWBvmfvKiQilM+fiXiilbigSBPvcygA4gBjEm9lT6dz x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: f702457c-cb80-4138-9494-08d58156e005 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1068; x-ms-traffictypediagnostic: MW2PR2101MB1068: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231220)(944501244)(52105095)(10201501046)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1068;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1068; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(366004)(376002)(39860400002)(346002)(199004)(189003)(102836004)(6506007)(26005)(66066001)(4326008)(1076002)(105586002)(10290500003)(478600001)(72206003)(86612001)(14454004)(186003)(2906002)(2501003)(305945005)(7736002)(36756003)(3660700001)(5250100002)(25786009)(2950100002)(5660300001)(3846002)(2900100001)(3280700002)(6116002)(106356001)(22452003)(97736004)(316002)(81166006)(10090500001)(81156014)(8936002)(8676002)(76176011)(6436002)(110136005)(53936002)(6486002)(54906003)(6512007)(86362001)(107886003)(68736007)(99286004)(6666003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1068;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: DAQ9nWhRfgptsvedZ8nw0Ip69PCDkh5Vva3Krex2kdPWY0TGDerEZPJI1I1gudrR3fDp6dOmxkmAItPFVfcT5v0CzqV2j3cilR4l4tW7s7tzRylX8aQqrb9iesiTWhE+fCqql+0nOUW+UGL89Cx+tXEdb8OLsGtA1A8YSrAva28= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f702457c-cb80-4138-9494-08d58156e005 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:00.8069 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1068 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Javier Martinez Canillas [ Upstream commit 71c314d7ef2442cd798584a3dece8151215e1777 ] The driver doesn't have a struct of_device_id table but supported devices are registered via Device Trees. This is working on the assumption that a I2C device registered via OF will always match a legacy I2C device ID and that the MODALIAS reported will always be of the form i2c:. But this could change in the future so the correct approach is to have an OF device ID table if the devices are registered via OF. Before this patch: $ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias alias: acpi*:INT343B:* alias: i2c:ssm4567 After this patch: $ modinfo sound/soc/codecs/snd-soc-ssm4567.ko | grep alias alias: acpi*:INT343B:* alias: of:N*T*Cadi,ssm4567C* alias: of:N*T*Cadi,ssm4567 alias: i2c:ssm4567 Signed-off-by: Javier Martinez Canillas Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/ssm4567.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/ssm4567.c b/sound/soc/codecs/ssm4567.c index 2bb5a11c9ba1..a622623e8558 100644 --- a/sound/soc/codecs/ssm4567.c +++ b/sound/soc/codecs/ssm4567.c @@ -485,6 +485,14 @@ static const struct i2c_device_id ssm4567_i2c_ids[] = =3D { }; MODULE_DEVICE_TABLE(i2c, ssm4567_i2c_ids); =20 +#ifdef CONFIG_OF +static const struct of_device_id ssm4567_of_match[] =3D { + { .compatible =3D "adi,ssm4567", }, + { } +}; +MODULE_DEVICE_TABLE(of, ssm4567_of_match); +#endif + #ifdef CONFIG_ACPI =20 static const struct acpi_device_id ssm4567_acpi_match[] =3D { @@ -498,6 +506,7 @@ MODULE_DEVICE_TABLE(acpi, ssm4567_acpi_match); static struct i2c_driver ssm4567_driver =3D { .driver =3D { .name =3D "ssm4567", + .of_match_table =3D of_match_ptr(ssm4567_of_match), .acpi_match_table =3D ACPI_PTR(ssm4567_acpi_match), }, .probe =3D ssm4567_i2c_probe, --=20 2.14.1