video: tegra20: dc: remove hardcoded Tegra 2 specific parts

Since pinmux driver now is available for Tegra 2, these parts may
be removed from here and defined either in device tree or in
the device board files.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/include/asm/arch-tegra20/clock-tables.h b/arch/arm/include/asm/arch-tegra20/clock-tables.h
index 861b3d5..8268535 100644 (file)
--- a/arch/arm/include/asm/arch-tegra20/clock-tables.h
+++ b/arch/arm/include/asm/arch-tegra20/clock-tables.h
@@ -32,6 +32,7 @@ enum clock_id {
 
        CLOCK_ID_COUNT, /* number of clocks */
        CLOCK_ID_NONE = -1,
+       CLOCK_ID_DISPLAY2 = CLOCK_ID_NONE, /* for compatibility */
 };
 
 /* The clocks supported by the hardware */
@@ -159,6 +160,7 @@ enum periph_id {
 
        PERIPH_ID_COUNT,
        PERIPH_ID_NONE = -1,
+       PERIPH_ID_DSIB = CLOCK_ID_NONE, /* for compatibility */
 };
 
 enum pll_out_id {

diff --git a/drivers/video/tegra20/tegra-dc.c b/drivers/video/tegra20/tegra-dc.c
index bd0d8ca..d54279e 100644 (file)
--- a/drivers/video/tegra20/tegra-dc.c
+++ b/drivers/video/tegra20/tegra-dc.c
@@ -311,15 +311,10 @@ static int tegra_display_probe(struct tegra_lcd_priv *priv,
         * We halve the rate if DISP1 parent is PLLD, since actual parent
         * is plld_out0 which is PLLD divided by 2.
         */
-       if (priv->clk_parent->id == CLOCK_ID_DISPLAY)
+       if (priv->clk_parent->id == CLOCK_ID_DISPLAY ||
+           priv->clk_parent->id == CLOCK_ID_DISPLAY2)
                rate /= 2;
 
-#ifndef CONFIG_TEGRA20
-       /* PLLD2 obeys same rules as PLLD but it is present only on T30+ */
-       if (priv->clk_parent->id == CLOCK_ID_DISPLAY2)
-               rate /= 2;
-#endif
-
        /*
         * The pixel clock divider is in 7.1 format (where the bottom bit
         * represents 0.5). Here we calculate the divider needed to get from
@@ -366,10 +361,6 @@ static int tegra_lcd_probe(struct udevice *dev)
        int ret;
 
        /* Initialize the Tegra display controller */
-#ifdef CONFIG_TEGRA20
-       funcmux_select(PERIPH_ID_DISP1, FUNCMUX_DEFAULT);
-#endif
-
        if (priv->soc->has_pgate) {
                uint powergate;
 
@@ -409,11 +400,6 @@ static int tegra_lcd_probe(struct udevice *dev)
                return -1;
        }
 
-#ifdef CONFIG_TEGRA20
-       pinmux_set_func(PMUX_PINGRP_GPU, PMUX_FUNC_PWM);
-       pinmux_tristate_disable(PMUX_PINGRP_GPU);
-#endif
-
        ret = panel_enable_backlight(priv->panel);
        if (ret) {
                debug("%s: Cannot enable backlight, ret=%d\n", __func__, ret);