aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-07-30 04:32:46 -0400
committerThierry Reding <treding@nvidia.com>2015-08-13 07:49:36 -0400
commit3309ac836229d8bc3db7618e04a51334bef13b0a (patch)
tree6f3ac0759ebcb535ccd31a2bd351fcbfa686c498
parent003fc848774fcc7b7f14a2b4f3e6411764f43fc0 (diff)
drm/tegra: sor: Add Tegra210 eDP support
The SOR found on Tegra210 is very similar to the version found on Tegra124, except that it no longer supports LVDS. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt7
-rw-r--r--drivers/gpu/drm/tegra/drm.c1
-rw-r--r--drivers/gpu/drm/tegra/sor.c1
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
index 009f4bfa1590..626115911282 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -197,9 +197,10 @@ of the following host1x client modules:
197- sor: serial output resource 197- sor: serial output resource
198 198
199 Required properties: 199 Required properties:
200 - compatible: For Tegra124, must contain "nvidia,tegra124-sor". Otherwise, 200 - compatible: Should be:
201 must contain '"nvidia,<chip>-sor", "nvidia,tegra124-sor"', where <chip> 201 - "nvidia,tegra124-sor": for Tegra124 and Tegra132
202 is tegra132. 202 - "nvidia,tegra132-sor": for Tegra132
203 - "nvidia,tegra210-sor": for Tegra210
203 - reg: Physical base address and length of the controller's registers. 204 - reg: Physical base address and length of the controller's registers.
204 - interrupts: The interrupt outputs from the controller. 205 - interrupts: The interrupt outputs from the controller.
205 - clocks: Must contain an entry for each entry in clock-names. 206 - clocks: Must contain an entry for each entry in clock-names.
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 1993ab90226a..dfbbd88b040f 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1060,6 +1060,7 @@ static const struct of_device_id host1x_drm_subdevs[] = {
1060 { .compatible = "nvidia,tegra132-dsi", }, 1060 { .compatible = "nvidia,tegra132-dsi", },
1061 { .compatible = "nvidia,tegra210-dc", }, 1061 { .compatible = "nvidia,tegra210-dc", },
1062 { .compatible = "nvidia,tegra210-dsi", }, 1062 { .compatible = "nvidia,tegra210-dsi", },
1063 { .compatible = "nvidia,tegra210-sor", },
1063 { /* sentinel */ } 1064 { /* sentinel */ }
1064}; 1065};
1065 1066
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index a7214e99bb36..8495478d1e15 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -1600,6 +1600,7 @@ static int tegra_sor_remove(struct platform_device *pdev)
1600 1600
1601static const struct of_device_id tegra_sor_of_match[] = { 1601static const struct of_device_id tegra_sor_of_match[] = {
1602 { .compatible = "nvidia,tegra124-sor", }, 1602 { .compatible = "nvidia,tegra124-sor", },
1603 { .compatible = "nvidia,tegra210-sor", },
1603 { }, 1604 { },
1604}; 1605};
1605MODULE_DEVICE_TABLE(of, tegra_sor_of_match); 1606MODULE_DEVICE_TABLE(of, tegra_sor_of_match);