diff mbox

[U-Boot,PATCHv3,4/9] arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode

Message ID 1453801569-23835-5-git-send-email-bhuvanchandra.dv@toradex.com
State Superseded
Headers show

Commit Message

Bhuvanchandra DV Jan. 26, 2016, 9:46 a.m. UTC
Remove the legacy way of enabling GPIO, SPI and UART on Vybrid
based boards since these driver's now only supports DT mode.

Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
---
 include/configs/colibri_vf.h | 13 -------------
 include/configs/pcm052.h     |  3 ---
 include/configs/vf610twr.h   |  3 ---
 3 files changed, 19 deletions(-)

Comments

Bin Meng Jan. 26, 2016, 10:41 a.m. UTC | #1
Hi Bhuvanchandra,

On Tue, Jan 26, 2016 at 5:46 PM, Bhuvanchandra DV
<bhuvanchandra.dv@toradex.com> wrote:
> Remove the legacy way of enabling GPIO, SPI and UART on Vybrid
> based boards since these driver's now only supports DT mode.
>
> Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
> ---
>  include/configs/colibri_vf.h | 13 -------------
>  include/configs/pcm052.h     |  3 ---
>  include/configs/vf610twr.h   |  3 ---
>  3 files changed, 19 deletions(-)
>
> diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
> index 5aed3a5..6efff76 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -36,13 +36,10 @@
>
>  #define CONFIG_BOARD_EARLY_INIT_F
>
> -#define LPUART_BASE                    UART0_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
>  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>  #define CONFIG_VERSION_VARIABLE
> -#define CONFIG_SYS_UART_PORT           (0)
>  #define CONFIG_BAUDRATE                        115200
>  #define CONFIG_CMD_ASKENV
>
> @@ -52,10 +49,6 @@
>  #define CONFIG_SYS_MAX_NAND_DEVICE     1
>  #define CONFIG_SYS_NAND_BASE           NFC_BASE_ADDR
>
> -/* GPIO support */
> -#define CONFIG_DM_GPIO
> -#define CONFIG_VYBRID_GPIO
> -
>  /* Dynamic MTD partition support */
>  #define CONFIG_CMD_MTDPARTS    /* Enable 'mtdparts' command line support */
>  #define CONFIG_MTD_PARTITIONS
> @@ -265,10 +258,4 @@
>  #define CONFIG_USB_FUNCTION_MASS_STORAGE
>  #define CONFIG_CMD_USB_MASS_STORAGE
>
> -/* Enable SPI support */
> -#ifdef CONFIG_OF_CONTROL
> -#define CONFIG_DM_SPI
> -#define CONFIG_CMD_SPI
> -#endif
> -
>  #endif /* __CONFIG_H */
> diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
> index 891bdb0..f3353f2 100644
> --- a/include/configs/pcm052.h
> +++ b/include/configs/pcm052.h
> @@ -27,11 +27,8 @@
>
>  #define CONFIG_BOARD_EARLY_INIT_F
>
> -#define LPUART_BASE                    UART1_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_SYS_UART_PORT           (1)
>  #define CONFIG_BAUDRATE                        115200
>
>  #undef CONFIG_CMD_IMLS
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index dcfafaf..84ad2c3 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -34,11 +34,8 @@
>
>  #define CONFIG_BOARD_EARLY_INIT_F
>
> -#define LPUART_BASE                    UART1_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_SYS_UART_PORT           (1)
>  #define CONFIG_BAUDRATE                        115200
>
>  /* NAND support */
> --

I believe there is still bisectability issue here. At this stage, all
these boards are still using legacy lpuart driver and we cannot remove
those macros. This patch should come after patch#7 in the v3 series.
Can you double check this?

For the patch itself,
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Stefan Agner Jan. 26, 2016, 4:23 p.m. UTC | #2
On 2016-01-26 01:46, Bhuvanchandra DV wrote:
> Remove the legacy way of enabling GPIO, SPI and UART on Vybrid
> based boards since these driver's now only supports DT mode.
> 
> Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>

Acked-by: Stefan Agner <stefan.agner@toradex.com>

