Skip to content

Commit 873d151

Browse files
nvswarrengregkh
authored andcommitted
drm/tegra: add MODULE_DEVICE_TABLEs
commit ef70728 upstream. 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) Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2593ca0 commit 873d151

File tree

7 files changed

+7
-0
lines changed

7 files changed

+7
-0
lines changed

drivers/gpu/drm/tegra/dc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,7 @@ static const struct of_device_id tegra_dc_of_match[] = {
13031303
/* sentinel */
13041304
}
13051305
};
1306+
MODULE_DEVICE_TABLE(of, tegra_dc_of_match);
13061307

13071308
static int tegra_dc_parse_dt(struct tegra_dc *dc)
13081309
{

drivers/gpu/drm/tegra/dpaux.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ static const struct of_device_id tegra_dpaux_of_match[] = {
382382
{ .compatible = "nvidia,tegra124-dpaux", },
383383
{ },
384384
};
385+
MODULE_DEVICE_TABLE(of, tegra_dpaux_of_match);
385386

386387
struct platform_driver tegra_dpaux_driver = {
387388
.driver = {

drivers/gpu/drm/tegra/dsi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,7 @@ static const struct of_device_id tegra_dsi_of_match[] = {
982982
{ .compatible = "nvidia,tegra114-dsi", },
983983
{ },
984984
};
985+
MODULE_DEVICE_TABLE(of, tegra_dsi_of_match);
985986

986987
struct platform_driver tegra_dsi_driver = {
987988
.driver = {

drivers/gpu/drm/tegra/gr2d.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ static const struct of_device_id gr2d_match[] = {
121121
{ .compatible = "nvidia,tegra20-gr2d" },
122122
{ },
123123
};
124+
MODULE_DEVICE_TABLE(of, gr2d_match);
124125

125126
static const u32 gr2d_addr_regs[] = {
126127
GR2D_UA_BASE_ADDR,

drivers/gpu/drm/tegra/gr3d.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ static const struct of_device_id tegra_gr3d_match[] = {
130130
{ .compatible = "nvidia,tegra20-gr3d" },
131131
{ }
132132
};
133+
MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
133134

134135
static const u32 gr3d_addr_regs[] = {
135136
GR3D_IDX_ATTRIBUTE( 0),

drivers/gpu/drm/tegra/hdmi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,7 @@ static const struct of_device_id tegra_hdmi_of_match[] = {
14501450
{ .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config },
14511451
{ },
14521452
};
1453+
MODULE_DEVICE_TABLE(of, tegra_hdmi_of_match);
14531454

14541455
static int tegra_hdmi_probe(struct platform_device *pdev)
14551456
{

drivers/gpu/drm/tegra/sor.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,6 +1455,7 @@ static const struct of_device_id tegra_sor_of_match[] = {
14551455
{ .compatible = "nvidia,tegra124-sor", },
14561456
{ },
14571457
};
1458+
MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
14581459

14591460
struct platform_driver tegra_sor_driver = {
14601461
.driver = {

0 commit comments

Comments
 (0)