ARM: tegra12: enable DT support for host1x

- make board file changes to enable DT support for host1x
- rename duplicate ISP clock name to tegra_isp.0
  since with DT, device name becomes isp.0 now

bug 1366383

Change-Id: I3b8f08c8c52035dfcd019126774c9d1569499d8c
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/299483
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-ardbeg-panel.c b/arch/arm/mach-tegra/board-ardbeg-panel.c
index d96f15a183428ace585e7d06e87aadf601191e2f..c2fbebbe018dd1a1ae6781c8f7452ffb55b12875 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg-panel.c
+++ b/arch/arm/mach-tegra/board-ardbeg-panel.c
@@ -48,7 +48,11 @@ struct platform_device * __init ardbeg_host1x_init(void)
        struct platform_device *pdev = NULL;
 
 #ifdef CONFIG_TEGRA_GRHOST
-       pdev = tegra12_register_host1x_devices();
+       if (!of_have_populated_dt())
+               pdev = tegra12_register_host1x_devices();
+       else
+               pdev = to_platform_device(bus_find_device_by_name(
+                       &platform_bus_type, NULL, "host1x"));
 
        if (!pdev) {
                pr_err("host1x devices registration failed\n");

diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 7616485fc1e630c55358fb77774557dfeb3322e9..00de52e3167992127c7fce2b4eeed79c16c6b2cb 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -918,7 +918,8 @@ static struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra124-msenc", TEGRA_MSENC_BASE, "msenc",
                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-vi", TEGRA_VI_BASE, "vi", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp.0", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISPB_BASE, "isp.1", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006000, "serial-tegra.0",
                                NULL),

diff --git a/arch/arm/mach-tegra/board-bonaire-panel.c b/arch/arm/mach-tegra/board-bonaire-panel.c
index 712c1417fc36cea95df53576d80fa02e2f4be7fd..4a3f04a430ede9e09b1aca261b88389991118486 100644 (file)
--- a/arch/arm/mach-tegra/board-bonaire-panel.c
+++ b/arch/arm/mach-tegra/board-bonaire-panel.c
@@ -61,16 +61,16 @@ struct platform_device * __init bonaire_host1x_init(void)
        struct platform_device *pdev = NULL;
 
 #ifdef CONFIG_TEGRA_GRHOST
-       /* FIXME: remove this #if 0 and below line when DT will be enabled for
-       * bonaire */
-#if 0
        if (!of_have_populated_dt())
                pdev = tegra12_register_host1x_devices();
        else
                pdev = to_platform_device(bus_find_device_by_name(
                        &platform_bus_type, NULL, "host1x"));
-#endif
-       pdev = tegra12_register_host1x_devices();
+
+       if (!pdev) {
+               pr_err("host1x devices registration failed\n");
+               return NULL;
+       }
 #endif
        return pdev;
 }

diff --git a/arch/arm/mach-tegra/board-bonaire.c b/arch/arm/mach-tegra/board-bonaire.c
index ee50e445bcdb7020bda9fa9bfe4c2321b09c8612..0a7929cce80f7a838809dfdb89deabe10618b158 100644 (file)
--- a/arch/arm/mach-tegra/board-bonaire.c
+++ b/arch/arm/mach-tegra/board-bonaire.c
@@ -614,7 +614,8 @@ struct of_dev_auxdata tegra_bonaire_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra124-msenc", TEGRA_MSENC_BASE, "msenc",
                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-vi", TEGRA_VI_BASE, "vi", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp.0", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISPB_BASE, "isp.1", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
        {}
 };

diff --git a/arch/arm/mach-tegra/board-loki-panel.c b/arch/arm/mach-tegra/board-loki-panel.c
index 56693aad05490c63777cee38db743fb2207f5b33..59361d71a83f7c3dd4c48d029588d171e4b629de 100644 (file)
--- a/arch/arm/mach-tegra/board-loki-panel.c
+++ b/arch/arm/mach-tegra/board-loki-panel.c
@@ -45,7 +45,11 @@ struct platform_device * __init loki_host1x_init(void)
        struct platform_device *pdev = NULL;
 
 #ifdef CONFIG_TEGRA_GRHOST
-       pdev = tegra12_register_host1x_devices();
+       if (!of_have_populated_dt())
+               pdev = tegra12_register_host1x_devices();
+       else
+               pdev = to_platform_device(bus_find_device_by_name(
+                       &platform_bus_type, NULL, "host1x"));
 
        if (!pdev) {
                pr_err("host1x devices registration failed\n");

diff --git a/arch/arm/mach-tegra/board-loki.c b/arch/arm/mach-tegra/board-loki.c
index d304218df82cc6548235a7f1c288a7d1b77b61e1..16c0e19b878f23952a66f71a7657d724d8a9b9e0 100644 (file)
--- a/arch/arm/mach-tegra/board-loki.c
+++ b/arch/arm/mach-tegra/board-loki.c
@@ -706,7 +706,8 @@ struct of_dev_auxdata loki_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra124-msenc", TEGRA_MSENC_BASE, "msenc",
                NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-vi", TEGRA_VI_BASE, "vi", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp.0", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISPB_BASE, "isp.1", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006000, "serial-tegra.0",
                                NULL),

diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c
index 01071e7a7c43e7f522641a4e668a492aa8727034..ad2b88b8674ef81e921ec5aedfc44ed6f2e2ec0f 100644 (file)
--- a/arch/arm/mach-tegra/tegra12_clocks.c
+++ b/arch/arm/mach-tegra/tegra12_clocks.c
@@ -8213,7 +8213,7 @@ struct clk_duplicate tegra_clk_duplicates[] = {
        CLK_DUPLICATE("gpu_ref", "tegra_gk20a", "PLLG_ref"),
        CLK_DUPLICATE("gbus", "tegra_gk20a", "PLLG_out"),
        CLK_DUPLICATE("pll_p_out5", "tegra_gk20a", "pwr"),
-       CLK_DUPLICATE("ispa.isp.c4bus", "tegra_isp", "isp"),
+       CLK_DUPLICATE("ispa.isp.c4bus", "tegra_isp.0", "isp"),
        CLK_DUPLICATE("ispb.isp.c4bus", "tegra_isp.1", "isp"),
        CLK_DUPLICATE("via.vi.c4bus", "tegra_vi", "vi"),
        CLK_DUPLICATE("vib.vi.c4bus", "tegra_vi.1", "vi"),