From e3ee4be3210a79e39af9b15077f0b119095ee52f Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Wed, 6 Mar 2019 19:37:51 +0100 Subject: arm: exynos: Detect revision later, when all resources are ready Detection of board revision is done early - before power setup. In case of Odroid XU3/XU4/HC1 family, the detection is done using ADC which is supplied by LDO4/VDD_ADC regulator. This regulator could be turned off (e.g. by kernel before reboot). If ADC is used early, the regulators are not yet available and the detection won't work. Split the revision detection out of set_board_type() into separate function called later - either when displaying board info (in late mode) or during misc_init_r. The idea is that set_board_type() will be called early so its method of detection are limited to flattened device tree (exynos5-dt-types.c for Exynos5) or GPIO (odroid.c for Exynos4412). The newly added set_board_revision() can be called only later, when resources like regulator are available. This is necessary to fix the detection of Odroid HC1 after reboot, if kernel turned off the LDO4 regulator. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Lukasz Majewski Tested-by: Anand Moon Signed-off-by: Minkyu Kang --- include/samsung/misc.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/samsung/misc.h b/include/samsung/misc.h index 017560c2566..4ff28a1df0e 100644 --- a/include/samsung/misc.h +++ b/include/samsung/misc.h @@ -33,6 +33,7 @@ char *get_dfu_alt_system(char *interface, char *devstr); char *get_dfu_alt_boot(char *interface, char *devstr); #endif void set_board_type(void); +void set_board_revision(void); const char *get_board_type(void); #endif /* __SAMSUNG_MISC_COMMON_H__ */ -- cgit v1.2.3 From e66d1cb3c2344ee5bbf2059e75fa94350aea9f5f Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Wed, 6 Mar 2019 19:37:54 +0100 Subject: regulator: Add support for ramp delay Changing voltage and enabling regulator might require delays so the regulator stabilizes at expected level. Add support for "regulator-ramp-delay" binding which can introduce required time to both enabling the regulator and to changing the voltage. Signed-off-by: Krzysztof Kozlowski Tested-by: Anand Moon Signed-off-by: Minkyu Kang --- include/power/regulator.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/power/regulator.h b/include/power/regulator.h index 314160a894b..6c6e2cd4f99 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -150,6 +150,7 @@ enum regulator_flag { * @always_on* - bool type, true or false * @boot_on* - bool type, true or false * TODO(sjg@chromium.org): Consider putting the above two into @flags + * @ramp_delay - Time to settle down after voltage change (unit: uV/us) * @flags: - flags value (see REGULATOR_FLAG_...) * @name** - fdt regulator name - should be taken from the device tree * ctrl_reg: - Control register offset used to enable/disable regulator @@ -169,6 +170,7 @@ struct dm_regulator_uclass_platdata { int max_uV; int min_uA; int max_uA; + unsigned int ramp_delay; bool always_on; bool boot_on; const char *name; -- cgit v1.2.3 From 08e0ee059c3a72e2fd1f1f582128ca267b0a5f45 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 22 Feb 2019 19:36:41 +0100 Subject: configs: odroid_xu3: Use consistent syntax for #include When including other header from configs, use consistent <> syntax. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Lukasz Majewski Signed-off-by: Minkyu Kang --- include/configs/odroid_xu3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index f178549a722..7f4cff18615 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -7,7 +7,7 @@ #ifndef __CONFIG_ODROID_XU3_H #define __CONFIG_ODROID_XU3_H -#include "exynos5420-common.h" +#include #include #define CONFIG_BOARD_COMMON -- cgit v1.2.3 From d9cab9f92060cc19e3b79ec98cf2aa192d1be474 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 22 Feb 2019 19:36:42 +0100 Subject: configs: odroid_xu3: Unify indentation File mixed space and tab indentation. Unify it. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Lukasz Majewski Signed-off-by: Minkyu Kang --- include/configs/odroid_xu3.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 7f4cff18615..5e765a2b2b0 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -18,7 +18,7 @@ #define TZPC_BASE_OFFSET 0x10000 -#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ +#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ /* Reserve the last 22 MiB for the secure firmware */ #define CONFIG_SYS_MEM_TOP_HIDE (22UL << 20UL) #define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE @@ -28,7 +28,7 @@ #define CONFIG_ENV_SIZE (SZ_1K * 16) #define CONFIG_ENV_OFFSET (SZ_1K * 3136) /* ~3 MiB offset */ -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" @@ -38,7 +38,7 @@ /* DFU */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define DFU_MANIFEST_POLL_TIMEOUT 25000 +#define DFU_MANIFEST_POLL_TIMEOUT 25000 /* THOR */ #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_USB_GADGET_VENDOR_NUM @@ -85,11 +85,11 @@ #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ -#define CONFIG_ODROID_REV_AIN 9 +#define CONFIG_ODROID_REV_AIN 9 #define CONFIG_REVISION_TAG #undef CONFIG_SYS_BOARD -#define CONFIG_SYS_BOARD "odroid" +#define CONFIG_SYS_BOARD "odroid" /* Define new extra env settings, including DFU settings */ #undef CONFIG_EXTRA_ENV_SETTINGS -- cgit v1.2.3 From e6b1467081d3fb3f86933a14cda1d864eb0e6ac8 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 22 Feb 2019 19:36:43 +0100 Subject: arm: exynos: Remove duplicated "boardname" env setting Various places in the code set "boardname" env property. It was used for booting from ITB images and choosing proper DTB file name. Instead of duplicating it, use existing U-Boot wide - "board_name". Signed-off-by: Krzysztof Kozlowski Reviewed-by: Lukasz Majewski Signed-off-by: Minkyu Kang --- include/configs/odroid.h | 2 +- include/configs/odroid_xu3.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/odroid.h b/include/configs/odroid.h index b8809c8dcc7..9f2d43e3fa3 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -132,7 +132,7 @@ "setenv kernelname Image.itb;" \ "run loadkernel;" \ "run kernel_args;" \ - "bootm ${kernel_addr_r}#${boardname}\0" \ + "bootm ${kernel_addr_r}#${board_name}\0" \ "boot_uimg=" \ "setenv kernelname uImage;" \ "run check_dtb;" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 5e765a2b2b0..af6004eaf51 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -84,10 +84,14 @@ #define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) -/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ +/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CONFIG_ODROID_REV_AIN 9 #define CONFIG_REVISION_TAG +/* + * Need to override existing one (smdk5420) with odroid so set_board_info will + * use proper prefix when creating full board_name (SYS_BOARD + type) + */ #undef CONFIG_SYS_BOARD #define CONFIG_SYS_BOARD "odroid" @@ -101,7 +105,7 @@ "rootfstype=ext4\0" \ "console=" CONFIG_DEFAULT_CONSOLE \ "fdtfile=exynos5422-odroidxu3.dtb\0" \ - "boardname=odroidxu3\0" \ + "board_name=odroidxu3\0" \ "mmcbootdev=0\0" \ "mmcrootdev=0\0" \ "mmcbootpart=1\0" \ -- cgit v1.2.3 From 934e7287951e11a3227beb2d01694f4c36c91f7f Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Thu, 7 Mar 2019 17:03:03 +0900 Subject: espresso7420: remove duplicated config Signed-off-by: Minkyu Kang --- include/configs/espresso7420.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index 4e3b26c25cd..5aeb009f030 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -21,8 +21,6 @@ /* select serial console configuration */ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" - /* DRAM Memory Banks */ #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ -- cgit v1.2.3