* [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console
@ 2013-03-15 10:38 Rajeshwari Shinde
2013-03-15 10:38 ` [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial Rajeshwari Shinde
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Rajeshwari Shinde @ 2013-03-15 10:38 UTC (permalink / raw)
To: u-boot
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.
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 | 27 ++++++++++
board/samsung/dts/exynos5250-smdk5250.dts | 2 +
drivers/serial/serial_s5p.c | 79 +++++++++++++++++++++++++++++
include/configs/exynos5250-dt.h | 2 +
include/fdtdec.h | 1 +
lib/fdtdec.c | 1 +
6 files changed, 112 insertions(+), 0 deletions(-)
--
1.7.4.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial 2013-03-15 10:38 [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console Rajeshwari Shinde @ 2013-03-15 10:38 ` Rajeshwari Shinde 2013-03-29 6:14 ` Minkyu Kang 2013-03-15 10:38 ` [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values Rajeshwari Shinde ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: Rajeshwari Shinde @ 2013-03-15 10:38 UTC (permalink / raw) To: u-boot 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" Chnages in V3: - Rebased on latest u-boot-samsung 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 6552942..9f9cb4f 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -83,6 +83,7 @@ enum fdt_compat_id { COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ + COMPAT_SAMSUNG_EXYNOS5_SERIAL, /* Exynos5 UART */ COMPAT_COUNT, }; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 88f6b68..ee98e0e 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -58,6 +58,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), + COMPAT(SAMSUNG_EXYNOS5_SERIAL, "samsung,exynos4210-uart"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial 2013-03-15 10:38 ` [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial Rajeshwari Shinde @ 2013-03-29 6:14 ` Minkyu Kang 2013-04-02 5:19 ` Rajeshwari Birje 0 siblings, 1 reply; 9+ messages in thread From: Minkyu Kang @ 2013-03-29 6:14 UTC (permalink / raw) To: u-boot Dear Rajeshwari Shinde, On 15/03/13 19:38, Rajeshwari Shinde 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" > Chnages in V3: > - Rebased on latest u-boot-samsung > 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 6552942..9f9cb4f 100644 > --- a/include/fdtdec.h > +++ b/include/fdtdec.h > @@ -83,6 +83,7 @@ enum fdt_compat_id { > COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ > COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ > COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ > + COMPAT_SAMSUNG_EXYNOS5_SERIAL, /* Exynos5 UART */ Is it exynos5 only? I think, we can use it to all of exynos series. > > COMPAT_COUNT, > }; > diff --git a/lib/fdtdec.c b/lib/fdtdec.c > index 88f6b68..ee98e0e 100644 > --- a/lib/fdtdec.c > +++ b/lib/fdtdec.c > @@ -58,6 +58,7 @@ static const char * const compat_names[COMPAT_COUNT] = { > COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), > COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), > COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), > + COMPAT(SAMSUNG_EXYNOS5_SERIAL, "samsung,exynos4210-uart"), > }; > > const char *fdtdec_get_compatible(enum fdt_compat_id id) > Thanks, Minkyu Kang. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial 2013-03-29 6:14 ` Minkyu Kang @ 2013-04-02 5:19 ` Rajeshwari Birje 0 siblings, 0 replies; 9+ messages in thread From: Rajeshwari Birje @ 2013-04-02 5:19 UTC (permalink / raw) To: u-boot Hi Minkyu Kang, Thank you for comment On Fri, Mar 29, 2013 at 11:44 AM, Minkyu Kang <mk7.kang@samsung.com> wrote: > Dear Rajeshwari Shinde, > > On 15/03/13 19:38, Rajeshwari Shinde 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" >> Chnages in V3: >> - Rebased on latest u-boot-samsung >> 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 6552942..9f9cb4f 100644 >> --- a/include/fdtdec.h >> +++ b/include/fdtdec.h >> @@ -83,6 +83,7 @@ enum fdt_compat_id { >> COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ >> COMPAT_MAXIM_MAX77686_PMIC, /* MAX77686 PMIC */ >> COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ >> + COMPAT_SAMSUNG_EXYNOS5_SERIAL, /* Exynos5 UART */ > > Is it exynos5 only? > I think, we can use it to all of exynos series. Will correct the same to COMPAT_SAMSUNG_EXYNOS_SERIAL and resend the patch. > >> >> COMPAT_COUNT, >> }; >> diff --git a/lib/fdtdec.c b/lib/fdtdec.c >> index 88f6b68..ee98e0e 100644 >> --- a/lib/fdtdec.c >> +++ b/lib/fdtdec.c >> @@ -58,6 +58,7 @@ static const char * const compat_names[COMPAT_COUNT] = { >> COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), >> COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), >> COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), >> + COMPAT(SAMSUNG_EXYNOS5_SERIAL, "samsung,exynos4210-uart"), >> }; >> >> const char *fdtdec_get_compatible(enum fdt_compat_id id) >> > > Thanks, > Minkyu Kang. > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- Regards, Rajeshwari Shinde ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values 2013-03-15 10:38 [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console Rajeshwari Shinde 2013-03-15 10:38 ` [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial Rajeshwari Shinde @ 2013-03-15 10:38 ` Rajeshwari Shinde 2013-03-15 20:24 ` Simon Glass 2013-03-15 10:38 ` [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver Rajeshwari Shinde 2013-03-15 10:38 ` [U-Boot] [PATCH 4/4 V3] CONFIG: EXYNOS5: Enable silent console Rajeshwari Shinde 3 siblings, 1 reply; 9+ messages in thread From: Rajeshwari Shinde @ 2013-03-15 10:38 UTC (permalink / raw) To: u-boot 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. arch/arm/dts/exynos5250.dtsi | 27 +++++++++++++++++++++++++++ board/samsung/dts/exynos5250-smdk5250.dts | 2 ++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index 61d35a8..9ab5f0d 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -156,4 +156,31 @@ reg = <0x10060000 0x10000>; }; + serial at 12C00000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C00000 0x100>; + interrupts = <0 51 0>; + id = <0>; + }; + + serial at 12C10000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C10000 0x100>; + interrupts = <0 52 0>; + id = <1>; + }; + + serial at 12C20000 { + compatible = "samsung,exynos4210-uart"; + reg = <0x12C20000 0x100>; + interrupts = <0 53 0>; + id = <2>; + }; + + serial at 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 1c2d52d..936ec12 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/board/samsung/dts/exynos5250-smdk5250.dts @@ -30,6 +30,8 @@ spi2 = "/spi at 12d40000"; spi3 = "/spi at 131a0000"; spi4 = "/spi at 131b0000"; + serial0 = "/serial at 12C30000"; + console = "/serial at 12C30000"; }; sromc at 12250000 { -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values 2013-03-15 10:38 ` [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values Rajeshwari Shinde @ 2013-03-15 20:24 ` Simon Glass 0 siblings, 0 replies; 9+ messages in thread From: Simon Glass @ 2013-03-15 20:24 UTC (permalink / raw) To: u-boot On Fri, Mar 15, 2013 at 3:38 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote: > 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> Acked-by: Simon Glass <sjg@chromium.org> > --- > 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. > arch/arm/dts/exynos5250.dtsi | 27 +++++++++++++++++++++++++++ > board/samsung/dts/exynos5250-smdk5250.dts | 2 ++ > 2 files changed, 29 insertions(+), 0 deletions(-) > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver 2013-03-15 10:38 [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console Rajeshwari Shinde 2013-03-15 10:38 ` [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial Rajeshwari Shinde 2013-03-15 10:38 ` [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values Rajeshwari Shinde @ 2013-03-15 10:38 ` Rajeshwari Shinde 2013-03-15 10:39 ` Rajeshwari Birje 2013-03-15 10:38 ` [U-Boot] [PATCH 4/4 V3] CONFIG: EXYNOS5: Enable silent console Rajeshwari Shinde 3 siblings, 1 reply; 9+ messages in thread From: Rajeshwari Shinde @ 2013-03-15 10:38 UTC (permalink / raw) To: u-boot 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. 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) -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver 2013-03-15 10:38 ` [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver Rajeshwari Shinde @ 2013-03-15 10:39 ` Rajeshwari Birje 0 siblings, 0 replies; 9+ messages in thread From: Rajeshwari Birje @ 2013-03-15 10:39 UTC (permalink / raw) To: u-boot Please ignore this mail. Sorry for spamming On Fri, Mar 15, 2013 at 4:08 PM, 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. > 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) > -- > 1.7.4.4 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot -- Regards, Rajeshwari Shinde ^ permalink raw reply [flat|nested] 9+ messages in thread
* [U-Boot] [PATCH 4/4 V3] CONFIG: EXYNOS5: Enable silent console 2013-03-15 10:38 [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console Rajeshwari Shinde ` (2 preceding siblings ...) 2013-03-15 10:38 ` [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver Rajeshwari Shinde @ 2013-03-15 10:38 ` Rajeshwari Shinde 3 siblings, 0 replies; 9+ messages in thread From: Rajeshwari Shinde @ 2013-03-15 10:38 UTC (permalink / raw) To: u-boot 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 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 f334d45..9fab0fb 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -85,6 +85,8 @@ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" +#define CONFIG_SILENT_CONSOLE + #define CONFIG_EXTRA_ENV_SETTINGS \ EXYNOS_DEVICE_SETTINGS -- 1.7.4.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-04-02 5:19 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-03-15 10:38 [U-Boot] [PATCH 0/4 V3] SMDK5250: FDT: Add device tree support for console Rajeshwari Shinde 2013-03-15 10:38 ` [U-Boot] [PATCH 1/4 V3] EXYNOS5: FDT: Add compatible strings for Serial Rajeshwari Shinde 2013-03-29 6:14 ` Minkyu Kang 2013-04-02 5:19 ` Rajeshwari Birje 2013-03-15 10:38 ` [U-Boot] [PATCH 2/4 V3] EXYNOS5: FDT: Add serial device node values Rajeshwari Shinde 2013-03-15 20:24 ` Simon Glass 2013-03-15 10:38 ` [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to driver Rajeshwari Shinde 2013-03-15 10:39 ` Rajeshwari Birje 2013-03-15 10:38 ` [U-Boot] [PATCH 4/4 V3] CONFIG: EXYNOS5: Enable silent console Rajeshwari Shinde
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox