On 07/04/2014 05:08 PM, Przemyslaw Marczak wrote: > On 07/04/2014 08:07 AM, Jaehoon Chung wrote: >> On 07/02/2014 08:50 PM, Przemyslaw Marczak wrote: >>> This board file supports standard features of Odroid X2 and U3 boards: >>> - Exynos4412 core clock set to 1000MHz and MPLL peripherial clock set to >>> 800MHz, >>> - MAX77686 power regulator, >>> - USB PHY, >>> - enable XCL205 - power for board peripherials >>> - check board type: U3 or X2. >>> - enable Odroid U3 FAN cooler >>> >>> Signed-off-by: Przemyslaw Marczak <p.marc...@samsung.com> >>> Cc: Minkyu Kang <mk7.k...@samsung.com> >>> Cc: Tom Rini <tr...@ti.com> >>> >>> --- >>> Changes v2: >>> - enable fan on odroid U3 >>> >>> Changes v3: >>> - odroid.c: clean up board name related code >>> - odroid.c: remove static from set_board_type() >>> - odroid.c: add implementation of functions: get_dfu_alt_* >>> - odroid.c: include misc.h >>> >>> Changes v4: >>> odroid.c: dfu_get_alt_boot: add call get_boot_mode() >>> --- >>> board/samsung/odroid/Makefile | 8 + >>> board/samsung/odroid/odroid.c | 466 >>> ++++++++++++++++++++++++++++++++++++++++++ >>> board/samsung/odroid/setup.h | 227 ++++++++++++++++++++ >>> 3 files changed, 701 insertions(+) >>> create mode 100644 board/samsung/odroid/Makefile >>> create mode 100644 board/samsung/odroid/odroid.c >>> create mode 100644 board/samsung/odroid/setup.h >>> >>> diff --git a/board/samsung/odroid/Makefile b/board/samsung/odroid/Makefile >>> new file mode 100644 >>> index 0000000..b98aaeb >>> --- /dev/null >>> +++ b/board/samsung/odroid/Makefile >>> @@ -0,0 +1,8 @@ >>> +# >>> +# Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved. >>> +# Przemyslaw Marczak <p.marc...@samsung.com> >>> +# >>> +# SPDX-License-Identifier: GPL-2.0+ >>> +# >>> + >>> +obj-y := odroid.o >>> diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c >>> new file mode 100644 >>> index 0000000..28706af >>> --- /dev/null >>> +++ b/board/samsung/odroid/odroid.c >>> @@ -0,0 +1,466 @@ >>> +/* >>> + * Copyright (C) 2014 Samsung Electronics >>> + * Przemyslaw Marczak <p.marc...@samsung.com> >>> + * >>> + * SPDX-License-Identifier: GPL-2.0+ >>> + */ >>> + >>> +#include <common.h> >>> +#include <asm/arch/pinmux.h> >>> +#include <asm/arch/power.h> >>> +#include <asm/arch/clock.h> >>> +#include <asm/arch/gpio.h> >>> +#include <asm/gpio.h> >>> +#include <asm/arch/cpu.h> >>> +#include <power/pmic.h> >>> +#include <power/max77686_pmic.h> >>> +#include <errno.h> >>> +#include <usb.h> >>> +#include <usb/s3c_udc.h> >>> +#include <samsung/misc.h> >>> +#include "setup.h" >>> + >>> +DECLARE_GLOBAL_DATA_PTR; >>> + >>> +#ifdef CONFIG_BOARD_TYPES >>> +/* Odroid board types */ >>> +enum { >>> + ODROID_TYPE_U3, >>> + ODROID_TYPE_X2, >>> +}; >>> + >>> +void set_board_type(void) >>> +{ >>> + int val; >>> + >>> + /* Check GPC1 pin 2 */ >>> + gpio_set_pull(EXYNOS4X12_GPIO_C12, S5P_GPIO_PULL_NONE); >>> + gpio_set_drv(EXYNOS4X12_GPIO_C12, S5P_GPIO_DRV_4X); >>> + gpio_direction_input(EXYNOS4X12_GPIO_C12); >>> + >>> + /* XCL205 - needs some latch time */ >>> + mdelay(10); >>> + >>> + /* Check GPC1 pin2 - LED supplied by XCL205 - X2 only */ >>> + val = gpio_get_value(EXYNOS4X12_GPIO_C12); >>> + if (val) >> val is unnecessary. "int val" can be removed. >> if (gpio_get_value(EXYNS4x12_GPIO_C12)) >> .... >> > ok >>> + gd->board_type = ODROID_TYPE_X2; >>> + else >>> + gd->board_type = ODROID_TYPE_U3; >>> +} >>> + >>> +const char *get_board_name(void) >>> +{ >>> + const char *board_name = "odroid"; >> Is there other approach or general method for getting board name? >> > Actually, the board name is the same as CONFIG_SYS_BOARD, but we are going to > have only one binary for Exynos 4 boards in the future - so such function is > welcome. We can also put this into the dts file.
In future...Then using dt-file would be better than this. :) Best Regards, Jaehoon Chung > >>> + >>> + return board_name; >>> +} >>> + >>> +const char *get_board_type(void) >>> +{ >>> + const char *board_type[] = {"u3", "x2"}; >>> + >>> + return board_type[gd->board_type]; >>> +} >>> +#endif >>> + >>> +#ifdef CONFIG_SET_DFU_ALT_INFO >>> +char *get_dfu_alt_system(void) >>> +{ >>> + return getenv("dfu_alt_system"); >>> +} >>> + >>> +char *get_dfu_alt_boot(void) >>> +{ >>> + char *alt_boot = NULL; >>> + >>> + switch (get_boot_mode()) { >>> + case BOOT_MODE_MMC: >>> + alt_boot = CONFIG_DFU_ALT_BOOT_SD; >>> + break; >>> + default: >>> + alt_boot = CONFIG_DFU_ALT_BOOT_EMMC; >>> + break; >>> + } >>> + >>> + if (!alt_boot) >>> + return NULL; >> >> Is it need? alt_boot is set to CONFIG_DFU_ALT_BOOT_EMMC by default, isn't? >> CONFIG_DFU_ALT_BOOT_EMMC is 0? >> > Oops, right. I must fix that. >>> + >>> + setenv("dfu_alt_boot", alt_boot); >>> + >>> + return alt_boot; >>> +} >>> +#endif >>> + >>> +static void board_clock_init(void) >>> +{ >>> + unsigned int set, clr, clr_src_cpu, clr_pll_con0, clr_src_dmc; >>> + struct exynos4x12_clock *clk = (struct exynos4x12_clock *) >>> + samsung_get_base_clock(); >>> + >>> + /* >>> + * CMU_CPU clocks src to MPLL >>> + * Bit values: 0 ; 1 >>> + * MUX_APLL_SEL: FIN_PLL ; FOUT_APLL >>> + * MUX_CORE_SEL: MOUT_APLL ; SCLK_MPLL >>> + * MUX_HPM_SEL: MOUT_APLL ; SCLK_MPLL_USER_C >>> + * MUX_MPLL_USER_SEL_C: FIN_PLL ; SCLK_MPLL >>> + */ >>> + clr_src_cpu = MUX_APLL_SEL(0x1) | MUX_CORE_SEL(0x1) | >>> + MUX_HPM_SEL(0x1) | MUX_MPLL_USER_SEL_C(0x1); >>> + set = MUX_APLL_SEL(0) | MUX_CORE_SEL(1) | MUX_HPM_SEL(1) | >>> + MUX_MPLL_USER_SEL_C(1); >> 0x1 or 1? you can use it consistency. MUX_APLL_SEL(1) or MUX_APLL_SEL(0x1). >> > ok, will be fixed. >>> + >>> + clrsetbits_le32(&clk->src_cpu, clr_src_cpu, set); >>> + >>> + /* Wait for mux change */ >>> + while (readl(&clk->mux_stat_cpu) & MUX_STAT_CPU_CHANGING) >>> + continue; >>> + >>> + /* Set APLL to 1000MHz */ >>> + clr_pll_con0 = SDIV(0x7) | PDIV(0x3f) | MDIV(0x3ff) | FSEL(0x1); >>> + set = SDIV(0) | PDIV(3) | MDIV(125) | FSEL(1); >>> + >>> + clrsetbits_le32(&clk->apll_con0, clr_pll_con0, set); >>> + >>> + /* Wait for PLL to be locked */ >>> + while (!(readl(&clk->apll_con0) & PLL_LOCKED_BIT)) >>> + continue; >>> + >>> + /* Set CMU_CPU clocks src to APLL */ >>> + set = MUX_APLL_SEL(1) | MUX_CORE_SEL(0) | MUX_HPM_SEL(0) | >>> + MUX_MPLL_USER_SEL_C(1); >>> + clrsetbits_le32(&clk->src_cpu, clr_src_cpu, set); >>> + >>> + /* Wait for mux change */ >>> + while (readl(&clk->mux_stat_cpu) & MUX_STAT_CPU_CHANGING) >>> + continue; >>> + >>> + set = CORE_RATIO(0) | COREM0_RATIO(2) | COREM1_RATIO(5) | >>> + PERIPH_RATIO(0) | ATB_RATIO(4) | PCLK_DBG_RATIO(1) | >>> + APLL_RATIO(0) | CORE2_RATIO(0); >>> + /* >>> + * Set dividers for MOUTcore = 1000 MHz >>> + * coreout = MOUT / (ratio + 1) = 1000 MHz (0) >>> + * corem0 = armclk / (ratio + 1) = 333 MHz (2) >>> + * corem1 = armclk / (ratio + 1) = 166 MHz (5) >>> + * periph = armclk / (ratio + 1) = 1000 MHz (0) >>> + * atbout = MOUT / (ratio + 1) = 200 MHz (4) >>> + * pclkdbgout = atbout / (ratio + 1) = 100 MHz (1) >>> + * sclkapll = MOUTapll / (ratio + 1) = 1000 MHz (0) >>> + * core2out = core_out / (ratio + 1) = 1000 MHz (0) (armclk) >>> + */ >>> + clr = CORE_RATIO(0x7) | COREM0_RATIO(0x7) | COREM1_RATIO(0x7) | >>> + PERIPH_RATIO(0x7) | ATB_RATIO(0x7) | PCLK_DBG_RATIO(0x7) | >>> + APLL_RATIO(0x7) | CORE2_RATIO(0x7); >>> + >>> + clrsetbits_le32(&clk->div_cpu0, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_cpu0) & DIV_STAT_CPU0_CHANGING) >>> + continue; >>> + >>> + /* >>> + * For MOUThpm = 1000 MHz (MOUTapll) >>> + * doutcopy = MOUThpm / (ratio + 1) = 200 (4) >>> + * sclkhpm = doutcopy / (ratio + 1) = 200 (4) >>> + * cores_out = armclk / (ratio + 1) = 1000 (0) >>> + */ >>> + clr = COPY_RATIO(0x7) | HPM_RATIO(0x7) | CORES_RATIO(0x7); >>> + set = COPY_RATIO(4) | HPM_RATIO(4) | CORES_RATIO(0); >>> + >>> + clrsetbits_le32(&clk->div_cpu1, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_cpu1) & DIV_STAT_CPU1_CHANGING) >>> + continue; >>> + >>> + /* >>> + * Set CMU_DMC clocks src to APLL >>> + * Bit values: 0 ; 1 >>> + * MUX_C2C_SEL: SCLKMPLL ; SCLKAPLL >>> + * MUX_DMC_BUS_SEL: SCLKMPLL ; SCLKAPLL >>> + * MUX_DPHY_SEL: SCLKMPLL ; SCLKAPLL >>> + * MUX_MPLL_SEL: FINPLL ; MOUT_MPLL_FOUT >>> + * MUX_PWI_SEL: 0110 (MPLL); 0111 (EPLL); 1000 (VPLL); 0(XXTI) >>> + * MUX_G2D_ACP0_SEL: SCLKMPLL ; SCLKAPLL >>> + * MUX_G2D_ACP1_SEL: SCLKEPLL ; SCLKVPLL >>> + * MUX_G2D_ACP_SEL: OUT_ACP0 ; OUT_ACP1 >>> + */ >>> + clr_src_dmc = MUX_C2C_SEL(0x1) | MUX_DMC_BUS_SEL(0x1) | >>> + MUX_DPHY_SEL(0x1) | MUX_MPLL_SEL(0x1) | >>> + MUX_PWI_SEL(0xf) | MUX_G2D_ACP0_SEL(0x1) | >>> + MUX_G2D_ACP1_SEL(0x1) | MUX_G2D_ACP_SEL(0x1); >>> + set = MUX_C2C_SEL(1) | MUX_DMC_BUS_SEL(1) | MUX_DPHY_SEL(1) | >>> + MUX_MPLL_SEL(0) | MUX_PWI_SEL(0) | MUX_G2D_ACP0_SEL(1) | >>> + MUX_G2D_ACP1_SEL(1) | MUX_G2D_ACP_SEL(1); >>> + >>> + clrsetbits_le32(&clk->src_dmc, clr_src_dmc, set); >>> + >>> + /* Wait for mux change */ >>> + while (readl(&clk->mux_stat_dmc) & MUX_STAT_DMC_CHANGING) >>> + continue; >>> + >>> + /* Set MPLL to 800MHz */ >>> + set = SDIV(0) | PDIV(3) | MDIV(100) | FSEL(0) | PLL_ENABLE(1); >>> + >>> + clrsetbits_le32(&clk->mpll_con0, clr_pll_con0, set); >>> + >>> + /* Wait for PLL to be locked */ >>> + while (!(readl(&clk->mpll_con0) & PLL_LOCKED_BIT)) >>> + continue; >>> + >>> + /* Switch back CMU_DMC mux */ >>> + set = MUX_C2C_SEL(0) | MUX_DMC_BUS_SEL(0) | MUX_DPHY_SEL(0) | >>> + MUX_MPLL_SEL(1) | MUX_PWI_SEL(8) | MUX_G2D_ACP0_SEL(0) | >>> + MUX_G2D_ACP1_SEL(0) | MUX_G2D_ACP_SEL(0); >>> + >>> + clrsetbits_le32(&clk->src_dmc, clr_src_dmc, set); >>> + >>> + /* Wait for mux change */ >>> + while (readl(&clk->mux_stat_dmc) & MUX_STAT_DMC_CHANGING) >>> + continue; >>> + >>> + /* CLK_DIV_DMC0 */ >>> + clr = ACP_RATIO(0x7) | ACP_PCLK_RATIO(0x7) | DPHY_RATIO(0x7) | >>> + DMC_RATIO(0x7) | DMCD_RATIO(0x7) | DMCP_RATIO(0x7); >>> + /* >>> + * For: >>> + * MOUTdmc = 800 MHz >>> + * MOUTdphy = 800 MHz >>> + * >>> + * aclk_acp = MOUTdmc / (ratio + 1) = 200 (3) >>> + * pclk_acp = aclk_acp / (ratio + 1) = 100 (1) >>> + * sclk_dphy = MOUTdphy / (ratio + 1) = 400 (1) >>> + * sclk_dmc = MOUTdmc / (ratio + 1) = 400 (1) >>> + * aclk_dmcd = sclk_dmc / (ratio + 1) = 200 (1) >>> + * aclk_dmcp = aclk_dmcd / (ratio + 1) = 100 (1) >>> + */ >>> + set = ACP_RATIO(3) | ACP_PCLK_RATIO(1) | DPHY_RATIO(1) | >>> + DMC_RATIO(1) | DMCD_RATIO(1) | DMCP_RATIO(1); >>> + >>> + clrsetbits_le32(&clk->div_dmc0, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_dmc0) & DIV_STAT_DMC0_CHANGING) >>> + continue; >>> + >>> + /* CLK_DIV_DMC1 */ >>> + clr = G2D_ACP_RATIO(0xf) | C2C_RATIO(0x7) | PWI_RATIO(0xf) | >>> + C2C_ACLK_RATIO(0x7) | DVSEM_RATIO(0x7f) | DPM_RATIO(0x7f); >>> + /* >>> + * For: >>> + * MOUTg2d = 800 MHz >>> + * MOUTc2c = 800 Mhz >>> + * MOUTpwi = 108 MHz >>> + * >>> + * sclk_g2d_acp = MOUTg2d / (ratio + 1) = 400 (1) >>> + * sclk_c2c = MOUTc2c / (ratio + 1) = 400 (1) >>> + * aclk_c2c = sclk_c2c / (ratio + 1) = 200 (1) >>> + * sclk_pwi = MOUTpwi / (ratio + 1) = 18 (5) >>> + */ >>> + set = G2D_ACP_RATIO(1) | C2C_RATIO(1) | PWI_RATIO(5) | >>> + C2C_ACLK_RATIO(1) | DVSEM_RATIO(1) | DPM_RATIO(1); >>> + >>> + clrsetbits_le32(&clk->div_dmc1, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_dmc1) & DIV_STAT_DMC1_CHANGING) >>> + continue; >>> + >>> + /* CLK_SRC_PERIL0 */ >>> + clr = UART0_SEL(0xf) | UART1_SEL(0xf) | UART2_SEL(0xf) | >>> + UART3_SEL(0xf) | UART4_SEL(0xf); >>> + /* >>> + * Set CLK_SRC_PERIL0 clocks src to MPLL >>> + * src values: 0(XXTI); 1(XusbXTI); 2(SCLK_HDMI24M); 3(SCLK_USBPHY0); >>> + * 5(SCLK_HDMIPHY); 6(SCLK_MPLL_USER_T); 7(SCLK_EPLL); >>> + * 8(SCLK_VPLL) >>> + * >>> + * Set all to SCLK_MPLL_USER_T >>> + */ >>> + set = UART0_SEL(6) | UART1_SEL(6) | UART2_SEL(6) | UART3_SEL(6) | >>> + UART4_SEL(6); >>> + >>> + clrsetbits_le32(&clk->src_peril0, clr, set); >>> + >>> + /* CLK_DIV_PERIL0 */ >>> + clr = UART0_RATIO(0xf) | UART1_RATIO(0xf) | UART2_RATIO(0xf) | >>> + UART3_RATIO(0xf) | UART4_RATIO(0xf); >>> + /* >>> + * For MOUTuart0-4: 800MHz >>> + * >>> + * SCLK_UARTx = MOUTuartX / (ratio + 1) = 100 (7) >>> + */ >>> + set = UART0_RATIO(7) | UART1_RATIO(7) | UART2_RATIO(7) | >>> + UART3_RATIO(7) | UART4_RATIO(7); >>> + >>> + clrsetbits_le32(&clk->div_peril0, clr, set); >>> + >>> + while (readl(&clk->div_stat_peril0) & DIV_STAT_PERIL0_CHANGING) >>> + continue; >>> + >>> + /* CLK_DIV_FSYS1 */ >>> + clr = MMC0_RATIO(0xf) | MMC0_PRE_RATIO(0xff) | MMC1_RATIO(0xf) | >>> + MMC1_PRE_RATIO(0xff); >>> + /* >>> + * For MOUTmmc0-3 = 800 MHz (MPLL) >>> + * >>> + * DOUTmmc1 = MOUTmmc1 / (ratio + 1) = 100 (7) >>> + * sclk_mmc1 = DOUTmmc1 / (ratio + 1) = 50 (1) >>> + * DOUTmmc0 = MOUTmmc0 / (ratio + 1) = 100 (7) >>> + * sclk_mmc0 = DOUTmmc0 / (ratio + 1) = 50 (1) >>> + */ >>> + set = MMC0_RATIO(7) | MMC0_PRE_RATIO(1) | MMC1_RATIO(7) | >>> + MMC1_PRE_RATIO(1); >>> + >>> + clrsetbits_le32(&clk->div_fsys1, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_fsys1) & DIV_STAT_FSYS1_CHANGING) >>> + continue; >>> + >>> + /* CLK_DIV_FSYS2 */ >>> + clr = MMC2_RATIO(0xf) | MMC2_PRE_RATIO(0xff) | MMC3_RATIO(0xf) | >>> + MMC3_PRE_RATIO(0xff); >>> + /* >>> + * For MOUTmmc0-3 = 800 MHz (MPLL) >>> + * >>> + * DOUTmmc3 = MOUTmmc3 / (ratio + 1) = 100 (7) >>> + * sclk_mmc3 = DOUTmmc3 / (ratio + 1) = 50 (1) >>> + * DOUTmmc2 = MOUTmmc2 / (ratio + 1) = 100 (7) >>> + * sclk_mmc2 = DOUTmmc2 / (ratio + 1) = 50 (1) >>> + */ >>> + set = MMC2_RATIO(7) | MMC2_PRE_RATIO(1) | MMC3_RATIO(7) | >>> + MMC3_PRE_RATIO(1); >>> + >>> + clrsetbits_le32(&clk->div_fsys2, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_fsys2) & DIV_STAT_FSYS2_CHANGING) >>> + continue; >>> + >>> + /* CLK_DIV_FSYS3 */ >>> + clr = MMC4_RATIO(0xf) | MMC4_PRE_RATIO(0xff); >>> + /* >>> + * For MOUTmmc4 = 800 MHz (MPLL) >>> + * >>> + * DOUTmmc4 = MOUTmmc4 / (ratio + 1) = 100 (7) >>> + * sclk_mmc4 = DOUTmmc4 / (ratio + 1) = 100 (0) >>> + */ >>> + set = MMC4_RATIO(7) | MMC4_PRE_RATIO(0); >>> + >>> + clrsetbits_le32(&clk->div_fsys3, clr, set); >>> + >>> + /* Wait for divider ready status */ >>> + while (readl(&clk->div_stat_fsys3) & DIV_STAT_FSYS3_CHANGING) >>> + continue; >>> + >>> + return; >>> +} >>> + >>> +static void board_gpio_init(void) >>> +{ >>> + /* Set GPA1 pin 1 to HI - enable XCL205 output */ >>> + gpio_set_pull(EXYNOS4X12_GPIO_A11, S5P_GPIO_PULL_UP); >>> + gpio_set_drv(EXYNOS4X12_GPIO_A11, S5P_GPIO_DRV_4X); >>> + gpio_direction_output(EXYNOS4X12_GPIO_A11, 1); >>> + >>> + gpio_cfg_pin(EXYNOS4X12_GPIO_K12, S5P_GPIO_FUNC(0x1)); >>> + gpio_set_pull(EXYNOS4X12_GPIO_K12, S5P_GPIO_PULL_NONE); >>> + gpio_set_drv(EXYNOS4X12_GPIO_K12, S5P_GPIO_DRV_4X); >>> + >>> + /* Enable FAN (Odroid U3) */ >>> + gpio_set_pull(EXYNOS4X12_GPIO_D00, S5P_GPIO_PULL_UP); >>> + gpio_set_drv(EXYNOS4X12_GPIO_D00, S5P_GPIO_DRV_4X); >>> + gpio_direction_output(EXYNOS4X12_GPIO_D00, 1); >>> +} >>> + >>> +static int pmic_init_max77686(void) >>> +{ >>> + struct pmic *p = pmic_get("MAX77686_PMIC"); >>> + >>> + if (pmic_probe(p)) >>> + return -ENODEV; >>> + >>> + /* Set LDO Voltage */ >>> + max77686_set_ldo_voltage(p, 20, 1800000); /* LDO20 eMMC */ >>> + max77686_set_ldo_voltage(p, 21, 2800000); /* LDO21 SD */ >>> + max77686_set_ldo_voltage(p, 22, 2800000); /* LDO22 eMMC */ >> >> LDO20/22 are used the eMMC? VDD/VDD-IO power? >> > > Yes, those are the pull-up voltage sources for eMMC and SD. > > > Thank you, _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot