aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-06-18 18:21:55 -0400
committerThierry Reding <treding@nvidia.com>2014-08-04 04:07:39 -0400
commitef70728c7a6571a1a7115031e932b811f1740b2e (patch)
tree23143137cf59f0f3df94d9a2d3a5f9ffe656ff3e
parent5482d75a6597de97f79255a257c486a6960c6c65 (diff)
drm/tegra: add MODULE_DEVICE_TABLEs
When tegra-drm.ko is built as a module, these MODULE_DEVICE_TABLEs allow the module to be auto-loaded since the module will match the devices instantiated from device tree. (Notes for stable: in 3.14+, just git rm any conflicting file, since they are added in later kernels. For 3.13 and below, manual merging will be needed) Cc: <stable@vger.kernel.org> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/dc.c1
-rw-r--r--drivers/gpu/drm/tegra/dpaux.c1
-rw-r--r--drivers/gpu/drm/tegra/dsi.c1
-rw-r--r--drivers/gpu/drm/tegra/gr2d.c1
-rw-r--r--drivers/gpu/drm/tegra/gr3d.c1
-rw-r--r--drivers/gpu/drm/tegra/hdmi.c1
-rw-r--r--drivers/gpu/drm/tegra/sor.c1
7 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index b2065d9e13d4..6553fd238685 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1394,6 +1394,7 @@ static const struct of_device_id tegra_dc_of_match[] = {
1394 /* sentinel */ 1394 /* sentinel */
1395 } 1395 }
1396}; 1396};
1397MODULE_DEVICE_TABLE(of, tegra_dc_of_match);
1397 1398
1398static int tegra_dc_parse_dt(struct tegra_dc *dc) 1399static int tegra_dc_parse_dt(struct tegra_dc *dc)
1399{ 1400{
diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c
index 3f132e356e9c..708f783ead47 100644
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@ -382,6 +382,7 @@ static const struct of_device_id tegra_dpaux_of_match[] = {
382 { .compatible = "nvidia,tegra124-dpaux", }, 382 { .compatible = "nvidia,tegra124-dpaux", },
383 { }, 383 { },
384}; 384};
385MODULE_DEVICE_TABLE(of, tegra_dpaux_of_match);
385 386
386struct platform_driver tegra_dpaux_driver = { 387struct platform_driver tegra_dpaux_driver = {
387 .driver = { 388 .driver = {
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index eadfeaf9e1eb..f7874458926a 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -983,6 +983,7 @@ static const struct of_device_id tegra_dsi_of_match[] = {
983 { .compatible = "nvidia,tegra114-dsi", }, 983 { .compatible = "nvidia,tegra114-dsi", },
984 { }, 984 { },
985}; 985};
986MODULE_DEVICE_TABLE(of, tegra_dsi_of_match);
986 987
987struct platform_driver tegra_dsi_driver = { 988struct platform_driver tegra_dsi_driver = {
988 .driver = { 989 .driver = {
diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index 7c53941f2a9e..02cd3e37a6ec 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -121,6 +121,7 @@ static const struct of_device_id gr2d_match[] = {
121 { .compatible = "nvidia,tegra20-gr2d" }, 121 { .compatible = "nvidia,tegra20-gr2d" },
122 { }, 122 { },
123}; 123};
124MODULE_DEVICE_TABLE(of, gr2d_match);
124 125
125static const u32 gr2d_addr_regs[] = { 126static const u32 gr2d_addr_regs[] = {
126 GR2D_UA_BASE_ADDR, 127 GR2D_UA_BASE_ADDR,
diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index 30f5ba9bd6d0..2bea2b2d204e 100644
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -130,6 +130,7 @@ static const struct of_device_id tegra_gr3d_match[] = {
130 { .compatible = "nvidia,tegra20-gr3d" }, 130 { .compatible = "nvidia,tegra20-gr3d" },
131 { } 131 { }
132}; 132};
133MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
133 134
134static const u32 gr3d_addr_regs[] = { 135static const u32 gr3d_addr_regs[] = {
135 GR3D_IDX_ATTRIBUTE( 0), 136 GR3D_IDX_ATTRIBUTE( 0),
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index ba067bb767e3..ffe26547328d 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1450,6 +1450,7 @@ static const struct of_device_id tegra_hdmi_of_match[] = {
1450 { .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config }, 1450 { .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config },
1451 { }, 1451 { },
1452}; 1452};
1453MODULE_DEVICE_TABLE(of, tegra_hdmi_of_match);
1453 1454
1454static int tegra_hdmi_probe(struct platform_device *pdev) 1455static int tegra_hdmi_probe(struct platform_device *pdev)
1455{ 1456{
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 6cb861bf1e03..0410e467b828 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1465,6 +1465,7 @@ static const struct of_device_id tegra_sor_of_match[] = {
1465 { .compatible = "nvidia,tegra124-sor", }, 1465 { .compatible = "nvidia,tegra124-sor", },
1466 { }, 1466 { },
1467}; 1467};
1468MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
1468 1469
1469struct platform_driver tegra_sor_driver = { 1470struct platform_driver tegra_sor_driver = {
1470 .driver = { 1471 .driver = {