From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03hn0215.outbound.protection.outlook.com ([104.47.42.215]:57024 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935353AbeCHE67 (ORCPT ); Wed, 7 Mar 2018 23:58:59 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: "H. Nikolaus Schaller" , Tomi Valkeinen , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 41/67] omapdrm: panel: fix compatible vendor string for td028ttec1 Date: Thu, 8 Mar 2018 04:57:49 +0000 Message-ID: <20180308045641.7814-41-alexander.levin@microsoft.com> References: <20180308045641.7814-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045641.7814-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: "H. Nikolaus Schaller" [ Upstream commit c1b9d4c75cd549e08bd0596d7f9dcc20f7f6e8fa ] The vendor name was "toppoly" but other panels and the vendor list have defined it as "tpo". So let's fix it in driver and bindings. We keep the old definition in parallel to stay compatible with potential older DTB setup. Signed-off-by: H. Nikolaus Schaller Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- .../display/panel/{toppoly,td028ttec1.txt =3D> tpo,td028ttec1.txt} | = 4 ++-- drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 = +++ drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c | 3 = +++ 3 files changed, 8 insertions(+), 2 deletions(-) rename Documentation/devicetree/bindings/display/panel/{toppoly,td028ttec1= .txt =3D> tpo,td028ttec1.txt} (84%) diff --git a/Documentation/devicetree/bindings/display/panel/toppoly,td028t= tec1.txt b/Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.t= xt similarity index 84% rename from Documentation/devicetree/bindings/display/panel/toppoly,td028tt= ec1.txt rename to Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.tx= t index 7175dc3740ac..ed34253d9fb1 100644 --- a/Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.tx= t +++ b/Documentation/devicetree/bindings/display/panel/tpo,td028ttec1.txt @@ -2,7 +2,7 @@ Toppoly TD028TTEC1 Panel =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Required properties: -- compatible: "toppoly,td028ttec1" +- compatible: "tpo,td028ttec1" =20 Optional properties: - label: a symbolic name for the panel @@ -14,7 +14,7 @@ Example ------- =20 lcd-panel: td028ttec1@0 { - compatible =3D "toppoly,td028ttec1"; + compatible =3D "tpo,td028ttec1"; reg =3D <0>; spi-max-frequency =3D <100000>; spi-cpol; diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/driv= ers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c index 0a38a0e8c925..a0dfa14f4fab 100644 --- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c +++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c @@ -452,6 +452,8 @@ static int td028ttec1_panel_remove(struct spi_device *s= pi) } =20 static const struct of_device_id td028ttec1_of_match[] =3D { + { .compatible =3D "omapdss,tpo,td028ttec1", }, + /* keep to not break older DTB */ { .compatible =3D "omapdss,toppoly,td028ttec1", }, {}, }; @@ -471,6 +473,7 @@ static struct spi_driver td028ttec1_spi_driver =3D { =20 module_spi_driver(td028ttec1_spi_driver); =20 +MODULE_ALIAS("spi:tpo,td028ttec1"); MODULE_ALIAS("spi:toppoly,td028ttec1"); MODULE_AUTHOR("H. Nikolaus Schaller "); MODULE_DESCRIPTION("Toppoly TD028TTEC1 panel driver"); diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1= .c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c index 57e9e146ff74..4aeb908f2d1e 100644 --- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c +++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c @@ -455,6 +455,8 @@ static int td028ttec1_panel_remove(struct spi_device *s= pi) } =20 static const struct of_device_id td028ttec1_of_match[] =3D { + { .compatible =3D "omapdss,tpo,td028ttec1", }, + /* keep to not break older DTB */ { .compatible =3D "omapdss,toppoly,td028ttec1", }, {}, }; @@ -474,6 +476,7 @@ static struct spi_driver td028ttec1_spi_driver =3D { =20 module_spi_driver(td028ttec1_spi_driver); =20 +MODULE_ALIAS("spi:tpo,td028ttec1"); MODULE_ALIAS("spi:toppoly,td028ttec1"); MODULE_AUTHOR("H. Nikolaus Schaller "); MODULE_DESCRIPTION("Toppoly TD028TTEC1 panel driver"); --=20 2.14.1