Commit 873d1515 authored by Stephen Warren's avatar Stephen Warren Committed by Greg Kroah-Hartman

drm/tegra: add MODULE_DEVICE_TABLEs

commit ef70728c 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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2593ca04
...@@ -1303,6 +1303,7 @@ static const struct of_device_id tegra_dc_of_match[] = { ...@@ -1303,6 +1303,7 @@ static const struct of_device_id tegra_dc_of_match[] = {
/* sentinel */ /* sentinel */
} }
}; };
MODULE_DEVICE_TABLE(of, tegra_dc_of_match);
static int tegra_dc_parse_dt(struct tegra_dc *dc) static int tegra_dc_parse_dt(struct tegra_dc *dc)
{ {
......
...@@ -382,6 +382,7 @@ static const struct of_device_id tegra_dpaux_of_match[] = { ...@@ -382,6 +382,7 @@ static const struct of_device_id tegra_dpaux_of_match[] = {
{ .compatible = "nvidia,tegra124-dpaux", }, { .compatible = "nvidia,tegra124-dpaux", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, tegra_dpaux_of_match);
struct platform_driver tegra_dpaux_driver = { struct platform_driver tegra_dpaux_driver = {
.driver = { .driver = {
......
...@@ -982,6 +982,7 @@ static const struct of_device_id tegra_dsi_of_match[] = { ...@@ -982,6 +982,7 @@ static const struct of_device_id tegra_dsi_of_match[] = {
{ .compatible = "nvidia,tegra114-dsi", }, { .compatible = "nvidia,tegra114-dsi", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, tegra_dsi_of_match);
struct platform_driver tegra_dsi_driver = { struct platform_driver tegra_dsi_driver = {
.driver = { .driver = {
......
...@@ -121,6 +121,7 @@ static const struct of_device_id gr2d_match[] = { ...@@ -121,6 +121,7 @@ static const struct of_device_id gr2d_match[] = {
{ .compatible = "nvidia,tegra20-gr2d" }, { .compatible = "nvidia,tegra20-gr2d" },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, gr2d_match);
static const u32 gr2d_addr_regs[] = { static const u32 gr2d_addr_regs[] = {
GR2D_UA_BASE_ADDR, GR2D_UA_BASE_ADDR,
......
...@@ -130,6 +130,7 @@ static const struct of_device_id tegra_gr3d_match[] = { ...@@ -130,6 +130,7 @@ static const struct of_device_id tegra_gr3d_match[] = {
{ .compatible = "nvidia,tegra20-gr3d" }, { .compatible = "nvidia,tegra20-gr3d" },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
static const u32 gr3d_addr_regs[] = { static const u32 gr3d_addr_regs[] = {
GR3D_IDX_ATTRIBUTE( 0), GR3D_IDX_ATTRIBUTE( 0),
......
...@@ -1450,6 +1450,7 @@ static const struct of_device_id tegra_hdmi_of_match[] = { ...@@ -1450,6 +1450,7 @@ static const struct of_device_id tegra_hdmi_of_match[] = {
{ .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config }, { .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, tegra_hdmi_of_match);
static int tegra_hdmi_probe(struct platform_device *pdev) static int tegra_hdmi_probe(struct platform_device *pdev)
{ {
......
...@@ -1455,6 +1455,7 @@ static const struct of_device_id tegra_sor_of_match[] = { ...@@ -1455,6 +1455,7 @@ static const struct of_device_id tegra_sor_of_match[] = {
{ .compatible = "nvidia,tegra124-sor", }, { .compatible = "nvidia,tegra124-sor", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
struct platform_driver tegra_sor_driver = { struct platform_driver tegra_sor_driver = {
.driver = { .driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment