exynos: video: Drop old unused code

Now that we are using driver model, we can drop the weak functions and LCD
init in the board file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c
index 0dcea715613945587867409ac21505c2c26584f9..2e3b16df45d46c2f93db02529e140d6b5fd0f62c 100644 (file)
--- a/board/samsung/common/exynos5-dt.c
+++ b/board/samsung/common/exynos5-dt.c
@@ -147,159 +147,6 @@ int board_get_revision(void)
        return 0;
 }
 
-#ifdef CONFIG_LCD
-
-static int board_dp_bridge_init(struct udevice *dev)
-{
-       const int max_tries = 10;
-       int num_tries;
-       int ret;
-
-       debug("%s\n", __func__);
-       ret = video_bridge_attach(dev);
-       if (ret) {
-               debug("video bridge init failed: %d\n", ret);
-               return ret;
-       }
-
-       /*
-        * We need to wait for 90ms after bringing up the bridge since there
-        * is a phantom "high" on the HPD chip during its bootup.  The phantom
-        * high comes within 7ms of de-asserting PD and persists for at least
-        * 15ms.  The real high comes roughly 50ms after PD is de-asserted. The
-        * phantom high makes it hard for us to know when the NXP chip is up.
-        */
-       mdelay(90);
-
-       for (num_tries = 0; num_tries < max_tries; num_tries++) {
-               /* Check HPD. If it's high, or we don't have it, all is well */
-               ret = video_bridge_check_attached(dev);
-               if (!ret || ret == -ENOENT)
-                       return 0;
-
-               debug("%s: eDP bridge failed to come up; try %d of %d\n",
-                     __func__, num_tries, max_tries);
-       }
-
-       /* Immediately go into bridge reset if the hp line is not high */
-       return -EIO;
-}
-
-static int board_dp_bridge_setup(const void *blob)
-{
-       const int max_tries = 2;
-       int num_tries;
-       struct udevice *dev;
-       int ret;
-
-       /* Configure I2C registers for Parade bridge */
-       ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &dev);
-       if (ret) {
-               debug("video bridge init failed: %d\n", ret);
-               return ret;
-       }
-
-       if (strncmp(dev->driver->name, "parade", 6)) {
-               /* Mux HPHPD to the special hotplug detect mode */
-               exynos_pinmux_config(PERIPH_ID_DPHPD, 0);
-       }
-
-       for (num_tries = 0; num_tries < max_tries; num_tries++) {
-               ret = board_dp_bridge_init(dev);
-               if (!ret)
-                       return 0;
-               if (num_tries == max_tries - 1)
-                       break;
-
-               /*
-               * If we're here, the bridge chip failed to initialise.
-               * Power down the bridge in an attempt to reset.
-               */
-               video_bridge_set_active(dev, false);
-
-               /*
-               * Arbitrarily wait 300ms here with DP_N low.  Don't know for
-               * sure how long we should wait, but we're being paranoid.
-               */
-               mdelay(300);
-       }
-
-       return ret;
-}
-
-void exynos_cfg_lcd_gpio(void)
-{
-       /* For Backlight */
-       gpio_request(EXYNOS5_GPIO_B20, "lcd_backlight");
-       gpio_cfg_pin(EXYNOS5_GPIO_B20, S5P_GPIO_OUTPUT);
-       gpio_set_value(EXYNOS5_GPIO_B20, 1);
-}
-
-static int board_dp_set_backlight(int percent)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device(UCLASS_VIDEO_BRIDGE, 0, &dev);
-       if (!ret)
-               ret = video_bridge_set_backlight(dev, percent);
-
-       return ret;
-}
-
-void exynos_backlight_on(unsigned int on)
-{
-       struct udevice *dev;
-       int ret;
-
-       debug("%s(%u)\n", __func__, on);
-       if (!on)
-               return;
-
-       ret = regulator_get_by_platname("vcd_led", &dev);
-       if (!ret)
-               ret = regulator_set_enable(dev, true);
-       if (ret)
-               debug("Failed to enable backlight: ret=%d\n", ret);
-
-       /* T5 in the LCD timing spec (defined as > 10ms) */
-       mdelay(10);
-
-       /* board_dp_backlight_pwm */
-       gpio_direction_output(EXYNOS5_GPIO_B20, 1);
-
-       /* T6 in the LCD timing spec (defined as > 10ms) */
-       mdelay(10);
-
-       /* try to set the backlight in the bridge registers */
-       ret = board_dp_set_backlight(80);
-
-       /* if we have no bridge or it does not support backlight, use a GPIO */
-       if (ret == -ENODEV || ret == -ENOSYS) {
-               gpio_request(EXYNOS5_GPIO_X30, "board_dp_backlight_en");
-               gpio_direction_output(EXYNOS5_GPIO_X30, 1);
-       }
-}
-
-void exynos_lcd_power_on(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       debug("%s\n", __func__);
-       ret = regulator_get_by_platname("lcd_vdd", &dev);
-       if (!ret)
-               ret = regulator_set_enable(dev, true);
-       if (ret)
-               debug("Failed to enable LCD panel: ret=%d\n", ret);
-
-       ret = board_dp_bridge_setup(gd->fdt_blob);
-       if (ret && ret != -ENODEV)
-               printf("LCD bridge failed to enable: %d\n", ret);
-}
-
-#endif
-
 #ifdef CONFIG_USB_DWC3
 static struct dwc3_device dwc3_device_data = {
        .maximum_speed = USB_SPEED_SUPER,

diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c
index c8fef63937f36ba76e7e356594b7acbb0b8ee0fa..97228cd3cc3b27ffff1c795d6245de5bb3f7616c 100644 (file)
--- a/drivers/video/exynos/exynos_fb.c
+++ b/drivers/video/exynos/exynos_fb.c
@@ -479,39 +479,6 @@ unsigned long exynos_fimd_calc_fbsize(struct exynos_fb_priv *priv)
        return priv->vl_col * priv->vl_row * (VNBITS(priv->vl_bpix) / 8);
 }
 
