From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 10 Dec 2012 04:44:41 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot into resolve
X-Git-Tag: ti2013.04.02~411^2^2~4
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fglsdk-u-boot.git;a=commitdiff_plain;h=2c601c7208713ba9b2158c57adcf515f4bdbc212

Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
	README
	board/samsung/universal_c210/universal.c
	drivers/misc/Makefile
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/seaboard.h
---

2c601c7208713ba9b2158c57adcf515f4bdbc212
diff --cc board/samsung/universal_c210/universal.c
index afe3bb0ae,36a047217..3d508bea2
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@@ -30,14 -27,10 +30,14 @@@
  #include <asm/arch/adc.h>
  #include <asm/arch/gpio.h>
  #include <asm/arch/mmc.h>
 +#include <asm/arch/pinmux.h>
- #include <pmic.h>
- #include <usb/s3c_udc.h>
- #include <asm/arch/cpu.h>
- #include <max8998_pmic.h>
 +#include <asm/arch/watchdog.h>
 +#include <libtizen.h>
 +#include <ld9040.h>
+ #include <power/pmic.h>
+ #include <usb/s3c_udc.h>
+ #include <asm/arch/cpu.h>
+ #include <power/max8998_pmic.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@@ -55,7 -48,32 +55,16 @@@ static int get_hwrev(void
  	return board_rev & 0xFF;
  }
  
--static void check_hw_revision(void);
 -
 -int board_init(void)
 -{
 -	gpio1 = (struct exynos4_gpio_part1 *) EXYNOS4_GPIO_PART1_BASE;
 -	gpio2 = (struct exynos4_gpio_part2 *) EXYNOS4_GPIO_PART2_BASE;
 -
 -	gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
 -	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 -
 -	check_hw_revision();
 -	printf("HW Revision:\t0x%x\n", board_rev);
 -
 -	return 0;
 -}
 -
+ int power_init_board(void)
+ {
+ 	int ret;
+ 
+ 	ret = pmic_init(I2C_5);
+ 	if (ret)
+ 		return ret;
+ 
+ 	return 0;
+ }
  
  int dram_init(void)
  {
@@@ -264,240 -331,3 +277,236 @@@ struct s3c_plat_otg_data s5pc210_otg_da
  	.usb_flags = PHY0_SLEEP,
  };
  #endif
 +
 +int board_early_init_f(void)
 +{
 +	wdt_stop();
 +
 +	return 0;
 +}
 +
 +#ifdef CONFIG_SOFT_SPI
 +static void soft_spi_init(void)
 +{
 +	gpio_direction_output(CONFIG_SOFT_SPI_GPIO_SCLK,
 +		CONFIG_SOFT_SPI_MODE & SPI_CPOL);
 +	gpio_direction_output(CONFIG_SOFT_SPI_GPIO_MOSI, 1);
 +	gpio_direction_input(CONFIG_SOFT_SPI_GPIO_MISO);
 +	gpio_direction_output(CONFIG_SOFT_SPI_GPIO_CS,
 +		!(CONFIG_SOFT_SPI_MODE & SPI_CS_HIGH));
 +}
 +
 +void spi_cs_activate(struct spi_slave *slave)
 +{
 +	gpio_set_value(CONFIG_SOFT_SPI_GPIO_CS,
 +		!(CONFIG_SOFT_SPI_MODE & SPI_CS_HIGH));
 +	SPI_SCL(1);
 +	gpio_set_value(CONFIG_SOFT_SPI_GPIO_CS,
 +		CONFIG_SOFT_SPI_MODE & SPI_CS_HIGH);
 +}
 +
 +void spi_cs_deactivate(struct spi_slave *slave)
 +{
 +	gpio_set_value(CONFIG_SOFT_SPI_GPIO_CS,
 +		!(CONFIG_SOFT_SPI_MODE & SPI_CS_HIGH));
 +}
 +
 +int  spi_cs_is_valid(unsigned int bus, unsigned int cs)
 +{
 +	return bus == 0 && cs == 0;
 +}
 +
 +void universal_spi_scl(int bit)
 +{
 +	gpio_set_value(CONFIG_SOFT_SPI_GPIO_SCLK, bit);
 +}
 +
 +void universal_spi_sda(int bit)
 +{
 +	gpio_set_value(CONFIG_SOFT_SPI_GPIO_MOSI, bit);
 +}
 +
 +int universal_spi_read(void)
 +{
 +	return gpio_get_value(CONFIG_SOFT_SPI_GPIO_MISO);
 +}
 +#endif
 +
 +static void init_pmic_lcd(void)
 +{
 +	unsigned char val;
 +	int ret = 0;
 +
 +	struct pmic *p = get_pmic();
 +
 +	if (pmic_probe(p))
 +		return;
 +
 +	/* LDO7 1.8V */
 +	val = 0x02; /* (1800 - 1600) / 100; */
 +	ret |= pmic_reg_write(p,  MAX8998_REG_LDO7, val);
 +
 +	/* LDO17 3.0V */
 +	val = 0xe; /* (3000 - 1600) / 100; */
 +	ret |= pmic_reg_write(p,  MAX8998_REG_LDO17, val);
 +
 +	/* Disable unneeded regulators */
 +	/*
 +	 * ONOFF1
 +	 * Buck1 ON, Buck2 OFF, Buck3 ON, Buck4 ON
 +	 * LDO2 ON, LDO3 OFF, LDO4 OFF, LDO5 ON
 +	 */
 +	val = 0xB9;
 +	ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF1, val);
 +
 +	/* ONOFF2
 +	 * LDO6 OFF, LDO7 ON, LDO8 OFF, LDO9 ON,
 +	 * LDO10 OFF, LDO11 OFF, LDO12 OFF, LDO13 OFF
 +	 */
 +	val = 0x50;
 +	ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF2, val);
 +
 +	/* ONOFF3
 +	 * LDO14 OFF, LDO15 OFF, LGO16 OFF, LDO17 OFF
 +	 * EPWRHOLD OFF, EBATTMON OFF, ELBCNFG2 OFF, ELBCNFG1 OFF
 +	 */
 +	val = 0x00;
 +	ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF3, val);
 +
 +	if (ret)
 +		puts("LCD pmic initialisation error!\n");
 +}
 +
 +static void lcd_cfg_gpio(void)
 +{
 +	unsigned int i, f3_end = 4;
 +
 +	for (i = 0; i < 8; i++) {
 +		/* set GPF0,1,2[0:7] for RGB Interface and Data lines (32bit) */
 +		s5p_gpio_cfg_pin(&gpio1->f0, i, GPIO_FUNC(2));
 +		s5p_gpio_cfg_pin(&gpio1->f1, i, GPIO_FUNC(2));
 +		s5p_gpio_cfg_pin(&gpio1->f2, i, GPIO_FUNC(2));
 +		/* pull-up/down disable */
 +		s5p_gpio_set_pull(&gpio1->f0, i, GPIO_PULL_NONE);
 +		s5p_gpio_set_pull(&gpio1->f1, i, GPIO_PULL_NONE);
 +		s5p_gpio_set_pull(&gpio1->f2, i, GPIO_PULL_NONE);
 +
 +		/* drive strength to max (24bit) */
 +		s5p_gpio_set_drv(&gpio1->f0, i, GPIO_DRV_4X);
 +		s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
 +		s5p_gpio_set_drv(&gpio1->f1, i, GPIO_DRV_4X);
 +		s5p_gpio_set_rate(&gpio1->f1, i, GPIO_DRV_SLOW);
 +		s5p_gpio_set_drv(&gpio1->f2, i, GPIO_DRV_4X);
 +		s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
 +	}
 +
 +	for (i = 0; i < f3_end; i++) {
 +		/* set GPF3[0:3] for RGB Interface and Data lines (32bit) */
 +		s5p_gpio_cfg_pin(&gpio1->f3, i, GPIO_FUNC(2));
 +		/* pull-up/down disable */
 +		s5p_gpio_set_pull(&gpio1->f3, i, GPIO_PULL_NONE);
 +		/* drive strength to max (24bit) */
 +		s5p_gpio_set_drv(&gpio1->f3, i, GPIO_DRV_4X);
 +		s5p_gpio_set_rate(&gpio1->f3, i, GPIO_DRV_SLOW);
 +	}
 +
 +	/* gpio pad configuration for LCD reset. */
 +	s5p_gpio_cfg_pin(&gpio2->y4, 5, GPIO_OUTPUT);
 +
 +	spi_init();
 +}
 +
 +static void reset_lcd(void)
 +{
 +	s5p_gpio_set_value(&gpio2->y4, 5, 1);
 +	udelay(10000);
 +	s5p_gpio_set_value(&gpio2->y4, 5, 0);
 +	udelay(10000);
 +	s5p_gpio_set_value(&gpio2->y4, 5, 1);
 +	udelay(100);
 +}
 +
 +static void lcd_power_on(void)
 +{
 +	struct pmic *p = get_pmic();
 +
 +	if (pmic_probe(p))
 +		return;
 +
 +	pmic_set_output(p, MAX8998_REG_ONOFF3, MAX8998_LDO17, LDO_ON);
 +	pmic_set_output(p, MAX8998_REG_ONOFF2, MAX8998_LDO7, LDO_ON);
 +}
 +
 +vidinfo_t panel_info = {
 +	.vl_freq	= 60,
 +	.vl_col		= 480,
 +	.vl_row		= 800,
 +	.vl_width	= 480,
 +	.vl_height	= 800,
 +	.vl_clkp	= CONFIG_SYS_HIGH,
 +	.vl_hsp		= CONFIG_SYS_HIGH,
 +	.vl_vsp		= CONFIG_SYS_HIGH,
 +	.vl_dp		= CONFIG_SYS_HIGH,
 +
 +	.vl_bpix	= 5,	/* Bits per pixel */
 +
 +	/* LD9040 LCD Panel */
 +	.vl_hspw	= 2,
 +	.vl_hbpd	= 16,
 +	.vl_hfpd	= 16,
 +
 +	.vl_vspw	= 2,
 +	.vl_vbpd	= 8,
 +	.vl_vfpd	= 8,
 +	.vl_cmd_allow_len = 0xf,
 +
 +	.win_id		= 0,
 +	.cfg_gpio	= lcd_cfg_gpio,
 +	.backlight_on	= NULL,
 +	.lcd_power_on	= lcd_power_on,
 +	.reset_lcd	= reset_lcd,
 +	.dual_lcd_enabled = 0,
 +
 +	.init_delay	= 0,
 +	.power_on_delay = 10000,
 +	.reset_delay	= 10000,
 +	.interface_mode = FIMD_RGB_INTERFACE,
 +	.mipi_enabled	= 0,
 +};
 +
 +void init_panel_info(vidinfo_t *vid)
 +{
 +	vid->logo_on	= 1;
 +	vid->resolution	= HD_RESOLUTION;
 +	vid->rgb_mode	= MODE_RGB_P;
 +
 +#ifdef CONFIG_TIZEN
 +	get_tizen_logo_info(vid);
 +#endif
 +
 +	/* for LD9040. */
 +	vid->pclk_name = 1;	/* MPLL */
 +	vid->sclk_div = 1;
 +
 +	vid->cfg_ldo = ld9040_cfg_ldo;
 +	vid->enable_ldo = ld9040_enable_ldo;
 +
 +	setenv("lcdinfo", "lcd=ld9040");
 +}
 +
 +int board_init(void)
 +{
 +	gpio1 = (struct exynos4_gpio_part1 *) EXYNOS4_GPIO_PART1_BASE;
 +	gpio2 = (struct exynos4_gpio_part2 *) EXYNOS4_GPIO_PART2_BASE;
 +
 +	gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
 +	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 +
- #if defined(CONFIG_PMIC)
- 	pmic_init();
- 	init_pmic_lcd();
- #endif
 +#ifdef CONFIG_SOFT_SPI
 +	soft_spi_init();
 +#endif
 +	check_hw_revision();
 +	printf("HW Revision:\t0x%x\n", board_rev);
 +
 +	return 0;
 +}
