OMAPDSS: HDMI: rename resource names

The HDMI driver tries to get the needed memory resources by name and by
ID. Resources by name are not currently defined, and will be used with
DT boot.

The resource names used in the driver are not quite perfect, and as they
are not used yet, we can change them. This patch removes the unneeded
"hdmi_" prefix from the names, and simplifies the names (e.g. hdmi_txphy
-> phy).

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/hdmi4_core.c b/drivers/video/omap2/dss/hdmi4_core.c
index 2386a3d..2eb04dc 100644 (file)
--- a/drivers/video/omap2/dss/hdmi4_core.c
+++ b/drivers/video/omap2/dss/hdmi4_core.c
@@ -1006,7 +1006,7 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
        struct resource *res;
        struct resource temp_res;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi_core");
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
        if (!res) {
                DSSDBG("can't get CORE mem resource by name\n");
                /*

diff --git a/drivers/video/omap2/dss/hdmi_phy.c b/drivers/video/omap2/dss/hdmi_phy.c
index 45acb99..dd376ce 100644 (file)
--- a/drivers/video/omap2/dss/hdmi_phy.c
+++ b/drivers/video/omap2/dss/hdmi_phy.c
@@ -124,7 +124,7 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
        struct resource *res;
        struct resource temp_res;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi_txphy");
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
        if (!res) {
                DSSDBG("can't get PHY mem resource by name\n");
                /*

diff --git a/drivers/video/omap2/dss/hdmi_pll.c b/drivers/video/omap2/dss/hdmi_pll.c
index a06f4ee..5fc7121 100644 (file)
--- a/drivers/video/omap2/dss/hdmi_pll.c
+++ b/drivers/video/omap2/dss/hdmi_pll.c
@@ -202,7 +202,7 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll)
        struct resource *res;
        struct resource temp_res;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi_pllctrl");
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll");
        if (!res) {
                DSSDBG("can't get PLL mem resource by name\n");
                /*

diff --git a/drivers/video/omap2/dss/hdmi_wp.c b/drivers/video/omap2/dss/hdmi_wp.c
index 209a06e..cd620c6 100644 (file)
--- a/drivers/video/omap2/dss/hdmi_wp.c
+++ b/drivers/video/omap2/dss/hdmi_wp.c
@@ -243,7 +243,7 @@ int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp)
        struct resource *res;
        struct resource temp_res;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi_wp");
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wp");
        if (!res) {
                DSSDBG("can't get WP mem resource by name\n");
                /*