-__weak void exynos_cfg_lcd_gpio(void)
-{
-}
-
-__weak void exynos_backlight_on(unsigned int onoff)
-{
-}
-
-__weak void exynos_reset_lcd(void)
-{
-}
-
-__weak void exynos_lcd_power_on(void)
-{
-}
-
-__weak void exynos_cfg_ldo(void)
-{
-}
-
-__weak void exynos_enable_ldo(unsigned int onoff)
-{
-}
-
-__weak void exynos_backlight_reset(void)
-{
-}
-
-__weak int exynos_lcd_misc_init(struct vidinfo *vid)
-{
-       return 0;
-}
-
 int exynos_fb_ofdata_to_platdata(struct udevice *dev)
 {
        struct exynos_fb_priv *priv = dev_get_priv(dev);

diff --git a/drivers/video/exynos/exynos_fb.h b/drivers/video/exynos/exynos_fb.h
deleted file mode 100644 (file)
index f59cce0..0000000
--- a/drivers/video/exynos/exynos_fb.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics
- *
- * Author: InKi Dae <inki.dae@samsung.com>
- * Author: Donghwa Lee <dh09.lee@samsung.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _EXYNOS_FB_H_
-#define _EXYNOS_FB_H_
-
-#include <asm/arch/fb.h>
-
-#define MAX_CLOCK      (86 * 1000000)
-
-enum exynos_cpu_auto_cmd_rate {
-       DISABLE_AUTO_FRM,
-       PER_TWO_FRM,
-       PER_FOUR_FRM,
-       PER_SIX_FRM,
-       PER_EIGHT_FRM,
-       PER_TEN_FRM,
-       PER_TWELVE_FRM,
-       PER_FOURTEEN_FRM,
-       PER_SIXTEEN_FRM,
-       PER_EIGHTEEN_FRM,
-       PER_TWENTY_FRM,
-       PER_TWENTY_TWO_FRM,
-       PER_TWENTY_FOUR_FRM,
-       PER_TWENTY_SIX_FRM,
-       PER_TWENTY_EIGHT_FRM,
-       PER_THIRTY_FRM,
-};
-
-void exynos_fimd_lcd_init_mem(unsigned long screen_base, unsigned long fb_size,
-       unsigned long palette_size);
-void exynos_fimd_lcd_init(struct vidinfo *vid, ulong lcd_base_address);
-unsigned long exynos_fimd_calc_fbsize(struct vidinfo *pvid);
-
-#endif