diff --cc drivers/power/power_fsl.c
index c8d4c8d9e,651f88f85..a66383158
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@@ -23,16 -23,11 +23,17 @@@
  
  #include <common.h>
  #include <spi.h>
- #include <pmic.h>
+ #include <power/pmic.h>
  #include <fsl_pmic.h>
+ #include <errno.h>
  
 +#if defined(CONFIG_PMIC_FSL_MC13892)
 +#define FSL_PMIC_I2C_LENGTH	3
 +#elif defined(CONFIG_PMIC_FSL_MC34704)
 +#define FSL_PMIC_I2C_LENGTH	1
 +#endif
 +
- #if defined(CONFIG_PMIC_SPI)
+ #if defined(CONFIG_POWER_SPI)
  static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
  {
  	return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
@@@ -56,13 -56,13 +62,13 @@@ int pmic_init(unsigned char bus
  	p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
  	p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
  	p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
- #elif defined(CONFIG_PMIC_I2C)
+ #elif defined(CONFIG_POWER_I2C)
  	p->interface = PMIC_I2C;
  	p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
 -	p->hw.i2c.tx_num = 3;
 +	p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
- 	p->bus = I2C_PMIC;
+ 	p->bus = bus;
  #else
- #error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"
+ #error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
  #endif
  
  	return 0;
diff --cc drivers/video/Makefile
index b3207c83c,cc3022a2c..170a358b5
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -37,9 -37,9 +37,10 @@@ COBJS-$(CONFIG_EXYNOS_PWM_BL) += exynos
  COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o
  COBJS-$(CONFIG_S6E8AX0) += s6e8ax0.o
  COBJS-$(CONFIG_S6E63D6) += s6e63d6.o
 +COBJS-$(CONFIG_LD9040) += ld9040.o
  COBJS-$(CONFIG_SED156X) += sed156x.o
  COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
+ COBJS-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o
  COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
  COBJS-$(CONFIG_VIDEO_DA8XX) += da8xx-fb.o videomodes.o
  COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
diff --cc include/configs/mx35pdk.h
index 1c2f5993d,342d53fee..88b2bd6ed
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@@ -65,10 -65,9 +65,10 @@@
  /*
   * PMIC Configs
   */
- #define CONFIG_PMIC
- #define CONFIG_PMIC_I2C
- #define CONFIG_PMIC_FSL
+ #define CONFIG_POWER
+ #define CONFIG_POWER_I2C
+ #define CONFIG_POWER_FSL
 +#define CONFIG_PMIC_FSL_MC13892
  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x08
  #define CONFIG_RTC_MC13XXX
  
diff --cc include/configs/mx53evk.h
index c472075c9,1916b85e2..a0af3eeb2
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@@ -55,11 -55,10 +55,11 @@@
  #define CONFIG_SYS_I2C_SPEED            100000
  
  /* PMIC Configs */
- #define CONFIG_PMIC
- #define CONFIG_PMIC_I2C
- #define CONFIG_PMIC_FSL
+ #define CONFIG_POWER
+ #define CONFIG_POWER_I2C
+ #define CONFIG_POWER_FSL
  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR    8
 +#define CONFIG_PMIC_FSL_MC13892
  #define CONFIG_RTC_MC13XXX
  
  /* MMC Configs */
diff --cc include/configs/mx53loco.h
index 37f9d69e2,a1101762e..e30502b4e
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@@ -89,11 -89,10 +89,11 @@@
  #define CONFIG_SYS_I2C_SPEED		100000
  
  /* PMIC Controller */
- #define CONFIG_PMIC
- #define CONFIG_PMIC_I2C
- #define CONFIG_DIALOG_PMIC
- #define CONFIG_PMIC_FSL
+ #define CONFIG_POWER
+ #define CONFIG_POWER_I2C
+ #define CONFIG_DIALOG_POWER
+ #define CONFIG_POWER_FSL
 +#define CONFIG_PMIC_FSL_MC13892
  #define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR	0x48
  #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x8
  
diff --cc include/configs/seaboard.h
index c2d1c6621,ab10bd0ab..94116f116
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@@ -103,18 -99,10 +103,21 @@@
  #define CONFIG_TEGRA_KEYBOARD
  #define CONFIG_KEYBOARD
  
+ /* USB keyboard */
+ #define CONFIG_USB_KEYBOARD
+ 
 -#include "tegra-common-post.h"
 +#undef TEGRA_DEVICE_SETTINGS
 +#define TEGRA_DEVICE_SETTINGS	"stdin=serial,tegra-kbc\0" \
 +				"stdout=serial,lcd\0" \
 +				"stderr=serial,lcd\0"
 +
 +/* LCD support */
 +#define CONFIG_LCD
 +#define CONFIG_PWM_TEGRA
 +#define CONFIG_VIDEO_TEGRA
 +#define LCD_BPP				LCD_COLOR16
 +#define CONFIG_SYS_WHITE_ON_BLACK
 +#define CONFIG_CONSOLE_SCROLL_LINES	10
  
  /* NAND support */
  #define CONFIG_CMD_NAND