[U-Boot] [PATCH 0/4 V5] SMDK5250: FDT: Add device tree support for console
Enabled fdt support for default console on SMDK5250.
Changes in V2: - Changed the compatible string to "samsung,exynos4210-uart" Changes in V3: - Rebased the patchset on latest u-boot-samsung branch. - Added a alias console as we will support one at any point of time. - Moved driver config structure to data section. - Changed silent_console to silent-console. - Did put a check for base address before doing fdt decoding. Changes in V4: - Rebased the patchset on latest u-boot-samsung branch. - Changed to COMPAT_SAMSUNG_EXYNOS5_SERIAL to COMPAT_SAMSUNG_EXYNOS_SERIAL Changes in V5: - Added serial device node for Snow board.
Rajeshwari Shinde (4): EXYNOS5: FDT: Add compatible strings for Serial EXYNOS5: FDT: Add serial device node values S5P: Serial: Add fdt support to driver CONFIG: EXYNOS5: Enable silent console
arch/arm/dts/exynos5250.dtsi | 28 ++++++++++ board/samsung/dts/exynos5250-smdk5250.dts | 2 + board/samsung/dts/exynos5250-snow.dts | 2 + drivers/serial/serial_s5p.c | 78 +++++++++++++++++++++++++++++ include/configs/exynos5250-dt.h | 2 + include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 7 files changed, 114 insertions(+), 0 deletions(-)
Add required compatible information for s5p serial driver
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com Acked-by: Simon Glass sjg@chromium.org --- Changes in V2: - Changed the compatible string to "samsung,exynos4210-uart" Changes in V3: - Rebased on latest u-boot-samsung Changes in V4: - Rebased on latest u-boot-samsung - Changed to COMPAT_SAMSUNG_EXYNOS5_SERIAL to COMPAT_SAMSUNG_EXYNOS_SERIAL Changes in V5: - None include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/fdtdec.h b/include/fdtdec.h index 844991e..7f78dbc 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -92,6 +92,7 @@ enum fdt_compat_id { COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ + COMPAT_SAMSUNG_EXYNOS_SERIAL, /* Exynos UART */
COMPAT_COUNT, }; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 403babd..b141211 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -65,6 +65,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), + COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"), };
const char *fdtdec_get_compatible(enum fdt_compat_id id)
Dear Rajeshwari Shinde,
On 17 May 2013 20:03, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
Add required compatible information for s5p serial driver
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com Acked-by: Simon Glass sjg@chromium.org
Changes in V2: - Changed the compatible string to "samsung,exynos4210-uart" Changes in V3: - Rebased on latest u-boot-samsung Changes in V4: - Rebased on latest u-boot-samsung - Changed to COMPAT_SAMSUNG_EXYNOS5_SERIAL to COMPAT_SAMSUNG_EXYNOS_SERIAL Changes in V5: - None include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/fdtdec.h b/include/fdtdec.h index 844991e..7f78dbc 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -92,6 +92,7 @@ enum fdt_compat_id { COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */
COMPAT_SAMSUNG_EXYNOS_SERIAL, /* Exynos UART */
Why don't you gather with SAMSUNG stuffs?
COMPAT_COUNT,}; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 403babd..b141211 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -65,6 +65,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"),
COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"),
ditto.
};
const char *fdtdec_get_compatible(enum fdt_compat_id id)
1.7.4.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Thanks, Minkyu Kang.
This patch adds the device node required for serial driver
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com --- Changes in V2: - Changed the compatible string to "samsung,exynos4210-uart" Changes in V3: - Added a alias console as we will support one at any point of time. Changes in V4: - Rebased on latest u-boot-samsung tree. Changes in V5: - Added device node for Snow board. arch/arm/dts/exynos5250.dtsi | 28 ++++++++++++++++++++++++++++ board/samsung/dts/exynos5250-smdk5250.dts | 2 ++ board/samsung/dts/exynos5250-snow.dts | 2 ++ 3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index df4b231..125cb35 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -169,4 +169,32 @@ #address-cells = <1>; #size-cells = <1>; }; + + serial@12C00000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C00000 0x100>; + interrupts = <0 51 0>; + id = <0>; + }; + + serial@12C10000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C10000 0x100>; + interrupts = <0 52 0>; + id = <1>; + }; + + serial@12C20000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C20000 0x100>; + interrupts = <0 53 0>; + id = <2>; + }; + + serial@12C30000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C30000 0x100>; + interrupts = <0 54 0>; + id = <3>; + }; }; diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/board/samsung/dts/exynos5250-smdk5250.dts index 8da973b..b9181ef 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/board/samsung/dts/exynos5250-smdk5250.dts @@ -30,6 +30,8 @@ spi2 = "/spi@12d40000"; spi3 = "/spi@131a0000"; spi4 = "/spi@131b0000"; + serial0 = "/serial@12C30000"; + console = "/serial@12C30000"; };
sromc@12250000 { diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts index 24658c1..65f44ac 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/board/samsung/dts/exynos5250-snow.dts @@ -30,6 +30,8 @@ spi2 = "/spi@12d40000"; spi3 = "/spi@131a0000"; spi4 = "/spi@131b0000"; + serial0 = "/serial@12C30000"; + console = "/serial@12C30000"; };
sound@12d60000 {
This patch adds FDT support to the serial s5p driver. At present disabling the serial console (from the device tree) crashes U-Boot. Add checks for this case, so that execution can continue without a serial console. It also enables the serial_s5p driver recognize the silent_console option.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Gabe Black gabeblack@google.com Signed-off-by: Simon Glass sjg@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com --- Changes in V2: - None Changes in V3: - Moved driver config structure to data section. - Changed silent_console to silent-console. - Did put a check for base address before doing fdt decoding. Changes in V4: - None Changes in V5: - None drivers/serial/serial_s5p.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 3c41242..55ef2bf 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -24,16 +24,28 @@ #include <common.h> #include <linux/compiler.h> #include <asm/io.h> +#include <fdtdec.h> #include <asm/arch/uart.h> #include <asm/arch/clk.h> #include <serial.h>
DECLARE_GLOBAL_DATA_PTR;
+/* Information about a serial port */ +struct fdt_serial { + u32 base_addr; /* address of registers in physical memory */ + u8 port_id; /* uart port number */ + u8 enabled; /* 1 if enabled, 0 if disabled */ +} config __attribute__ ((section(".data"))); + static inline struct s5p_uart *s5p_get_base_uart(int dev_index) { +#ifdef CONFIG_OF_CONTROL + return (struct s5p_uart *)(config.base_addr); +#else u32 offset = dev_index * sizeof(struct s5p_uart); return (struct s5p_uart *)(samsung_get_base_uart() + offset); +#endif }
/* @@ -69,6 +81,9 @@ void serial_setbrg_dev(const int dev_index) u32 baudrate = gd->baudrate; u32 val;
+ if (!config.enabled) + return; + val = uclk / baudrate;
writel(val / 16 - 1, &uart->ubrdiv); @@ -87,6 +102,16 @@ int serial_init_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
+#if defined(CONFIG_SILENT_CONSOLE) && \ + defined(CONFIG_OF_CONTROL) && \ + !defined(CONFIG_SPL_BUILD) + if (fdtdec_get_config_int(gd->fdt_blob, "silent_console", 0)) + gd->flags |= GD_FLG_SILENT; +#endif + + if (!config.enabled) + return 0; + /* reset and enable FIFOs, set triggers to the maximum */ writel(0, &uart->ufcon); writel(0, &uart->umcon); @@ -129,6 +154,9 @@ int serial_getc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
+ if (!config.enabled) + return 0; + /* wait for character to arrive */ while (!(readl(&uart->utrstat) & 0x1)) { if (serial_err_check(dev_index, 0)) @@ -145,6 +173,9 @@ void serial_putc_dev(const char c, const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
+ if (!config.enabled) + return; + /* wait for room in the tx FIFO */ while (!(readl(&uart->utrstat) & 0x2)) { if (serial_err_check(dev_index, 1)) @@ -165,6 +196,9 @@ int serial_tstc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
+ if (!config.enabled) + return 0; + return (int)(readl(&uart->utrstat) & 0x1); }
@@ -207,8 +241,51 @@ DECLARE_S5P_SERIAL_FUNCTIONS(3); struct serial_device s5p_serial3_device = INIT_S5P_SERIAL_STRUCTURE(3, "s5pser3");
+#ifdef CONFIG_OF_CONTROL +int fdtdec_decode_console(int *index, struct fdt_serial *uart) +{ + const void *blob = gd->fdt_blob; + int node; + + node = fdt_path_offset(blob, "console"); + if (node < 0) + return node; + + uart->base_addr = fdtdec_get_addr(blob, node, "reg"); + if (uart->base_addr == FDT_ADDR_T_NONE) + return -FDT_ERR_NOTFOUND; + + uart->port_id = fdtdec_get_int(blob, node, "id", -1); + uart->enabled = fdtdec_get_is_enabled(blob, node); + + return 0; +} +#endif + __weak struct serial_device *default_serial_console(void) { +#ifdef CONFIG_OF_CONTROL + int index = 0; + + if ((!config.base_addr) && (fdtdec_decode_console(&index, &config))) { + debug("Cannot decode default console node\n"); + return NULL; + } + + if (config.port_id == 0) + return &s5p_serial0_device; + else if (config.port_id == 1) + return &s5p_serial1_device; + else if (config.port_id == 2) + return &s5p_serial2_device; + else if (config.port_id == 3) + return &s5p_serial3_device; + else + debug("Unknown config.port_id: %d", config.port_id); + + return NULL; +#else + config.enabled = 1; #if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -220,6 +297,7 @@ __weak struct serial_device *default_serial_console(void) #else #error "CONFIG_SERIAL? missing." #endif +#endif }
void s5p_serial_initialize(void)
Dear Rajeshwari Shinde,
On 17 May 2013 20:03, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch adds FDT support to the serial s5p driver. At present disabling the serial console (from the device tree) crashes U-Boot. Add checks for this case, so that execution can continue without a serial console. It also enables the serial_s5p driver recognize the silent_console option.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Gabe Black gabeblack@google.com Signed-off-by: Simon Glass sjg@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
Changes in V2: - None Changes in V3: - Moved driver config structure to data section. - Changed silent_console to silent-console. - Did put a check for base address before doing fdt decoding. Changes in V4: - None Changes in V5: - None drivers/serial/serial_s5p.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 3c41242..55ef2bf 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -24,16 +24,28 @@ #include <common.h> #include <linux/compiler.h> #include <asm/io.h> +#include <fdtdec.h> #include <asm/arch/uart.h> #include <asm/arch/clk.h> #include <serial.h>
DECLARE_GLOBAL_DATA_PTR;
+/* Information about a serial port */ +struct fdt_serial {
u32 base_addr; /* address of registers in physical memory */u8 port_id; /* uart port number */u8 enabled; /* 1 if enabled, 0 if disabled */+} config __attribute__ ((section(".data")));
static inline struct s5p_uart *s5p_get_base_uart(int dev_index) { +#ifdef CONFIG_OF_CONTROL
return (struct s5p_uart *)(config.base_addr);+#else u32 offset = dev_index * sizeof(struct s5p_uart); return (struct s5p_uart *)(samsung_get_base_uart() + offset); +#endif }
/* @@ -69,6 +81,9 @@ void serial_setbrg_dev(const int dev_index) u32 baudrate = gd->baudrate; u32 val;
if (!config.enabled)return;val = uclk / baudrate; writel(val / 16 - 1, &uart->ubrdiv);@@ -87,6 +102,16 @@ int serial_init_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
+#if defined(CONFIG_SILENT_CONSOLE) && \
defined(CONFIG_OF_CONTROL) && \!defined(CONFIG_SPL_BUILD)if (fdtdec_get_config_int(gd->fdt_blob, "silent_console", 0))gd->flags |= GD_FLG_SILENT;+#endif
if (!config.enabled)return 0;/* reset and enable FIFOs, set triggers to the maximum */ writel(0, &uart->ufcon); writel(0, &uart->umcon);@@ -129,6 +154,9 @@ int serial_getc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
if (!config.enabled)return 0;/* wait for character to arrive */ while (!(readl(&uart->utrstat) & 0x1)) { if (serial_err_check(dev_index, 0))@@ -145,6 +173,9 @@ void serial_putc_dev(const char c, const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
if (!config.enabled)return;/* wait for room in the tx FIFO */ while (!(readl(&uart->utrstat) & 0x2)) { if (serial_err_check(dev_index, 1))@@ -165,6 +196,9 @@ int serial_tstc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index);
if (!config.enabled)return 0;return (int)(readl(&uart->utrstat) & 0x1);}
@@ -207,8 +241,51 @@ DECLARE_S5P_SERIAL_FUNCTIONS(3); struct serial_device s5p_serial3_device = INIT_S5P_SERIAL_STRUCTURE(3, "s5pser3");
+#ifdef CONFIG_OF_CONTROL +int fdtdec_decode_console(int *index, struct fdt_serial *uart) +{
const void *blob = gd->fdt_blob;int node;node = fdt_path_offset(blob, "console");if (node < 0)return node;uart->base_addr = fdtdec_get_addr(blob, node, "reg");if (uart->base_addr == FDT_ADDR_T_NONE)return -FDT_ERR_NOTFOUND;uart->port_id = fdtdec_get_int(blob, node, "id", -1);uart->enabled = fdtdec_get_is_enabled(blob, node);return 0;+} +#endif
__weak struct serial_device *default_serial_console(void) { +#ifdef CONFIG_OF_CONTROL
int index = 0;if ((!config.base_addr) && (fdtdec_decode_console(&index,&config))) {
debug("Cannot decode default console node\n");return NULL;}if (config.port_id == 0)return &s5p_serial0_device;else if (config.port_id == 1)return &s5p_serial1_device;else if (config.port_id == 2)return &s5p_serial2_device;else if (config.port_id == 3)return &s5p_serial3_device;elsedebug("Unknown config.port_id: %d", config.port_id);
switch case?
return NULL;+#else
config.enabled = 1;#if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -220,6 +297,7 @@ __weak struct serial_device *default_serial_console(void) #else #error "CONFIG_SERIAL? missing." #endif +#endif }
void s5p_serial_initialize(void)
1.7.4.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Thanks, Minkyu Kang.
This patch enables CONFIG_SILENT_CONSOLE for EXYNOS5.
Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com Acked-by: Simon Glass sjg@chromium.org --- Changes in V2: - None Changes in V3: - None Changes in V4: - None Changes in V5: - None include/configs/exynos5250-dt.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 4514e7a..b7fcd87 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -90,6 +90,8 @@ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0"
+#define CONFIG_SILENT_CONSOLE + #define CONFIG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS
Hi Minkyu Kang,
Any comments on this patch set? Please do let me know.
Regards, Rajeshwari Shinde.
On Fri, May 17, 2013 at 4:33 PM, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
Enabled fdt support for default console on SMDK5250.
Changes in V2: - Changed the compatible string to "samsung,exynos4210-uart" Changes in V3: - Rebased the patchset on latest u-boot-samsung branch. - Added a alias console as we will support one at any point of time. - Moved driver config structure to data section. - Changed silent_console to silent-console. - Did put a check for base address before doing fdt decoding. Changes in V4: - Rebased the patchset on latest u-boot-samsung branch. - Changed to COMPAT_SAMSUNG_EXYNOS5_SERIAL to COMPAT_SAMSUNG_EXYNOS_SERIAL Changes in V5: - Added serial device node for Snow board.
Rajeshwari Shinde (4): EXYNOS5: FDT: Add compatible strings for Serial EXYNOS5: FDT: Add serial device node values S5P: Serial: Add fdt support to driver CONFIG: EXYNOS5: Enable silent console
arch/arm/dts/exynos5250.dtsi | 28 ++++++++++ board/samsung/dts/exynos5250-smdk5250.dts | 2 + board/samsung/dts/exynos5250-snow.dts | 2 + drivers/serial/serial_s5p.c | 78 +++++++++++++++++++++++++++++ include/configs/exynos5250-dt.h | 2 + include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 7 files changed, 114 insertions(+), 0 deletions(-)
-- 1.7.4.4
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
participants (3)
-
Minkyu Kang -
Rajeshwari Birje -
Rajeshwari Shinde