[PATCH 03/14] video: siemens: Drop unused video code
Simon Glass
sjg at chromium.org
Sun Jan 23 15:04:04 CET 2022
Drop this old code which is not built anymore, as it depends on
CONFIG_VIDEO which has been removed.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
board/siemens/common/board.c | 3 -
board/siemens/common/factoryset.c | 7 -
board/siemens/common/factoryset.h | 3 -
board/siemens/pxm2/board.c | 189 -----------------------
board/siemens/rut/board.c | 247 ------------------------------
5 files changed, 449 deletions(-)
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 56283660d37..85025f20efa 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -96,9 +96,6 @@ int board_init(void)
#ifdef CONFIG_NAND_CS_INIT
board_nand_cs_init();
#endif
-#ifdef CONFIG_VIDEO
- board_video_init();
-#endif
return 0;
}
diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index fba678b4260..4e36a6f3199 100644
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -275,13 +275,6 @@ int factoryset_read_eeprom(int i2c_addr)
}
printf("DFU USB: VID = 0x%4x, PID = 0x%4x\n", factory_dat.usb_vendor_id,
factory_dat.usb_product_id);
-#endif
-#if defined(CONFIG_VIDEO)
- if (0 <= get_factory_record_val(cp, size, (uchar *)"DISP1",
- (uchar *)"name", factory_dat.disp_name,
- MAX_STRING_LENGTH)) {
- debug("display name: %s\n", factory_dat.disp_name);
- }
#endif
if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV",
(uchar *)"num", factory_dat.serial,
diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/factoryset.h
index 261a2176879..8fa6c3b3d3b 100644
--- a/board/siemens/common/factoryset.h
+++ b/board/siemens/common/factoryset.h
@@ -17,9 +17,6 @@ struct factorysetcontainer {
int usb_vendor_id;
int usb_product_id;
int pxm50;
-#if defined(CONFIG_VIDEO)
- unsigned char disp_name[MAX_STRING_LENGTH];
-#endif
unsigned char serial[MAX_STRING_LENGTH];
int version;
uchar asn[MAX_STRING_LENGTH];
diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index de52838d771..47f19bcb8fd 100644
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -28,7 +28,6 @@
#include <asm/arch/gpio.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/sys_proto.h>
-#include "../../../drivers/video/da8xx-fb.h"
#include <asm/io.h>
#include <asm/emif.h>
#include <asm/gpio.h>
@@ -243,194 +242,6 @@ int board_eth_init(struct bd_info *bis)
}
#endif /* #if defined(CONFIG_DRIVER_TI_CPSW) */
-#if defined(CONFIG_VIDEO) && !defined(CONFIG_SPL_BUILD)
-static struct da8xx_panel lcd_panels[] = {
- /* AUO G156XW01 V1 */
- [0] = {
- .name = "AUO_G156XW01_V1",
- .width = 1376,
- .height = 768,
- .hfp = 14,
- .hbp = 64,
- .hsw = 56,
- .vfp = 1,
- .vbp = 28,
- .vsw = 3,
- .pxl_clk = 60000000,
- .invert_pxl_clk = 0,
- },
- /* AUO B101EVN06 V0 */
- [1] = {
- .name = "AUO_B101EVN06_V0",
- .width = 1280,
- .height = 800,
- .hfp = 52,
- .hbp = 84,
- .hsw = 36,
- .vfp = 3,
- .vbp = 14,
- .vsw = 6,
- .pxl_clk = 60000000,
- .invert_pxl_clk = 0,
- },
- /*
- * Settings from factoryset
- * stored in EEPROM
- */
- [2] = {
- .name = "factoryset",
- .width = 0,
- .height = 0,
- .hfp = 0,
- .hbp = 0,
- .hsw = 0,
- .vfp = 0,
- .vbp = 0,
- .vsw = 0,
- .pxl_clk = 60000000,
- .invert_pxl_clk = 0,
- },
-};
-
-static const struct display_panel disp_panel = {
- WVGA,
- 32,
- 16,
- COLOR_ACTIVE,
-};
-
-static const struct lcd_ctrl_config lcd_cfg = {
- &disp_panel,
- .ac_bias = 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
- .bpp = 32,
- .fdd = 0x80,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
-};
-
-static int set_gpio(int gpio, int state)
-{
- gpio_request(gpio, "temp");
- gpio_direction_output(gpio, state);
- gpio_set_value(gpio, state);
- gpio_free(gpio);
- return 0;
-}
-
-static int enable_backlight(void)
-{
- set_gpio(BOARD_LCD_POWER, 1);
- set_gpio(BOARD_BACK_LIGHT, 1);
- set_gpio(BOARD_TOUCH_POWER, 1);
- return 0;
-}
-
-static int enable_pwm(void)
-{
- struct pwmss_regs *pwmss = (struct pwmss_regs *)PWMSS0_BASE;
- struct pwmss_ecap_regs *ecap;
- int ticks = PWM_TICKS;
- int duty = PWM_DUTY;
-
- ecap = (struct pwmss_ecap_regs *)AM33XX_ECAP0_BASE;
- /* enable clock */
- setbits_le32(&pwmss->clkconfig, ECAP_CLK_EN);
- /* TimeStam Counter register */
- writel(0xdb9, &ecap->tsctr);
- /* config period */
- writel(ticks - 1, &ecap->cap3);
- writel(ticks - 1, &ecap->cap1);
- setbits_le16(&ecap->ecctl2,
- (ECTRL2_MDSL_ECAP | ECTRL2_SYNCOSEL_MASK | 0xd0));
- /* config duty */
- writel(duty, &ecap->cap2);
- writel(duty, &ecap->cap4);
- /* start */
- setbits_le16(&ecap->ecctl2, ECTRL2_CTRSTP_FREERUN);
- return 0;
-}
-
-static struct dpll_regs dpll_lcd_regs = {
- .cm_clkmode_dpll = CM_WKUP + 0x98,
- .cm_idlest_dpll = CM_WKUP + 0x48,
- .cm_clksel_dpll = CM_WKUP + 0x54,
-};
-
-/* no console on this board */
-int board_cfb_skip(void)
-{
- return 1;
-}
-
-#define PLL_GET_M(v) ((v >> 8) & 0x7ff)
-#define PLL_GET_N(v) (v & 0x7f)
-
-static int get_clk(struct dpll_regs *dpll_regs)
-{
- unsigned int val;
- unsigned int m, n;
- int f = 0;
-
- val = readl(dpll_regs->cm_clksel_dpll);
- m = PLL_GET_M(val);
- n = PLL_GET_N(val);
- f = (m * V_OSCK) / n;
-
- return f;
-};
-
-int clk_get(int clk)
-{
- return get_clk(&dpll_lcd_regs);
-};
-
-static int conf_disp_pll(int m, int n)
-{
- struct cm_perpll *cmper = (struct cm_perpll *)CM_PER;
- struct cm_dpll *cmdpll = (struct cm_dpll *)CM_DPLL;
- struct dpll_params dpll_lcd = {m, n, -1, -1, -1, -1, -1};
-
- u32 *const clk_domains[] = {
- &cmper->lcdclkctrl,
- 0
- };
- u32 *const clk_modules_explicit_en[] = {
- &cmper->lcdclkctrl,
- &cmper->lcdcclkstctrl,
- &cmper->epwmss0clkctrl,
- 0
- };
- do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
- writel(0x0, &cmdpll->clklcdcpixelclk);
-
- do_setup_dpll(&dpll_lcd_regs, &dpll_lcd);
-
- return 0;
-}
-
-static int board_video_init(void)
-{
- conf_disp_pll(24, 1);
- if (factory_dat.pxm50)
- da8xx_video_init(&lcd_panels[0], &lcd_cfg, lcd_cfg.bpp);
- else
- da8xx_video_init(&lcd_panels[1], &lcd_cfg, lcd_cfg.bpp);
-
- enable_pwm();
- enable_backlight();
-
- return 0;
-}
-#endif
-
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c
index e0f232d3b80..a8b196a65c9 100644
--- a/board/siemens/rut/board.c
+++ b/board/siemens/rut/board.c
@@ -37,7 +37,6 @@
#include <linux/delay.h>
#include "board.h"
#include "../common/factoryset.h"
-#include "../../../drivers/video/da8xx-fb.h"
/*
* Read header information from EEPROM into global structure.
@@ -224,252 +223,6 @@ void hw_watchdog_init(void)
}
#endif /* defined(CONFIG_HW_WATCHDOG) */
-#if defined(CONFIG_VIDEO) && !defined(CONFIG_SPL_BUILD)
-static struct da8xx_panel lcd_panels[] = {
- /* FORMIKE, 4.3", 480x800, KWH043MC17-F01 */
- [0] = {
- .name = "KWH043MC17-F01",
- .width = 480,
- .height = 800,
- .hfp = 50, /* no spec, "don't care" values */
- .hbp = 50,
- .hsw = 50,
- .vfp = 50,
- .vbp = 50,
- .vsw = 50,
- .pxl_clk = 35910000, /* tCYCD=20ns, max 50MHz, 60fps */
- .invert_pxl_clk = 1,
- },
- /* FORMIKE, 4.3", 480x800, KWH043ST20-F01 */
- [1] = {
- .name = "KWH043ST20-F01",
- .width = 480,
- .height = 800,
- .hfp = 50, /* no spec, "don't care" values */
- .hbp = 50,
- .hsw = 50,
- .vfp = 50,
- .vbp = 50,
- .vsw = 50,
- .pxl_clk = 35910000, /* tCYCD=20ns, max 50MHz, 60fps */
- .invert_pxl_clk = 1,
- },
- /* Multi-Inno, 4.3", 480x800, MI0430VT-1 */
- [2] = {
- .name = "MI0430VT-1",
- .width = 480,
- .height = 800,
- .hfp = 50, /* no spec, "don't care" values */
- .hbp = 50,
- .hsw = 50,
- .vfp = 50,
- .vbp = 50,
- .vsw = 50,
- .pxl_clk = 35910000, /* tCYCD=20ns, max 50MHz, 60fps */
- .invert_pxl_clk = 1,
- },
-};
-
-static const struct display_panel disp_panels[] = {
- [0] = {
- WVGA,
- 16, /* RGB 888 */
- 16,
- COLOR_ACTIVE,
- },
- [1] = {
- WVGA,
- 16, /* RGB 888 */
- 16,
- COLOR_ACTIVE,
- },
- [2] = {
- WVGA,
- 24, /* RGB 888 */
- 16,
- COLOR_ACTIVE,
- },
-};
-
-static const struct lcd_ctrl_config lcd_cfgs[] = {
- [0] = {
- &disp_panels[0],
- .ac_bias = 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
- .bpp = 16,
- .fdd = 0x80,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
- },
- [1] = {
- &disp_panels[1],
- .ac_bias = 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
- .bpp = 16,
- .fdd = 0x80,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
- },
- [2] = {
- &disp_panels[2],
- .ac_bias = 255,
- .ac_bias_intrpt = 0,
- .dma_burst_sz = 16,
- .bpp = 24,
- .fdd = 0x80,
- .tft_alt_mode = 0,
- .stn_565_mode = 0,
- .mono_8bit_mode = 0,
- .invert_line_clock = 1,
- .invert_frm_clock = 1,
- .sync_edge = 0,
- .sync_ctrl = 1,
- .raster_order = 0,
- },
-
-};
-
-/* no console on this board */
-int board_cfb_skip(void)
-{
- return 1;
-}
-
-#define PLL_GET_M(v) ((v >> 8) & 0x7ff)
-#define PLL_GET_N(v) (v & 0x7f)
-
-static struct dpll_regs dpll_lcd_regs = {
- .cm_clkmode_dpll = CM_WKUP + 0x98,
- .cm_idlest_dpll = CM_WKUP + 0x48,
- .cm_clksel_dpll = CM_WKUP + 0x54,
-};
-
-static int get_clk(struct dpll_regs *dpll_regs)
-{
- unsigned int val;
- unsigned int m, n;
- int f = 0;
-
- val = readl(dpll_regs->cm_clksel_dpll);
- m = PLL_GET_M(val);
- n = PLL_GET_N(val);
- f = (m * V_OSCK) / n;
-
- return f;
-};
-
-int clk_get(int clk)
-{
- return get_clk(&dpll_lcd_regs);
-};
-
-static int conf_disp_pll(int m, int n)
-{
- struct cm_perpll *cmper = (struct cm_perpll *)CM_PER;
- struct dpll_params dpll_lcd = {m, n, -1, -1, -1, -1, -1};
-#if defined(DISPL_PLL_SPREAD_SPECTRUM)
- struct cm_wkuppll *cmwkup = (struct cm_wkuppll *)CM_WKUP;
-#endif
-
- u32 *const clk_domains[] = {
- &cmper->lcdclkctrl,
- 0
- };
- u32 *const clk_modules_explicit_en[] = {
- &cmper->lcdclkctrl,
- &cmper->lcdcclkstctrl,
- &cmper->spi1clkctrl,
- 0
- };
- do_enable_clocks(clk_domains, clk_modules_explicit_en, 1);
-
- do_setup_dpll(&dpll_lcd_regs, &dpll_lcd);
-
-#if defined(DISPL_PLL_SPREAD_SPECTRUM)
- writel(0x64, &cmwkup->resv6[3]); /* 0x50 */
- writel(0x800, &cmwkup->resv6[2]); /* 0x4c */
- writel(readl(&cmwkup->clkmoddplldisp) | CM_CLKMODE_DPLL_SSC_EN_MASK,
- &cmwkup->clkmoddplldisp); /* 0x98 */
-#endif
- return 0;
-}
-
-static int set_gpio(int gpio, int state)
-{
- gpio_request(gpio, "temp");
- gpio_direction_output(gpio, state);
- gpio_set_value(gpio, state);
- gpio_free(gpio);
- return 0;
-}
-
-static int enable_lcd(void)
-{
- unsigned char buf[1];
-
- set_gpio(BOARD_LCD_RESET, 0);
- mdelay(1);
- set_gpio(BOARD_LCD_RESET, 1);
- mdelay(1);
-
- /* spi lcd init */
- kwh043st20_f01_spi_startup(1, 0, 5000000, SPI_MODE_0);
-
- /* backlight on */
- buf[0] = 0xf;
- i2c_write(0x24, 0x7, 1, buf, 1);
- buf[0] = 0x3f;
- i2c_write(0x24, 0x8, 1, buf, 1);
- return 0;
-}
-
-int arch_early_init_r(void)
-{
- enable_lcd();
- return 0;
-}
-
-static int board_video_init(void)
-{
- int i;
- int anzdisp = ARRAY_SIZE(lcd_panels);
- int display = 1;
-
- for (i = 0; i < anzdisp; i++) {
- if (strncmp((const char *)factory_dat.disp_name,
- lcd_panels[i].name,
- strlen((const char *)factory_dat.disp_name)) == 0) {
- printf("DISPLAY: %s\n", factory_dat.disp_name);
- break;
- }
- }
- if (i == anzdisp) {
- i = 1;
- printf("%s: %s not found, using default %s\n", __func__,
- factory_dat.disp_name, lcd_panels[i].name);
- }
- conf_disp_pll(24, 1);
- da8xx_video_init(&lcd_panels[display], &lcd_cfgs[display],
- lcd_cfgs[display].bpp);
-
- return 0;
-}
-#endif /* ifdef CONFIG_VIDEO */
-
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
--
2.35.0.rc0.227.g00780c9af4-goog
More information about the U-Boot
mailing list