Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Javier Martinez Canillas <javier@osg.samsung.com>,
        Mark Brown <broonie@kernel.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.4 054/115] ASoc: rt5645: Add OF device ID table
Thread-Topic: [PATCH AUTOSEL for 4.4 054/115] ASoc: rt5645: Add OF device ID
 table
Thread-Index: AQHTsz9aPpgLZHrzX06ElwCKVTI5Ow==
Date:   Sat, 3 Mar 2018 22:31:20 +0000
Message-ID: <20180303223010.27106-54-alexander.levin@microsoft.com>
References: <20180303223010.27106-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303223010.27106-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: eebdbdb4-cad7-48c1-af73-08d581579a02
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:31:20.1196
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1113
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Javier Martinez Canillas <javier@osg.samsung.com>

[ Upstream commit 9ba2da5f5d18daaa365ab5426b05e16f1d114786 ]

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:<device>.

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-rt5645.ko | grep alias
alias:          acpi*:10EC3270:*
alias:          acpi*:10EC5640:*
alias:          acpi*:10EC5650:*
alias:          acpi*:10EC5648:*
alias:          acpi*:10EC5645:*
alias:          i2c:rt5650
alias:          i2c:rt5645

After this patch:

$ modinfo sound/soc/codecs/snd-soc-rt5645.ko | grep alias
alias:          of:N*T*Crealtek,rt5650C*
alias:          of:N*T*Crealtek,rt5650
alias:          of:N*T*Crealtek,rt5645C*
alias:          of:N*T*Crealtek,rt5645
alias:          acpi*:10EC3270:*
alias:          acpi*:10EC5640:*
alias:          acpi*:10EC5650:*
alias:          acpi*:10EC5648:*
alias:          acpi*:10EC5645:*
alias:          i2c:rt5650
alias:          i2c:rt5645

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 sound/soc/codecs/rt5645.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index b74840b5becf..327f390be09e 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3329,6 +3329,15 @@ static const struct i2c_device_id rt5645_i2c_id[] =
=3D {
 };
 MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);
=20
+#ifdef CONFIG_OF
+static const struct of_device_id rt5645_of_match[] =3D {
+	{ .compatible =3D "realtek,rt5645", },
+	{ .compatible =3D "realtek,rt5650", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, rt5645_of_match);
+#endif
+
 #ifdef CONFIG_ACPI
 static struct acpi_device_id rt5645_acpi_match[] =3D {
 	{ "10EC5645", 0 },
@@ -3702,6 +3711,7 @@ static void rt5645_i2c_shutdown(struct i2c_client *i2=
c)
 static struct i2c_driver rt5645_i2c_driver =3D {
 	.driver =3D {
 		.name =3D "rt5645",
+		.of_match_table =3D of_match_ptr(rt5645_of_match),
 		.acpi_match_table =3D ACPI_PTR(rt5645_acpi_match),
 	},
 	.probe =3D rt5645_i2c_probe,
--=20
2.14.1