| Message ID | 1390832143-372-10-git-send-email-p.wilczek@samsung.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Minkyu Kang |
| Headers | show |
On 01/27/2014 11:15 PM, Piotr Wilczek wrote: > This patch enables to run Trats2 board on device tree. > > Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > CC: Minkyu Kang <mk7.kang@samsung.com> > --- > board/samsung/dts/exynos4412-trats2.dts | 434 +++++++++++++++++++++++++++++++ > board/samsung/trats2/trats2.c | 216 +-------------- > include/configs/trats2.h | 199 ++------------ > 3 files changed, 459 insertions(+), 390 deletions(-) > create mode 100644 board/samsung/dts/exynos4412-trats2.dts > > diff --git a/board/samsung/dts/exynos4412-trats2.dts b/board/samsung/dts/exynos4412-trats2.dts > new file mode 100644 > index 0000000..c8f847c > --- /dev/null > +++ b/board/samsung/dts/exynos4412-trats2.dts > @@ -0,0 +1,434 @@ > +/* > + * Samsung's Exynos4412 based Trats2 board device tree source > + * > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > + * http://www.samsung.com > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/dts-v1/; > +/include/ "exynos4.dtsi" > + > +/ { > + model = "Samsung Trats2 based on Exynos4412"; > + compatible = "samsung,trats2", "samsung,exynos4412"; > + > + config { > + samsung,dsim-device-name = "s6e8ax0"; > + }; > + > + aliases { > + i2c0 = "/i2c@13860000"; > + i2c1 = "/i2c@13870000"; > + i2c2 = "/i2c@13880000"; > + i2c3 = "/i2c@13890000"; > + i2c4 = "/i2c@138a0000"; > + i2c5 = "/i2c@138b0000"; > + i2c6 = "/i2c@138c0000"; > + i2c7 = "/i2c@138d0000"; > + serial0 = "/serial@13800000"; > + console = "/serial@13820000"; > + mmc0 = "sdhci@12510000"; > + mmc2 = "sdhci@12510000"; mmc2 isn't 0x12510000. > + }; > + > + i2c@138d0000 { > + samsung,i2c-sda-delay = <100>; > + samsung,i2c-slave-addr = <0x10>; > + samsung,i2c-max-bus-freq = <100000>; > + status = "okay"; > + > + max77686_pmic@09 { > + compatible = "maxim,max77686_pmic"; > + interrupts = <7 0>; > + reg = <0x09 0 0>; > + #clock-cells = <1>; > + > + voltage-regulators { > + ldo1_reg: ldo1 { > + regulator-compatible = "LDO1"; > + regulator-name = "VALIVE_1.0V_AP"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo2_reg: ldo2 { > + regulator-compatible = "LDO2"; > + regulator-name = "VM1M2_1.2V_AP"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo3_reg: ldo3 { > + regulator-compatible = "LDO3"; > + regulator-name = "VCC_1.8V_AP"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo4_reg: ldo4 { > + regulator-compatible = "LDO4"; > + regulator-name = "VCC_2.8V_AP"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo5_reg: ldo5 { > + regulator-compatible = "LDO5"; > + regulator-name = "VCC_1.8V_IO"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo6_reg: ldo6 { > + regulator-compatible = "LDO6"; > + regulator-name = "VMPLL_1.0V_AP"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo7_reg: ldo7 { > + regulator-compatible = "LDO7"; > + regulator-name = "VPLL_1.0V_AP"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-always-on; > + regulator-mem-on; > + }; > + > + ldo8_reg: ldo8 { > + regulator-compatible = "LDO8"; > + regulator-name = "VMIPI_1.0V"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-mem-off; > + }; > + > + ldo9_reg: ldo9 { > + regulator-compatible = "LDO9"; > + regulator-name = "CAM_ISP_MIPI_1.2V"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-mem-idle; > + }; > + > + ldo10_reg: ldo10 { > + regulator-compatible = "LDO10"; > + regulator-name = "VMIPI_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-off; > + }; > + > + ldo11_reg: ldo11 { > + regulator-compatible = "LDO11"; > + regulator-name = "VABB1_1.95V"; > + regulator-min-microvolt = <1950000>; > + regulator-max-microvolt = <1950000>; > + regulator-always-on; > + regulator-mem-off; > + }; > + > + ldo12_reg: ldo12 { > + regulator-compatible = "LDO12"; > + regulator-name = "VUOTG_3.0V"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-mem-off; > + }; > + > + ldo13_reg: ldo13 { > + regulator-compatible = "LDO13"; > + regulator-name = "NFC_AVDD_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-idle; > + }; > + > + ldo14_reg: ldo14 { > + regulator-compatible = "LDO14"; > + regulator-name = "VABB2_1.95V"; > + regulator-min-microvolt = <1950000>; > + regulator-max-microvolt = <1950000>; > + regulator-always-on; > + regulator-mem-off; > + }; > + > + ldo15_reg: ldo15 { > + regulator-compatible = "LDO15"; > + regulator-name = "VHSIC_1.0V"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + regulator-mem-off; > + }; > + > + ldo16_reg: ldo16 { > + regulator-compatible = "LDO16"; > + regulator-name = "VHSIC_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-off; > + }; > + > + ldo17_reg: ldo17 { > + regulator-compatible = "LDO17"; > + regulator-name = "CAM_SENSOR_CORE_1.2V"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-mem-idle; > + }; > + > + ldo18_reg: ldo18 { > + regulator-compatible = "LDO18"; > + regulator-name = "CAM_ISP_SEN_IO_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-idle; > + }; > + > + ldo19_reg: ldo19 { > + regulator-compatible = "LDO19"; > + regulator-name = "VT_CAM_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-idle; > + }; > + > + ldo20_reg: ldo20 { > + regulator-compatible = "LDO20"; > + regulator-name = "VDDQ_PRE_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-idle; > + }; > + > + ldo21_reg: ldo21 { > + regulator-compatible = "LDO21"; > + regulator-name = "VTF_2.8V"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-mem-idle; > + }; > + > + ldo22_reg: ldo22 { > + regulator-compatible = "LDO22"; > + regulator-name = "VMEM_VDD_2.8V"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-always-on; > + regulator-mem-off; > + }; > + > + ldo23_reg: ldo23 { > + regulator-compatible = "LDO23"; > + regulator-name = "TSP_AVDD_3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-mem-idle; > + }; > + > + ldo24_reg: ldo24 { > + regulator-compatible = "LDO24"; > + regulator-name = "TSP_VDD_1.8V"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-mem-idle; > + }; > + > + ldo25_reg: ldo25 { > + regulator-compatible = "LDO25"; > + regulator-name = "LCD_VCC_3.3V"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-mem-idle; > + }; > + > + ldo26_reg: ldo26 { > + regulator-compatible = "LDO26"; > + regulator-name = "MOTOR_VCC_3.0V"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-mem-idle; > + }; > + > + buck1_reg: buck1 { > + regulator-compatible = "BUCK1"; > + regulator-name = "vdd_mif"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1100000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-mem-off; > + }; > + > + buck2_reg: buck2 { > + regulator-compatible = "BUCK2"; > + regulator-name = "vdd_arm"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1500000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-mem-off; > + }; > + > + buck3_reg: buck3 { > + regulator-compatible = "BUCK3"; > + regulator-name = "vdd_int"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1150000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-mem-off; > + }; > + > + buck4_reg: buck4 { > + regulator-compatible = "BUCK4"; > + regulator-name = "vdd_g3d"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1150000>; > + regulator-boot-on; > + regulator-mem-off; > + }; > + > + buck5_reg: buck5 { > + regulator-compatible = "BUCK5"; > + regulator-name = "VMEM_1.2V_AP"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-always-on; > + }; > + > + buck6_reg: buck6 { > + regulator-compatible = "BUCK6"; > + regulator-name = "VCC_SUB_1.35V"; > + regulator-min-microvolt = <1350000>; > + regulator-max-microvolt = <1350000>; > + regulator-always-on; > + }; > + > + buck7_reg: buck7 { > + regulator-compatible = "BUCK7"; > + regulator-name = "VCC_SUB_2.0V"; > + regulator-min-microvolt = <2000000>; > + regulator-max-microvolt = <2000000>; > + regulator-always-on; > + }; > + > + buck8_reg: buck8 { > + regulator-compatible = "BUCK8"; > + regulator-name = "VMEM_VDDF_3.0V"; > + regulator-min-microvolt = <2850000>; > + regulator-max-microvolt = <2850000>; > + regulator-always-on; > + regulator-mem-off; > + }; > + > + buck9_reg: buck9 { > + regulator-compatible = "BUCK9"; > + regulator-name = "CAM_ISP_CORE_1.2V"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1200000>; > + regulator-mem-off; > + }; > + }; > + }; > + }; > + > + fimd@11c00000 { > + compatible = "samsung,exynos-fimd"; > + reg = <0x11c00000 0xa4>; > + > + samsung,vl-freq = <60>; > + samsung,vl-col = <720>; > + samsung,vl-row = <1280>; > + samsung,vl-width = <720>; > + samsung,vl-height = <1280>; > + > + samsung,vl-clkp = <0>; > + samsung,vl-oep = <0>; > + samsung,vl-hsp = <1>; > + samsung,vl-vsp = <1>; > + samsung,vl-dp = <1>; > + samsung,vl-bpix = <4>; > + > + samsung,vl-hspw = <5>; > + samsung,vl-hbpd = <10>; > + samsung,vl-hfpd = <10>; > + samsung,vl-vspw = <2>; > + samsung,vl-vbpd = <1>; > + samsung,vl-vfpd = <13>; > + samsung,vl-cmd-allow-len = <0xf>; > + > + samsung,winid = <0>; > + samsung,power-on-delay = <30>; > + samsung,interface-mode = <1>; > + samsung,mipi-enabled = <1>; > + samsung,dp-enabled; > + samsung,dual-lcd-enabled; > + > + samsung,logo-on = <1>; > + samsung,resolution = <0>; > + samsung,rgb-mode = <0>; > + }; > + > + mipidsi@11c80000 { > + compatible = "samsung,exynos-mipi-dsi"; > + reg = <0x11c80000 0x5c>; > + > + samsung,dsim-config-e_interface = <1>; > + samsung,dsim-config-e_virtual_ch = <0>; > + samsung,dsim-config-e_pixel_format = <7>; > + samsung,dsim-config-e_burst_mode = <1>; > + samsung,dsim-config-e_no_data_lane = <3>; > + samsung,dsim-config-e_byte_clk = <0>; > + samsung,dsim-config-hfp = <1>; > + > + samsung,dsim-config-p = <3>; > + samsung,dsim-config-m = <120>; > + samsung,dsim-config-s = <1>; > + > + samsung,dsim-config-pll_stable_time = <500>; > + samsung,dsim-config-esc_clk = <20000000>; > + samsung,dsim-config-stop_holding_cnt = <0x7ff>; > + samsung,dsim-config-bta_timeout = <0xff>; > + samsung,dsim-config-rx_timeout = <0xffff>; > + > + samsung,dsim-device-id = <0xffffffff>; > + samsung,dsim-device-bus_id = <0>; > + > + samsung,dsim-device-reverse_panel = <1>; > + }; > + > + sdhci@12510000 { > + samsung,bus-width = <8>; > + samsung,timing = <1 3 3>; > + pwr-gpios = <&gpio 0x2004002 0>; > + }; > + > + sdhci@12520000 { > + status = "disabled"; > + }; > + > + sdhci@12530000 { > + samsung,bus-width = <4>; > + samsung,timing = <1 2 3>; > + cd-gpios = <&gpio 0x20C6004 0>; > + }; > + > + sdhci@12540000 { > + status = "disabled"; > + }; > +}; > diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c > index c17c24d..108d0f8 100644 > --- a/board/samsung/trats2/trats2.c > +++ b/board/samsung/trats2/trats2.c > @@ -8,13 +8,6 @@ > > #include <common.h> > #include <lcd.h> > -#include <asm/io.h> > -#include <asm/arch/gpio.h> > -#include <asm/arch/mmc.h> > -#include <asm/arch/power.h> > -#include <asm/arch/clk.h> > -#include <asm/arch/clock.h> > -#include <asm/arch/mipi_dsim.h> > #include <asm/arch/pinmux.h> > #include <asm/arch/power.h> > #include <power/pmic.h> > @@ -23,7 +16,6 @@ > #include <power/max77693_pmic.h> > #include <power/max77693_muic.h> > #include <power/max77693_fg.h> > -#include <libtizen.h> > #include <errno.h> > #include <usb.h> > #include <usb/s3c_udc.h> > @@ -69,16 +61,6 @@ static void check_hw_revision(void) > board_rev = modelrev << 8; > } > > -#ifdef CONFIG_DISPLAY_BOARDINFO > -int checkboard(void) > -{ > - puts("Board:\tTRATS2\n"); > - printf("HW Revision:\t0x%04x\n", board_rev); > - > - return 0; > -} > -#endif > - > u32 get_board_rev(void) > { > return board_rev; > @@ -158,26 +140,21 @@ int get_soft_i2c_sda_pin(void) > > int board_early_init_f(void) > { > - check_hw_revision(); > board_external_gpio_init(); > > - gd->flags |= GD_FLG_DISABLE_CONSOLE; > +#ifdef CONFIG_SYS_I2C_INIT_BOARD > + board_i2c_init(gd->fdt_blob); > +#endif > > return 0; > } > > static int pmic_init_max77686(void); > > -int board_init(void) > +int exynos_init(void) > { > - struct exynos4_power *pwr = > - (struct exynos4_power *)samsung_get_base_power(); > - > - gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; > - > - /* workaround: clear INFORM4..5 */ > - writel(0, (unsigned int)&pwr->inform4); > - writel(0, (unsigned int)&pwr->inform5); > + check_hw_revision(); > + printf("HW Revision:\t0x%04x\n", board_rev); > > return 0; > } > @@ -248,90 +225,6 @@ int power_init_board(void) > return 0; > } > > -int dram_init(void) > -{ > - u32 size_mb; > - > - size_mb = (get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) + > - get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE) + > - get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE) + > - get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE)) >> 20; > - > - gd->ram_size = size_mb << 20; > - > - return 0; > -} > - > -void dram_init_banksize(void) > -{ > - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; > - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; > - gd->bd->bi_dram[1].start = PHYS_SDRAM_2; > - gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; > - gd->bd->bi_dram[2].start = PHYS_SDRAM_3; > - gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; > - gd->bd->bi_dram[3].start = PHYS_SDRAM_4; > - gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; > -} > - > -int board_mmc_init(bd_t *bis) > -{ > - int err0, err2 = 0; > - > - gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2(); > - > - /* eMMC_EN: SD_0_CDn: GPK0[2] Output High */ > - s5p_gpio_direction_output(&gpio2->k0, 2, 1); > - s5p_gpio_set_pull(&gpio2->k0, 2, GPIO_PULL_NONE); > - > - /* > - * eMMC GPIO: > - * SDR 8-bit@48MHz at MMC0 > - * GPK0[0] SD_0_CLK(2) > - * GPK0[1] SD_0_CMD(2) > - * GPK0[2] SD_0_CDn -> Not used > - * GPK0[3:6] SD_0_DATA[0:3](2) > - * GPK1[3:6] SD_0_DATA[0:3](3) > - * > - * DDR 4-bit@26MHz at MMC4 > - * GPK0[0] SD_4_CLK(3) > - * GPK0[1] SD_4_CMD(3) > - * GPK0[2] SD_4_CDn -> Not used > - * GPK0[3:6] SD_4_DATA[0:3](3) > - * GPK1[3:6] SD_4_DATA[4:7](4) > - */ > - > - err0 = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE); > - > - /* > - * MMC device init > - * mmc0 : eMMC (8-bit buswidth) > - * mmc2 : SD card (4-bit buswidth) > - */ > - if (err0) > - debug("SDMMC0 not configured\n"); > - else > - err0 = s5p_mmc_init(0, 8); > - > - /* T-flash detect */ > - s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf); > - s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP); > - > - /* > - * Check the T-flash detect pin > - * GPX3[4] T-flash detect pin > - */ > - if (!s5p_gpio_get_value(&gpio2->x3, 4)) { > - err2 = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); > - if (err2) > - debug("SDMMC2 not configured\n"); > - else > - err2 = s5p_mmc_init(2, 4); > - } > - > - return err0 & err2; > -} > - > #ifdef CONFIG_USB_GADGET > static int s5pc210_phy_control(int on) > { > @@ -479,46 +372,7 @@ static int pmic_init_max77686(void) > */ > > #ifdef CONFIG_LCD > -static struct mipi_dsim_config dsim_config = { > - .e_interface = DSIM_VIDEO, > - .e_virtual_ch = DSIM_VIRTUAL_CH_0, > - .e_pixel_format = DSIM_24BPP_888, > - .e_burst_mode = DSIM_BURST_SYNC_EVENT, > - .e_no_data_lane = DSIM_DATA_LANE_4, > - .e_byte_clk = DSIM_PLL_OUT_DIV8, > - .hfp = 1, > - > - .p = 3, > - .m = 120, > - .s = 1, > - > - /* D-PHY PLL stable time spec :min = 200usec ~ max 400usec */ > - .pll_stable_time = 500, > - > - /* escape clk : 10MHz */ > - .esc_clk = 20 * 1000000, > - > - /* stop state holding counter after bta change count 0 ~ 0xfff */ > - .stop_holding_cnt = 0x7ff, > - /* bta timeout 0 ~ 0xff */ > - .bta_timeout = 0xff, > - /* lp rx timeout 0 ~ 0xffff */ > - .rx_timeout = 0xffff, > -}; > - > -static struct exynos_platform_mipi_dsim dsim_platform_data = { > - .lcd_panel_info = NULL, > - .dsim_config = &dsim_config, > -}; > - > -static struct mipi_dsim_lcd_device mipi_lcd_device = { > - .name = "s6e8ax0", > - .id = -1, > - .bus_id = 0, > - .platform_data = (void *)&dsim_platform_data, > -}; > - > -static int mipi_power(void) > +int mipi_power(void) > { > struct pmic *p = pmic_get("MAX77686_PMIC"); > > @@ -555,62 +409,6 @@ void exynos_reset_lcd(void) > udelay(10); > s5p_gpio_set_value(&gpio1->f2, 1, 1); > } > - > -vidinfo_t panel_info = { > - .vl_freq = 60, > - .vl_col = 720, > - .vl_row = 1280, > - .vl_width = 720, > - .vl_height = 1280, > - .vl_clkp = CONFIG_SYS_HIGH, > - .vl_hsp = CONFIG_SYS_LOW, > - .vl_vsp = CONFIG_SYS_LOW, > - .vl_dp = CONFIG_SYS_LOW, > - .vl_bpix = 4, /* Bits per pixel, 2^4 = 16 */ > - > - /* s6e8ax0 Panel infomation */ > - .vl_hspw = 5, > - .vl_hbpd = 10, > - .vl_hfpd = 10, > - > - .vl_vspw = 2, > - .vl_vbpd = 1, > - .vl_vfpd = 13, > - .vl_cmd_allow_len = 0xf, > - .mipi_enabled = 1, > - > - .dual_lcd_enabled = 0, > - > - .init_delay = 0, > - .power_on_delay = 25, > - .reset_delay = 0, > - .interface_mode = FIMD_RGB_INTERFACE, > -}; > - > -void init_panel_info(vidinfo_t *vid) > -{ > - vid->logo_on = 1; > - vid->resolution = HD_RESOLUTION; > - vid->rgb_mode = MODE_RGB_P; > - > - vid->power_on_delay = 30; > - > - mipi_lcd_device.reverse_panel = 1; > - > -#ifdef CONFIG_TIZEN > - get_tizen_logo_info(vid); > -#endif > - > - strcpy(dsim_platform_data.lcd_panel_name, mipi_lcd_device.name); > - dsim_platform_data.mipi_power = mipi_power; > - dsim_platform_data.phy_enable = set_mipi_phy_ctrl; > - dsim_platform_data.lcd_panel_info = (void *)vid; > - exynos_mipi_dsi_register_lcd_device(&mipi_lcd_device); > - > - s6e8ax0_init(); > - > - exynos_set_dsim_platform_data(&dsim_platform_data); > -} > #endif /* LCD */ > > #ifdef CONFIG_MISC_INIT_R > diff --git a/include/configs/trats2.h b/include/configs/trats2.h > index 28270fe..0ac885a 100644 > --- a/include/configs/trats2.h > +++ b/include/configs/trats2.h > @@ -8,147 +8,32 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > > -#ifndef __CONFIG_H > -#define __CONFIG_H > +#ifndef __CONFIG_TRATS2_H > +#define __CONFIG_TRATS2_H > > -/* > - * High Level Configuration Options > - * (easy to change) > - */ > -#define CONFIG_SAMSUNG /* in a SAMSUNG core */ > -#define CONFIG_S5P /* which is in a S5P Family */ > -#define CONFIG_EXYNOS4 /* which is in a EXYNOS4XXX */ > -#define CONFIG_TIZEN /* TIZEN lib */ > - > -#include <asm/arch/cpu.h> /* get chip and board defs */ > +#include <configs/exynos4-dt.h> > > -#define CONFIG_ARCH_CPU_INIT > -#define CONFIG_DISPLAY_CPUINFO > -#define CONFIG_DISPLAY_BOARDINFO > - > -#define CONFIG_SKIP_LOWLEVEL_INIT > - > -#define CONFIG_SYS_CACHELINE_SIZE 32 > +#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ > > -#ifndef CONFIG_SYS_L2CACHE_OFF > -#define CONFIG_SYS_L2_PL310 > -#define CONFIG_SYS_PL310_BASE 0x10502000 > -#endif > +#undef CONFIG_DEFAULT_DEVICE_TREE > +#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-trats2 > > -#define CONFIG_NR_DRAM_BANKS 4 > -#define PHYS_SDRAM_1 0x40000000 /* LDDDR2 DMC 0 */ > -#define PHYS_SDRAM_1_SIZE (256 << 20) /* 256 MB in CS 0 */ > -#define PHYS_SDRAM_2 0x50000000 /* LPDDR2 DMC 1 */ > -#define PHYS_SDRAM_2_SIZE (256 << 20) /* 256 MB in CS 0 */ > -#define PHYS_SDRAM_3 0x60000000 /* LPDDR2 DMC 1 */ > -#define PHYS_SDRAM_3_SIZE (256 << 20) /* 256 MB in CS 0 */ > -#define PHYS_SDRAM_4 0x70000000 /* LPDDR2 DMC 1 */ > -#define PHYS_SDRAM_4_SIZE (256 << 20) /* 256 MB in CS 0 */ > -#define PHYS_SDRAM_END 0x80000000 > +/* TRATS2 has 4 banks of DRAM */ > +#define CONFIG_NR_DRAM_BANKS 4 > +#define CONFIG_SYS_SDRAM_BASE 0x40000000 > +#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ > > -#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ > +/* memtest works on */ > +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE > +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000) > +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) > > -#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) > #define CONFIG_SYS_TEXT_BASE 0x78100000 > > -#define CONFIG_SYS_CLK_FREQ 24000000 > - > -#define CONFIG_SETUP_MEMORY_TAGS > -#define CONFIG_CMDLINE_TAG > -#define CONFIG_REVISION_TAG > - > -/* MACH_TYPE_TRATS2 */ > -#define MACH_TYPE_TRATS2 3765 > -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS2 > - > -#define CONFIG_DISPLAY_CPUINFO > - > -#include <asm/sizes.h> > -/* Size of malloc() pool */ > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M)) > - > -/* select serial console configuration */ > -#define CONFIG_SERIAL2 > - > -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ > -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " > - > -#define CONFIG_CMDLINE_EDITING > - > -#define CONFIG_BAUDRATE 115200 > - > -/* It should define before config_cmd_default.h */ > -#define CONFIG_SYS_NO_FLASH > - > -/*********************************************************** > - * Command definition > - ***********************************************************/ > -#include <config_cmd_default.h> > - > -#undef CONFIG_CMD_ECHO > -#undef CONFIG_CMD_FPGA > -#undef CONFIG_CMD_FLASH > -#undef CONFIG_CMD_IMLS > -#undef CONFIG_CMD_NAND > -#undef CONFIG_CMD_MISC > -#undef CONFIG_CMD_NFS > -#undef CONFIG_CMD_SOURCE > -#undef CONFIG_CMD_XIMG > -#define CONFIG_CMD_CACHE > -#define CONFIG_CMD_I2C > -#define CONFIG_CMD_MMC > -#define CONFIG_CMD_DFU > -#define CONFIG_CMD_GPT > -#define CONFIG_CMD_PMIC > - > -#define CONFIG_BOOTDELAY 3 > -#define CONFIG_ZERO_BOOTDELAY_CHECK > - > -#define CONFIG_CMD_FAT > -#define CONFIG_FAT_WRITE > - > -/* EXT4 */ > -#define CONFIG_CMD_EXT4 > -#define CONFIG_CMD_EXT4_WRITE > - > -/* USB Composite download gadget - g_dnl */ > -#define CONFIG_USBDOWNLOAD_GADGET > -#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M > -#define CONFIG_DFU_FUNCTION > -#define CONFIG_DFU_MMC > - > -/* TIZEN THOR downloader support */ > -#define CONFIG_CMD_THOR_DOWNLOAD > -#define CONFIG_THOR_FUNCTION > - > -/* USB Samsung's IDs */ > -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 > -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 > -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM > -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D > -#define CONFIG_G_DNL_MANUFACTURER "Samsung" > - > -/* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */ > -#undef CONFIG_CMD_NET > - > -/* MMC */ > -#define CONFIG_GENERIC_MMC > -#define CONFIG_MMC > -#define CONFIG_S5P_SDHCI > -#define CONFIG_SDHCI > -#define CONFIG_MMC_SDMA > -#define CONFIG_MMC_DEFAULT_DEV 0 > - > -/* PWM */ > -#define CONFIG_PWM > - > -#define CONFIG_BOOTARGS "Please use defined boot" > -#define CONFIG_BOOTCOMMAND "run mmcboot" > -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" > +#define CONFIG_BOOTARGS "Please use defined boot" > +#define CONFIG_BOOTCOMMAND "run mmcboot" > > #define CONFIG_ENV_OVERWRITE > -#define CONFIG_SYS_CONSOLE_INFO_QUIET > -#define CONFIG_SYS_CONSOLE_IS_IN_ENV > > #define CONFIG_ENV_VARS_UBOOT_CONFIG > #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG > @@ -240,46 +125,6 @@ > "setenv spl_addr_tmp;\0" \ > "fdtaddr=40800000\0" \ > > -/* > - * Miscellaneous configurable options > - */ > -#define CONFIG_SYS_LONGHELP /* undef to save memory */ > -#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ > -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ > -#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ > -#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ > - > -/* Boot Argument Buffer Size */ > -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE > - > -/* memtest works on */ > -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE > -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) > -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) > - > -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ > - - GENERATED_GBL_DATA_SIZE) > - > -/* valid baudrates */ > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } > - > -#define CONFIG_SYS_MONITOR_BASE 0x00000000 > - > -/*----------------------------------------------------------------------- > - * FLASH and environment organization > - */ > - > -#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ > - > -#define CONFIG_ENV_IS_IN_MMC > -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV > -#define CONFIG_ENV_SIZE 4096 > -#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ > -#define CONFIG_EFI_PARTITION > -#define CONFIG_PARTITION_UUIDS > - > -#define CONFIG_BOARD_EARLY_INIT_F > - > /* I2C */ > #include <asm/arch/gpio.h> > > @@ -312,11 +157,6 @@ int get_soft_i2c_sda_pin(void); > #define CONFIG_POWER_MUIC_MAX77693 > #define CONFIG_POWER_FG_MAX77693 > #define CONFIG_POWER_BATTERY_TRATS2 > -#define CONFIG_USB_GADGET > -#define CONFIG_USB_GADGET_S3C_UDC_OTG > -#define CONFIG_USB_GADGET_DUALSPEED > -#define CONFIG_USB_GADGET_VBUS_DRAW 2 > -#define CONFIG_USB_CABLE_CHECK > > /* Common misc for Samsung */ > #define CONFIG_MISC_COMMON > @@ -356,10 +196,7 @@ int get_soft_i2c_sda_pin(void); > #define CONFIG_VIDEO_BMP_GZIP > #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) > > -#define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > - > -/* Pass open firmware flat tree */ > -#define CONFIG_OF_LIBFDT 1 > +#define LCD_XRES 720 > +#define LCD_YRES 1280 > > #endif /* __CONFIG_H */ >
Hi Jaehoon, > On 01/27/2014 11:15 PM, Piotr Wilczek wrote: > > This patch enables to run Trats2 board on device tree. > > > > Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > CC: Minkyu Kang <mk7.kang@samsung.com> > > --- > > board/samsung/dts/exynos4412-trats2.dts | 434 > +++++++++++++++++++++++++++++++ > > board/samsung/trats2/trats2.c | 216 +-------------- > > include/configs/trats2.h | 199 ++------------ > > 3 files changed, 459 insertions(+), 390 deletions(-) create mode > > 100644 board/samsung/dts/exynos4412-trats2.dts > > > > diff --git a/board/samsung/dts/exynos4412-trats2.dts > > b/board/samsung/dts/exynos4412-trats2.dts > > new file mode 100644 > > index 0000000..c8f847c > > --- /dev/null > > +++ b/board/samsung/dts/exynos4412-trats2.dts > > @@ -0,0 +1,434 @@ > > +/* > > + * Samsung's Exynos4412 based Trats2 board device tree source > > + * > > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > > + * http://www.samsung.com > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +/dts-v1/; > > +/include/ "exynos4.dtsi" > > + > > +/ { > > + model = "Samsung Trats2 based on Exynos4412"; > > + compatible = "samsung,trats2", "samsung,exynos4412"; > > + > > + config { > > + samsung,dsim-device-name = "s6e8ax0"; > > + }; > > + > > + aliases { > > + i2c0 = "/i2c@13860000"; > > + i2c1 = "/i2c@13870000"; > > + i2c2 = "/i2c@13880000"; > > + i2c3 = "/i2c@13890000"; > > + i2c4 = "/i2c@138a0000"; > > + i2c5 = "/i2c@138b0000"; > > + i2c6 = "/i2c@138c0000"; > > + i2c7 = "/i2c@138d0000"; > > + serial0 = "/serial@13800000"; > > + console = "/serial@13820000"; > > + mmc0 = "sdhci@12510000"; > > + mmc2 = "sdhci@12510000"; > > mmc2 isn't 0x12510000. It is 0x12530000, thanks. Best regards, Piotr Wilczek
diff --git a/board/samsung/dts/exynos4412-trats2.dts b/board/samsung/dts/exynos4412-trats2.dts new file mode 100644 index 0000000..c8f847c --- /dev/null +++ b/board/samsung/dts/exynos4412-trats2.dts @@ -0,0 +1,434 @@ +/* + * Samsung's Exynos4412 based Trats2 board device tree source + * + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; +/include/ "exynos4.dtsi" + +/ { + model = "Samsung Trats2 based on Exynos4412"; + compatible = "samsung,trats2", "samsung,exynos4412"; + + config { + samsung,dsim-device-name = "s6e8ax0"; + }; + + aliases { + i2c0 = "/i2c@13860000"; + i2c1 = "/i2c@13870000"; + i2c2 = "/i2c@13880000"; + i2c3 = "/i2c@13890000"; + i2c4 = "/i2c@138a0000"; + i2c5 = "/i2c@138b0000"; + i2c6 = "/i2c@138c0000"; + i2c7 = "/i2c@138d0000"; + serial0 = "/serial@13800000"; + console = "/serial@13820000"; + mmc0 = "sdhci@12510000"; + mmc2 = "sdhci@12510000"; + }; + + i2c@138d0000 { + samsung,i2c-sda-delay = <100>; + samsung,i2c-slave-addr = <0x10>; + samsung,i2c-max-bus-freq = <100000>; + status = "okay"; + + max77686_pmic@09 { + compatible = "maxim,max77686_pmic"; + interrupts = <7 0>; + reg = <0x09 0 0>; + #clock-cells = <1>; + + voltage-regulators { + ldo1_reg: ldo1 { + regulator-compatible = "LDO1"; + regulator-name = "VALIVE_1.0V_AP"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo2_reg: ldo2 { + regulator-compatible = "LDO2"; + regulator-name = "VM1M2_1.2V_AP"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo3_reg: ldo3 { + regulator-compatible = "LDO3"; + regulator-name = "VCC_1.8V_AP"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo4_reg: ldo4 { + regulator-compatible = "LDO4"; + regulator-name = "VCC_2.8V_AP"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo5_reg: ldo5 { + regulator-compatible = "LDO5"; + regulator-name = "VCC_1.8V_IO"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo6_reg: ldo6 { + regulator-compatible = "LDO6"; + regulator-name = "VMPLL_1.0V_AP"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo7_reg: ldo7 { + regulator-compatible = "LDO7"; + regulator-name = "VPLL_1.0V_AP"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-always-on; + regulator-mem-on; + }; + + ldo8_reg: ldo8 { + regulator-compatible = "LDO8"; + regulator-name = "VMIPI_1.0V"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-mem-off; + }; + + ldo9_reg: ldo9 { + regulator-compatible = "LDO9"; + regulator-name = "CAM_ISP_MIPI_1.2V"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-mem-idle; + }; + + ldo10_reg: ldo10 { + regulator-compatible = "LDO10"; + regulator-name = "VMIPI_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-off; + }; + + ldo11_reg: ldo11 { + regulator-compatible = "LDO11"; + regulator-name = "VABB1_1.95V"; + regulator-min-microvolt = <1950000>; + regulator-max-microvolt = <1950000>; + regulator-always-on; + regulator-mem-off; + }; + + ldo12_reg: ldo12 { + regulator-compatible = "LDO12"; + regulator-name = "VUOTG_3.0V"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-mem-off; + }; + + ldo13_reg: ldo13 { + regulator-compatible = "LDO13"; + regulator-name = "NFC_AVDD_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-idle; + }; + + ldo14_reg: ldo14 { + regulator-compatible = "LDO14"; + regulator-name = "VABB2_1.95V"; + regulator-min-microvolt = <1950000>; + regulator-max-microvolt = <1950000>; + regulator-always-on; + regulator-mem-off; + }; + + ldo15_reg: ldo15 { + regulator-compatible = "LDO15"; + regulator-name = "VHSIC_1.0V"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-mem-off; + }; + + ldo16_reg: ldo16 { + regulator-compatible = "LDO16"; + regulator-name = "VHSIC_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-off; + }; + + ldo17_reg: ldo17 { + regulator-compatible = "LDO17"; + regulator-name = "CAM_SENSOR_CORE_1.2V"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-mem-idle; + }; + + ldo18_reg: ldo18 { + regulator-compatible = "LDO18"; + regulator-name = "CAM_ISP_SEN_IO_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-idle; + }; + + ldo19_reg: ldo19 { + regulator-compatible = "LDO19"; + regulator-name = "VT_CAM_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-idle; + }; + + ldo20_reg: ldo20 { + regulator-compatible = "LDO20"; + regulator-name = "VDDQ_PRE_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-idle; + }; + + ldo21_reg: ldo21 { + regulator-compatible = "LDO21"; + regulator-name = "VTF_2.8V"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-mem-idle; + }; + + ldo22_reg: ldo22 { + regulator-compatible = "LDO22"; + regulator-name = "VMEM_VDD_2.8V"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + regulator-mem-off; + }; + + ldo23_reg: ldo23 { + regulator-compatible = "LDO23"; + regulator-name = "TSP_AVDD_3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-mem-idle; + }; + + ldo24_reg: ldo24 { + regulator-compatible = "LDO24"; + regulator-name = "TSP_VDD_1.8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-mem-idle; + }; + + ldo25_reg: ldo25 { + regulator-compatible = "LDO25"; + regulator-name = "LCD_VCC_3.3V"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-mem-idle; + }; + + ldo26_reg: ldo26 { + regulator-compatible = "LDO26"; + regulator-name = "MOTOR_VCC_3.0V"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-mem-idle; + }; + + buck1_reg: buck1 { + regulator-compatible = "BUCK1"; + regulator-name = "vdd_mif"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1100000>; + regulator-always-on; + regulator-boot-on; + regulator-mem-off; + }; + + buck2_reg: buck2 { + regulator-compatible = "BUCK2"; + regulator-name = "vdd_arm"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1500000>; + regulator-always-on; + regulator-boot-on; + regulator-mem-off; + }; + + buck3_reg: buck3 { + regulator-compatible = "BUCK3"; + regulator-name = "vdd_int"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1150000>; + regulator-always-on; + regulator-boot-on; + regulator-mem-off; + }; + + buck4_reg: buck4 { + regulator-compatible = "BUCK4"; + regulator-name = "vdd_g3d"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1150000>; + regulator-boot-on; + regulator-mem-off; + }; + + buck5_reg: buck5 { + regulator-compatible = "BUCK5"; + regulator-name = "VMEM_1.2V_AP"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + }; + + buck6_reg: buck6 { + regulator-compatible = "BUCK6"; + regulator-name = "VCC_SUB_1.35V"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + }; + + buck7_reg: buck7 { + regulator-compatible = "BUCK7"; + regulator-name = "VCC_SUB_2.0V"; + regulator-min-microvolt = <2000000>; + regulator-max-microvolt = <2000000>; + regulator-always-on; + }; + + buck8_reg: buck8 { + regulator-compatible = "BUCK8"; + regulator-name = "VMEM_VDDF_3.0V"; + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + regulator-always-on; + regulator-mem-off; + }; + + buck9_reg: buck9 { + regulator-compatible = "BUCK9"; + regulator-name = "CAM_ISP_CORE_1.2V"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1200000>; + regulator-mem-off; + }; + }; + }; + }; + + fimd@11c00000 { + compatible = "samsung,exynos-fimd"; + reg = <0x11c00000 0xa4>; + + samsung,vl-freq = <60>; + samsung,vl-col = <720>; + samsung,vl-row = <1280>; + samsung,vl-width = <720>; + samsung,vl-height = <1280>; + + samsung,vl-clkp = <0>; + samsung,vl-oep = <0>; + samsung,vl-hsp = <1>; + samsung,vl-vsp = <1>; + samsung,vl-dp = <1>; + samsung,vl-bpix = <4>; + + samsung,vl-hspw = <5>; + samsung,vl-hbpd = <10>; + samsung,vl-hfpd = <10>; + samsung,vl-vspw = <2>; + samsung,vl-vbpd = <1>; + samsung,vl-vfpd = <13>; + samsung,vl-cmd-allow-len = <0xf>; + + samsung,winid = <0>; + samsung,power-on-delay = <30>; + samsung,interface-mode = <1>; + samsung,mipi-enabled = <1>; + samsung,dp-enabled; + samsung,dual-lcd-enabled; + + samsung,logo-on = <1>; + samsung,resolution = <0>; + samsung,rgb-mode = <0>; + }; + + mipidsi@11c80000 { + compatible = "samsung,exynos-mipi-dsi"; + reg = <0x11c80000 0x5c>; + + samsung,dsim-config-e_interface = <1>; + samsung,dsim-config-e_virtual_ch = <0>; + samsung,dsim-config-e_pixel_format = <7>; + samsung,dsim-config-e_burst_mode = <1>; + samsung,dsim-config-e_no_data_lane = <3>; + samsung,dsim-config-e_byte_clk = <0>; + samsung,dsim-config-hfp = <1>; + + samsung,dsim-config-p = <3>; + samsung,dsim-config-m = <120>; + samsung,dsim-config-s = <1>; + + samsung,dsim-config-pll_stable_time = <500>; + samsung,dsim-config-esc_clk = <20000000>; + samsung,dsim-config-stop_holding_cnt = <0x7ff>; + samsung,dsim-config-bta_timeout = <0xff>; + samsung,dsim-config-rx_timeout = <0xffff>; + + samsung,dsim-device-id = <0xffffffff>; + samsung,dsim-device-bus_id = <0>; + + samsung,dsim-device-reverse_panel = <1>; + }; + + sdhci@12510000 { + samsung,bus-width = <8>; + samsung,timing = <1 3 3>; + pwr-gpios = <&gpio 0x2004002 0>; + }; + + sdhci@12520000 { + status = "disabled"; + }; + + sdhci@12530000 { + samsung,bus-width = <4>; + samsung,timing = <1 2 3>; + cd-gpios = <&gpio 0x20C6004 0>; + }; + + sdhci@12540000 { + status = "disabled"; + }; +}; diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index c17c24d..108d0f8 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -8,13 +8,6 @@ #include <common.h> #include <lcd.h> -#include <asm/io.h> -#include <asm/arch/gpio.h> -#include <asm/arch/mmc.h> -#include <asm/arch/power.h> -#include <asm/arch/clk.h> -#include <asm/arch/clock.h> -#include <asm/arch/mipi_dsim.h> #include <asm/arch/pinmux.h> #include <asm/arch/power.h> #include <power/pmic.h> @@ -23,7 +16,6 @@ #include <power/max77693_pmic.h> #include <power/max77693_muic.h> #include <power/max77693_fg.h> -#include <libtizen.h> #include <errno.h> #include <usb.h> #include <usb/s3c_udc.h> @@ -69,16 +61,6 @@ static void check_hw_revision(void) board_rev = modelrev << 8; } -#ifdef CONFIG_DISPLAY_BOARDINFO -int checkboard(void) -{ - puts("Board:\tTRATS2\n"); - printf("HW Revision:\t0x%04x\n", board_rev); - - return 0; -} -#endif - u32 get_board_rev(void) { return board_rev; @@ -158,26 +140,21 @@ int get_soft_i2c_sda_pin(void) int board_early_init_f(void) { - check_hw_revision(); board_external_gpio_init(); - gd->flags |= GD_FLG_DISABLE_CONSOLE; +#ifdef CONFIG_SYS_I2C_INIT_BOARD + board_i2c_init(gd->fdt_blob); +#endif return 0; } static int pmic_init_max77686(void); -int board_init(void) +int exynos_init(void) { - struct exynos4_power *pwr = - (struct exynos4_power *)samsung_get_base_power(); - - gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; - - /* workaround: clear INFORM4..5 */ - writel(0, (unsigned int)&pwr->inform4); - writel(0, (unsigned int)&pwr->inform5); + check_hw_revision(); + printf("HW Revision:\t0x%04x\n", board_rev); return 0; } @@ -248,90 +225,6 @@ int power_init_board(void) return 0; } -int dram_init(void) -{ - u32 size_mb; - - size_mb = (get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) + - get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE) + - get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE) + - get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE)) >> 20; - - gd->ram_size = size_mb << 20; - - return 0; -} - -void dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - gd->bd->bi_dram[1].start = PHYS_SDRAM_2; - gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; - gd->bd->bi_dram[2].start = PHYS_SDRAM_3; - gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; - gd->bd->bi_dram[3].start = PHYS_SDRAM_4; - gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; -} - -int board_mmc_init(bd_t *bis) -{ - int err0, err2 = 0; - - gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2(); - - /* eMMC_EN: SD_0_CDn: GPK0[2] Output High */ - s5p_gpio_direction_output(&gpio2->k0, 2, 1); - s5p_gpio_set_pull(&gpio2->k0, 2, GPIO_PULL_NONE); - - /* - * eMMC GPIO: - * SDR 8-bit@48MHz at MMC0 - * GPK0[0] SD_0_CLK(2) - * GPK0[1] SD_0_CMD(2) - * GPK0[2] SD_0_CDn -> Not used - * GPK0[3:6] SD_0_DATA[0:3](2) - * GPK1[3:6] SD_0_DATA[0:3](3) - * - * DDR 4-bit@26MHz at MMC4 - * GPK0[0] SD_4_CLK(3) - * GPK0[1] SD_4_CMD(3) - * GPK0[2] SD_4_CDn -> Not used - * GPK0[3:6] SD_4_DATA[0:3](3) - * GPK1[3:6] SD_4_DATA[4:7](4) - */ - - err0 = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE); - - /* - * MMC device init - * mmc0 : eMMC (8-bit buswidth) - * mmc2 : SD card (4-bit buswidth) - */ - if (err0) - debug("SDMMC0 not configured\n"); - else - err0 = s5p_mmc_init(0, 8); - - /* T-flash detect */ - s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf); - s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP); - - /* - * Check the T-flash detect pin - * GPX3[4] T-flash detect pin - */ - if (!s5p_gpio_get_value(&gpio2->x3, 4)) { - err2 = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); - if (err2) - debug("SDMMC2 not configured\n"); - else - err2 = s5p_mmc_init(2, 4); - } - - return err0 & err2; -} - #ifdef CONFIG_USB_GADGET static int s5pc210_phy_control(int on) { @@ -479,46 +372,7 @@ static int pmic_init_max77686(void) */ #ifdef CONFIG_LCD -static struct mipi_dsim_config dsim_config = { - .e_interface = DSIM_VIDEO, - .e_virtual_ch = DSIM_VIRTUAL_CH_0, - .e_pixel_format = DSIM_24BPP_888, - .e_burst_mode = DSIM_BURST_SYNC_EVENT, - .e_no_data_lane = DSIM_DATA_LANE_4, - .e_byte_clk = DSIM_PLL_OUT_DIV8, - .hfp = 1, - - .p = 3, - .m = 120, - .s = 1, - - /* D-PHY PLL stable time spec :min = 200usec ~ max 400usec */ - .pll_stable_time = 500, - - /* escape clk : 10MHz */ - .esc_clk = 20 * 1000000, - - /* stop state holding counter after bta change count 0 ~ 0xfff */ - .stop_holding_cnt = 0x7ff, - /* bta timeout 0 ~ 0xff */ - .bta_timeout = 0xff, - /* lp rx timeout 0 ~ 0xffff */ - .rx_timeout = 0xffff, -}; - -static struct exynos_platform_mipi_dsim dsim_platform_data = { - .lcd_panel_info = NULL, - .dsim_config = &dsim_config, -}; - -static struct mipi_dsim_lcd_device mipi_lcd_device = { - .name = "s6e8ax0", - .id = -1, - .bus_id = 0, - .platform_data = (void *)&dsim_platform_data, -}; - -static int mipi_power(void) +int mipi_power(void) { struct pmic *p = pmic_get("MAX77686_PMIC"); @@ -555,62 +409,6 @@ void exynos_reset_lcd(void) udelay(10); s5p_gpio_set_value(&gpio1->f2, 1, 1); } - -vidinfo_t panel_info = { - .vl_freq = 60, - .vl_col = 720, - .vl_row = 1280, - .vl_width = 720, - .vl_height = 1280, - .vl_clkp = CONFIG_SYS_HIGH, - .vl_hsp = CONFIG_SYS_LOW, - .vl_vsp = CONFIG_SYS_LOW, - .vl_dp = CONFIG_SYS_LOW, - .vl_bpix = 4, /* Bits per pixel, 2^4 = 16 */ - - /* s6e8ax0 Panel infomation */ - .vl_hspw = 5, - .vl_hbpd = 10, - .vl_hfpd = 10, - - .vl_vspw = 2, - .vl_vbpd = 1, - .vl_vfpd = 13, - .vl_cmd_allow_len = 0xf, - .mipi_enabled = 1, - - .dual_lcd_enabled = 0, - - .init_delay = 0, - .power_on_delay = 25, - .reset_delay = 0, - .interface_mode = FIMD_RGB_INTERFACE, -}; - -void init_panel_info(vidinfo_t *vid) -{ - vid->logo_on = 1; - vid->resolution = HD_RESOLUTION; - vid->rgb_mode = MODE_RGB_P; - - vid->power_on_delay = 30; - - mipi_lcd_device.reverse_panel = 1; - -#ifdef CONFIG_TIZEN - get_tizen_logo_info(vid); -#endif - - strcpy(dsim_platform_data.lcd_panel_name, mipi_lcd_device.name); - dsim_platform_data.mipi_power = mipi_power; - dsim_platform_data.phy_enable = set_mipi_phy_ctrl; - dsim_platform_data.lcd_panel_info = (void *)vid; - exynos_mipi_dsi_register_lcd_device(&mipi_lcd_device); - - s6e8ax0_init(); - - exynos_set_dsim_platform_data(&dsim_platform_data); -} #endif /* LCD */ #ifdef CONFIG_MISC_INIT_R diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 28270fe..0ac885a 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -8,147 +8,32 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_H -#define __CONFIG_H +#ifndef __CONFIG_TRATS2_H +#define __CONFIG_TRATS2_H -/* - * High Level Configuration Options - * (easy to change) - */ -#define CONFIG_SAMSUNG /* in a SAMSUNG core */ -#define CONFIG_S5P /* which is in a S5P Family */ -#define CONFIG_EXYNOS4 /* which is in a EXYNOS4XXX */ -#define CONFIG_TIZEN /* TIZEN lib */ - -#include <asm/arch/cpu.h> /* get chip and board defs */ +#include <configs/exynos4-dt.h> -#define CONFIG_ARCH_CPU_INIT -#define CONFIG_DISPLAY_CPUINFO -#define CONFIG_DISPLAY_BOARDINFO - -#define CONFIG_SKIP_LOWLEVEL_INIT - -#define CONFIG_SYS_CACHELINE_SIZE 32 +#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ -#ifndef CONFIG_SYS_L2CACHE_OFF -#define CONFIG_SYS_L2_PL310 -#define CONFIG_SYS_PL310_BASE 0x10502000 -#endif +#undef CONFIG_DEFAULT_DEVICE_TREE +#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-trats2 -#define CONFIG_NR_DRAM_BANKS 4 -#define PHYS_SDRAM_1 0x40000000 /* LDDDR2 DMC 0 */ -#define PHYS_SDRAM_1_SIZE (256 << 20) /* 256 MB in CS 0 */ -#define PHYS_SDRAM_2 0x50000000 /* LPDDR2 DMC 1 */ -#define PHYS_SDRAM_2_SIZE (256 << 20) /* 256 MB in CS 0 */ -#define PHYS_SDRAM_3 0x60000000 /* LPDDR2 DMC 1 */ -#define PHYS_SDRAM_3_SIZE (256 << 20) /* 256 MB in CS 0 */ -#define PHYS_SDRAM_4 0x70000000 /* LPDDR2 DMC 1 */ -#define PHYS_SDRAM_4_SIZE (256 << 20) /* 256 MB in CS 0 */ -#define PHYS_SDRAM_END 0x80000000 +/* TRATS2 has 4 banks of DRAM */ +#define CONFIG_NR_DRAM_BANKS 4 +#define CONFIG_SYS_SDRAM_BASE 0x40000000 +#define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ +/* memtest works on */ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000) +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) -#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) #define CONFIG_SYS_TEXT_BASE 0x78100000 -#define CONFIG_SYS_CLK_FREQ 24000000 - -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG - -/* MACH_TYPE_TRATS2 */ -#define MACH_TYPE_TRATS2 3765 -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS2 - -#define CONFIG_DISPLAY_CPUINFO - -#include <asm/sizes.h> -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M)) - -/* select serial console configuration */ -#define CONFIG_SERIAL2 - -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " - -#define CONFIG_CMDLINE_EDITING - -#define CONFIG_BAUDRATE 115200 - -/* It should define before config_cmd_default.h */ -#define CONFIG_SYS_NO_FLASH - -/*********************************************************** - * Command definition - ***********************************************************/ -#include <config_cmd_default.h> - -#undef CONFIG_CMD_ECHO -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_FLASH -#undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_NAND -#undef CONFIG_CMD_MISC -#undef CONFIG_CMD_NFS -#undef CONFIG_CMD_SOURCE -#undef CONFIG_CMD_XIMG -#define CONFIG_CMD_CACHE -#define CONFIG_CMD_I2C -#define CONFIG_CMD_MMC -#define CONFIG_CMD_DFU -#define CONFIG_CMD_GPT -#define CONFIG_CMD_PMIC - -#define CONFIG_BOOTDELAY 3 -#define CONFIG_ZERO_BOOTDELAY_CHECK - -#define CONFIG_CMD_FAT -#define CONFIG_FAT_WRITE - -/* EXT4 */ -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_EXT4_WRITE - -/* USB Composite download gadget - g_dnl */ -#define CONFIG_USBDOWNLOAD_GADGET -#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M -#define CONFIG_DFU_FUNCTION -#define CONFIG_DFU_MMC - -/* TIZEN THOR downloader support */ -#define CONFIG_CMD_THOR_DOWNLOAD -#define CONFIG_THOR_FUNCTION - -/* USB Samsung's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM -#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D -#define CONFIG_G_DNL_MANUFACTURER "Samsung" - -/* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */ -#undef CONFIG_CMD_NET - -/* MMC */ -#define CONFIG_GENERIC_MMC -#define CONFIG_MMC -#define CONFIG_S5P_SDHCI -#define CONFIG_SDHCI -#define CONFIG_MMC_SDMA -#define CONFIG_MMC_DEFAULT_DEV 0 - -/* PWM */ -#define CONFIG_PWM - -#define CONFIG_BOOTARGS "Please use defined boot" -#define CONFIG_BOOTCOMMAND "run mmcboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" +#define CONFIG_BOOTARGS "Please use defined boot" +#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_CONSOLE_INFO_QUIET -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -240,46 +125,6 @@ "setenv spl_addr_tmp;\0" \ "fdtaddr=40800000\0" \ -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ -#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ -#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ - -/* Boot Argument Buffer Size */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - -/* memtest works on */ -#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) - -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - - GENERATED_GBL_DATA_SIZE) - -/* valid baudrates */ -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CONFIG_SYS_MONITOR_BASE 0x00000000 - -/*----------------------------------------------------------------------- - * FLASH and environment organization - */ - -#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ - -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV -#define CONFIG_ENV_SIZE 4096 -#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ -#define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS - -#define CONFIG_BOARD_EARLY_INIT_F - /* I2C */ #include <asm/arch/gpio.h> @@ -312,11 +157,6 @@ int get_soft_i2c_sda_pin(void); #define CONFIG_POWER_MUIC_MAX77693 #define CONFIG_POWER_FG_MAX77693 #define CONFIG_POWER_BATTERY_TRATS2 -#define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_S3C_UDC_OTG -#define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_USB_CABLE_CHECK /* Common misc for Samsung */ #define CONFIG_MISC_COMMON @@ -356,10 +196,7 @@ int get_soft_i2c_sda_pin(void); #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) -#define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE - -/* Pass open firmware flat tree */ -#define CONFIG_OF_LIBFDT 1 +#define LCD_XRES 720 +#define LCD_YRES 1280 #endif /* __CONFIG_H */