> ---
>  include/configs/colibri_vf.h | 13 -------------
>  include/configs/pcm052.h     |  3 ---
>  include/configs/vf610twr.h   |  3 ---
>  3 files changed, 19 deletions(-)
> 
> diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
> index 5aed3a5..6efff76 100644
> --- a/include/configs/colibri_vf.h
> +++ b/include/configs/colibri_vf.h
> @@ -36,13 +36,10 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define LPUART_BASE			UART0_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
>  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>  #define CONFIG_VERSION_VARIABLE
> -#define CONFIG_SYS_UART_PORT		(0)
>  #define CONFIG_BAUDRATE			115200
>  #define CONFIG_CMD_ASKENV
>  
> @@ -52,10 +49,6 @@
>  #define CONFIG_SYS_MAX_NAND_DEVICE	1
>  #define CONFIG_SYS_NAND_BASE		NFC_BASE_ADDR
>  
> -/* GPIO support */
> -#define CONFIG_DM_GPIO
> -#define CONFIG_VYBRID_GPIO
> -
>  /* Dynamic MTD partition support */
>  #define CONFIG_CMD_MTDPARTS	/* Enable 'mtdparts' command line support */
>  #define CONFIG_MTD_PARTITIONS
> @@ -265,10 +258,4 @@
>  #define CONFIG_USB_FUNCTION_MASS_STORAGE
>  #define CONFIG_CMD_USB_MASS_STORAGE
>  
> -/* Enable SPI support */
> -#ifdef CONFIG_OF_CONTROL
> -#define CONFIG_DM_SPI
> -#define CONFIG_CMD_SPI
> -#endif
> -
>  #endif /* __CONFIG_H */
> diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
> index 891bdb0..f3353f2 100644
> --- a/include/configs/pcm052.h
> +++ b/include/configs/pcm052.h
> @@ -27,11 +27,8 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define LPUART_BASE			UART1_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_SYS_UART_PORT		(1)
>  #define CONFIG_BAUDRATE			115200
>  
>  #undef CONFIG_CMD_IMLS
> diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
> index dcfafaf..84ad2c3 100644
> --- a/include/configs/vf610twr.h
> +++ b/include/configs/vf610twr.h
> @@ -34,11 +34,8 @@
>  
>  #define CONFIG_BOARD_EARLY_INIT_F
>  
> -#define LPUART_BASE			UART1_BASE
> -
>  /* Allow to overwrite serial and ethaddr */
>  #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_SYS_UART_PORT		(1)
>  #define CONFIG_BAUDRATE			115200
>  
>  /* NAND support */
diff mbox

Patch

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 5aed3a5..6efff76 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -36,13 +36,10 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define LPUART_BASE			UART0_BASE
-
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_SYS_UART_PORT		(0)
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_CMD_ASKENV
 
@@ -52,10 +49,6 @@ 
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_BASE		NFC_BASE_ADDR
 
-/* GPIO support */
-#define CONFIG_DM_GPIO
-#define CONFIG_VYBRID_GPIO
-
 /* Dynamic MTD partition support */
 #define CONFIG_CMD_MTDPARTS	/* Enable 'mtdparts' command line support */
 #define CONFIG_MTD_PARTITIONS
@@ -265,10 +258,4 @@ 
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_CMD_USB_MASS_STORAGE
 
-/* Enable SPI support */
-#ifdef CONFIG_OF_CONTROL
-#define CONFIG_DM_SPI
-#define CONFIG_CMD_SPI
-#endif
-
 #endif /* __CONFIG_H */
diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index 891bdb0..f3353f2 100644
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -27,11 +27,8 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define LPUART_BASE			UART1_BASE
-
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_UART_PORT		(1)
 #define CONFIG_BAUDRATE			115200
 
 #undef CONFIG_CMD_IMLS
diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index dcfafaf..84ad2c3 100644
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -34,11 +34,8 @@ 
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define LPUART_BASE			UART1_BASE
-
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_UART_PORT		(1)
 #define CONFIG_BAUDRATE			115200
 
 /* NAND support */