diff mbox

[U-Boot,2/2] stv0991: use fdt for serial port platform data

Message ID 1430520185-10090-3-git-send-email-vikas.manocha@st.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Vikas MANOCHA May 1, 2015, 10:43 p.m. UTC 
Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
---
 board/st/stv0991/stv0991.c |    2 ++
 1 file changed, 2 insertions(+)

Comments

Simon Glass May 1, 2015, 11:02 p.m. UTC | #1 
On 1 May 2015 at 16:43, Vikas Manocha <vikas.manocha@st.com> wrote:
> Signed-off-by: Vikas Manocha <vikas.manocha@st.com>
> ---
>  board/st/stv0991/stv0991.c |    2 ++
>  1 file changed, 2 insertions(+)

Needs a commit message. With that:

Reviewed-by: Simon Glass <sjg@chromium.org>

>
> diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
> index 38f6e1d..09f973f 100644
> --- a/board/st/stv0991/stv0991.c
> +++ b/board/st/stv0991/stv0991.c
> @@ -21,6 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
>  struct gpio_regs *const gpioa_regs =
>                 (struct gpio_regs *) GPIOA_BASE_ADDR;
>
> +#ifndef CONFIG_OF_CONTROL
>  static const struct pl01x_serial_platdata serial_platdata = {
>         .base = 0x80406000,
>         .type = TYPE_PL011,
> @@ -31,6 +32,7 @@ U_BOOT_DEVICE(stv09911_serials) = {
>         .name = "serial_pl01x",
>         .platdata = &serial_platdata,
>  };
> +#endif
>
>  #ifdef CONFIG_SHOW_BOOT_PROGRESS
>  void show_boot_progress(int progress)
> --
> 1.7.9.5
>
diff mbox

Patch

diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index 38f6e1d..09f973f 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -21,6 +21,7 @@  DECLARE_GLOBAL_DATA_PTR;
 struct gpio_regs *const gpioa_regs =
 		(struct gpio_regs *) GPIOA_BASE_ADDR;
 
+#ifndef CONFIG_OF_CONTROL
 static const struct pl01x_serial_platdata serial_platdata = {
 	.base = 0x80406000,
 	.type = TYPE_PL011,
@@ -31,6 +32,7 @@  U_BOOT_DEVICE(stv09911_serials) = {
 	.name = "serial_pl01x",
 	.platdata = &serial_platdata,
 };
+#endif
 
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 void show_boot_progress(int progress)