diff options
author | David Hendricks <dhendrix@chromium.org> | 2013-03-26 04:25:46 +0100 |
---|---|---|
committer | David Hendricks <dhendrix@chromium.org> | 2013-03-26 04:39:53 +0100 |
commit | 0175587c5ea1db0ef76b3000db027e353b383de9 (patch) | |
tree | a31ebe07ca31bcb28cc8dff3384d30c9239678a7 /src/cpu/samsung/exynos5250/cpu.c | |
parent | 7f86c0586add7836b8c44805b6ef9eaa59fac787 (diff) | |
download | coreboot-0175587c5ea1db0ef76b3000db027e353b383de9.tar.xz |
Revert "samsung/exynos5: add resource functions for the display port"
This reverts commit 9427ca151e44644238b1b52138894195a9f5175f
Looks like we were a bit too anxious to see this one get in. The devicetree.cb change seems to have broken things.
coreboot memory table:
0. 0000000050000000-000000005000ffff: RESERVED
1. 00000000bff00000-00000000bfffffff: CONFIGURATION TABLES
2. 0000014004000000-00000140044007ff: RESERVED
Before this patch:
coreboot memory table:
0. 0000000040000000-00000000bfefffff: RAM
1. 00000000bff00000-00000000bfffffff: CONFIGURATION TABLES
Change-Id: I618e4f1976265d56cfd6a61d0c5736c55a0f3cec
Reviewed-on: http://review.coreboot.org/2914
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'src/cpu/samsung/exynos5250/cpu.c')
-rw-r--r-- | src/cpu/samsung/exynos5250/cpu.c | 84 |
1 files changed, 2 insertions, 82 deletions
diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/cpu/samsung/exynos5250/cpu.c index 114d6916de..bcf4d22dbd 100644 --- a/src/cpu/samsung/exynos5250/cpu.c +++ b/src/cpu/samsung/exynos5250/cpu.c @@ -1,14 +1,5 @@ -#include <stdlib.h> -#include <string.h> -#include <stddef.h> -#include <delay.h> #include <console/console.h> -#include <arch/io.h> #include <device/device.h> -#include <cbmem.h> -#include <cpu/samsung/exynos5250/fimd.h> -#include <cpu/samsung/exynos5-common/s5p-dp-core.h> -#include "chip.h" #define RAM_BASE_KB (CONFIG_SYS_SDRAM_BASE >> 10) #define RAM_SIZE_KB (CONFIG_DRAM_SIZE_MB << 10UL) @@ -37,76 +28,8 @@ static struct device_operations domain_ops = { .scan_bus = domain_scan_bus, }; -/* we distinguish a display port device from a raw graphics device because there are - * dramatic differences in startup depending on graphics usage. To make startup fast - * and easier to understand and debug we explicitly name this common case. The alternate - * approach, involving lots of machine and callbacks, is hard to debug and verify. - */ -static void exynos_displayport_init(device_t dev) -{ - int ret; - struct cpu_samsung_exynos5250_config *conf = dev->chip_info; - /* put these on the stack. If, at some point, we want to move this code to a - * pre-ram stage, it will be much easier. - */ - vidinfo_t vi; - struct exynos5_fimd_panel panel; - u32 lcdbase; - - printk(BIOS_SPEW, "%s: dev %p, conf %p\n", __func__, dev, conf); - memset(&vi, 0, sizeof(vi)); - memset(&panel, 0, sizeof(panel)); - - panel.is_dp = 1; /* Display I/F is eDP */ - /* while it is true that we did a memset to zero, - * we leave some 'set to zero' entries here to make - * it clear what's going on. Graphics is confusing. - */ - panel.is_mipi = 0; - panel.fixvclk = 0; - panel.ivclk = 0; - panel.clkval_f = conf->clkval_f; - panel.upper_margin = conf->upper_margin; - panel.lower_margin = conf->lower_margin; - panel.vsync = conf->vsync; - panel.left_margin = conf->left_margin; - panel.right_margin = conf->right_margin; - panel.hsync = conf->hsync; - - vi.vl_col = conf->xres; - vi.vl_row = conf->yres; - vi.vl_bpix = conf->bpp; - printk(BIOS_SPEW, "lcd base is %p\n", (void *)(conf->lcdbase)); - /* The size is a magic number from hardware. */ - mmio_resource(dev, 0, conf->lcdbase/KiB, 64); - vi.cmap = (void *)conf->lcdbase; - lcdbase = conf->lcdbase + 64*KiB; - - mmio_resource(dev, 1, lcdbase, (conf->xres*conf->yres*4 + (KiB-1))/KiB); - printk(BIOS_DEBUG, "Initializing exynos VGA, base %p\n",(void *)lcdbase); - ret = lcd_ctrl_init(&vi, &panel, (void *)lcdbase); -#if 0 - ret = board_dp_lcd_vdd(blob, &wait_ms); - ret = board_dp_bridge_setup(blob, &wait_ms); - while (tries < 5) { - ret = board_dp_bridge_init(blob, &wait_ms); - ret = board_dp_hotplug(blob, &wait_ms); - if (ret) { - ret = board_dp_bridge_reset(blob, &wait_ms); - continue; - } - ret = dp_controller_init(blob, &wait_ms); - ret = board_dp_backlight_vdd(blob, &wait_ms); - ret = board_dp_backlight_pwm(blob, &wait_ms); - ret = board_dp_backlight_en(blob, &wait_ms); - } -#endif -} - static void cpu_init(device_t dev) { - printk(BIOS_SPEW, "%s\n", __func__); - exynos_displayport_init(dev); } static void cpu_noop(device_t dev) @@ -121,20 +44,17 @@ static struct device_operations cpu_ops = { .scan_bus = 0, }; -static void enable_exynos5250_dev(device_t dev) +static void enable_dev(device_t dev) { /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_DOMAIN) { - printk(BIOS_SPEW, "%s: DOMAIN\n", __func__); dev->ops = &domain_ops; } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { - printk(BIOS_SPEW, "%s: CPU_CLUSTER\n", __func__); dev->ops = &cpu_ops; } - printk(BIOS_SPEW, "%s: done\n", __func__); } struct chip_operations cpu_samsung_exynos5250_ops = { CHIP_NAME("CPU Samsung Exynos 5250") - .enable_dev = enable_exynos5250_dev, + .enable_dev = enable_dev, }; |