diff options
author | Deepak Bhosale <dbhosale@nvidia.com> | 2017-11-29 20:42:59 -0500 |
---|---|---|
committer | Adeel Raza <araza@nvidia.com> | 2017-12-05 12:13:15 -0500 |
commit | 9351adc8e8ceef80b5b8668f308e6db9bbcb7d90 (patch) | |
tree | 6d5630ed0c03164d8b97f4383bdbcfdbe6cd5285 /drivers | |
parent | 48259df48ad79aafc44a525304b8c56c052ee331 (diff) |
video: tegra: dc: remove dc-or-node property
- bootloader has started supporting dc-connector property
- this patch removes dc-or-node optional property altogether
Change-Id: I2118247ad2a9831d9c47b3ab037447f3ba953ac2
Signed-off-by: Deepak Bhosale <dbhosale@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1607712
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ujwal Patel <ujwalp@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/tegra/dc/of_dc.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/video/tegra/dc/of_dc.c b/drivers/video/tegra/dc/of_dc.c index b7a37e327..f2f2db3a8 100644 --- a/drivers/video/tegra/dc/of_dc.c +++ b/drivers/video/tegra/dc/of_dc.c | |||
@@ -2912,7 +2912,6 @@ struct tegra_dc_platform_data *of_dc_parse_platform_data( | |||
2912 | int check_val; | 2912 | int check_val; |
2913 | #endif | 2913 | #endif |
2914 | const __be32 *p; | 2914 | const __be32 *p; |
2915 | const char *dc_or_node = NULL; | ||
2916 | struct tegra_dc_platform_data *pdata; | 2915 | struct tegra_dc_platform_data *pdata; |
2917 | struct device_node *np = ndev->dev.of_node; | 2916 | struct device_node *np = ndev->dev.of_node; |
2918 | struct device_node *timings_np = NULL; | 2917 | struct device_node *timings_np = NULL; |
@@ -2995,24 +2994,6 @@ struct tegra_dc_platform_data *of_dc_parse_platform_data( | |||
2995 | } | 2994 | } |
2996 | } else { | 2995 | } else { |
2997 | pdata->conn_np = of_parse_phandle(np, "nvidia,dc-connector", 0); | 2996 | pdata->conn_np = of_parse_phandle(np, "nvidia,dc-connector", 0); |
2998 | /* | ||
2999 | * Note: boot-loader still uses "nvidia,dc-or-node" property. | ||
3000 | * But that property is not mandatory for kernel. | ||
3001 | * Kernel driver finds panel using phandle via | ||
3002 | * "nvidia,dc-connector". However both should point to | ||
3003 | * same node. | ||
3004 | */ | ||
3005 | err = of_property_read_string(np, "nvidia,dc-or-node", | ||
3006 | &dc_or_node); | ||
3007 | if (err) { | ||
3008 | dev_err(&ndev->dev, "optional:nvidia,dc-or-node not defined\n"); | ||
3009 | } else { | ||
3010 | if (strcmp(of_node_full_name(pdata->conn_np), | ||
3011 | dc_or_node)) | ||
3012 | dev_err(&ndev->dev, "%s: does not match %s\n", | ||
3013 | of_node_full_name(pdata->conn_np), | ||
3014 | dc_or_node); | ||
3015 | } | ||
3016 | } | 2997 | } |
3017 | 2998 | ||
3018 | if (IS_ERR_OR_NULL(pdata->conn_np)) { | 2999 | if (IS_ERR_OR_NULL(pdata->conn_np)) { |