Tegra: spi: Move TEGRA114_SPI switch to defconfigs

PATCH New Tom Warren 4 participants 6 messages Jul 30, 2015 – Aug 5, 2015

Share & tools

Tom Warren

author

2015-07-30 20:57 UTC #0 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.

All Tegra SoCs build OK with this change.

Signed-off-by Tom Warren <[email protected]>

---
 configs/dalmore_defconfig    | 1 +
 configs/jetson-tk1_defconfig | 1 +
 configs/nyan-big_defconfig   | 1 +
 configs/p2571_defconfig      | 1 +
 configs/venice2_defconfig    | 1 +
 include/configs/dalmore.h    | 2 --
 include/configs/jetson-tk1.h | 2 --
 include/configs/nyan-big.h   | 2 --
 include/configs/p2571.h      | 2 --
 include/configs/venice2.h    | 2 --
 10 files changed, 5 insertions(+), 10 deletions(-)

configs/dalmore_defconfig +1 -0

index e7443f8..2d80247 100644
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/jetson-tk1_defconfig +1 -0

index 7085469..44c7a8e 100644
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/nyan-big_defconfig +1 -0

index 79b74a7..ccf656b 100644
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-nyan-big"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_CMD_CROS_EC=y
 CONFIG_CROS_EC=y

configs/p2571_defconfig +1 -0

index 8494bb5..5fd2a54 100644
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra210-p2571"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

configs/venice2_defconfig +1 -0

index 9ccd739..a4735f6 100644
@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPL_DM=y
+CONFIG_TEGRA114_SPI=y
 CONFIG_SPI_FLASH=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

include/configs/dalmore.h +0 -2

index 89b6f23..32fe9e8 100644
@@ -51,8 +51,6 @@
 #define MACH_TYPE_DALMORE	4304	/* not yet in mach-types.h */
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI
-#define CONFIG_TEGRA114_SPI_CTRLS	6
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000

include/configs/jetson-tk1.h +0 -2

index 3bbff28..5999504 100644
@@ -41,8 +41,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		2
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_CTRLS	6
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED		24000000

include/configs/nyan-big.h +0 -2

index dd549aa..4858dea 100644
@@ -53,8 +53,6 @@
 #define CONFIG_LCD_ALIGNMENT	MMU_SECTION_SIZE
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_CTRLS	6
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000

include/configs/p2571.h +0 -2

index d39fa2a..5df7d2f 100644
@@ -41,8 +41,6 @@
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE)
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_CTRLS	6
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED		24000000

include/configs/venice2.h +0 -2

index 1d9d053..0535a6b 100644
@@ -38,8 +38,6 @@
 #define CONFIG_ENV_OFFSET		(-CONFIG_ENV_SIZE)
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI		/* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_CTRLS	6
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000

Signature · 1 line

1.8.2.1.610.g562af5b

Stephen Warren

2015-07-30 21:19 UTC #1 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

Quoted 6 lines · Tom Warren

All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.

Acked-by Stephen Warren <[email protected]>

This will make it fun to back-port my board support patches to the L4T U-Boot which doesn't have Kconfig support for TEGRA114_SPI, being just a little behind upstream, but that's my problem not yours.

Simon Glass

2015-07-30 21:33 UTC #2 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

In reply to Tom Warren

Quoted 8 lines · Tom Warren

All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by Tom Warren <[email protected]>

Quoted 12 lines

---
 configs/dalmore_defconfig    | 1 +
 configs/jetson-tk1_defconfig | 1 +
 configs/nyan-big_defconfig   | 1 +
 configs/p2571_defconfig      | 1 +
 configs/venice2_defconfig    | 1 +
 include/configs/dalmore.h    | 2 --
 include/configs/jetson-tk1.h | 2 --
 include/configs/nyan-big.h   | 2 --
 include/configs/p2571.h      | 2 --
 include/configs/venice2.h    | 2 --
 10 files changed, 5 insertions(+), 10 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Jagan Teki

2015-08-05 08:34 UTC #3 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

Quoted 22 lines · Simon Glass

Quoted 8 lines · Tom Warren
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by Tom Warren <[email protected]>
Quoted 12 lines
---
 configs/dalmore_defconfig    | 1 +
 configs/jetson-tk1_defconfig | 1 +
 configs/nyan-big_defconfig   | 1 +
 configs/p2571_defconfig      | 1 +
 configs/venice2_defconfig    | 1 +
 include/configs/dalmore.h    | 2 --
 include/configs/jetson-tk1.h | 2 --
 include/configs/nyan-big.h   | 2 --
 include/configs/p2571.h      | 2 --
 include/configs/venice2.h    | 2 --
 10 files changed, 5 insertions(+), 10 deletions(-)

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

Reviewed-by Jagan Teki <[email protected]>

I couldn't find this patch on patchwork, pls- provide the link?

thanks!

Signature · 1 line

Jagan | openedev.

Tom Warren

author

2015-08-05 15:20 UTC #4 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

Jagan,

Quoted 30 lines

-----Original Message-----
From: Jagan Teki [mailto:jteki at openedev.com]
Sent: Wednesday, August 05, 2015 1:35 AM
To: Simon Glass
Cc: Tom Warren; U-Boot Mailing List; Stephen Warren; Tom Warren
Subject: Re: [U-Boot] [PATCH] Tegra: spi: Move TEGRA114_SPI switch to defconfigs
Quoted 21 lines · Simon Glass
Quoted 19 lines · Tom Warren
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by Tom Warren <[email protected]>
---
 configs/dalmore_defconfig    | 1 +
 configs/jetson-tk1_defconfig | 1 +
 configs/nyan-big_defconfig   | 1 +
 configs/p2571_defconfig      | 1 +
 configs/venice2_defconfig    | 1 +
 include/configs/dalmore.h    | 2 --
 include/configs/jetson-tk1.h | 2 --
 include/configs/nyan-big.h   | 2 --
 include/configs/p2571.h      | 2 --
 include/configs/venice2.h    | 2 --
 10 files changed, 5 insertions(+), 10 deletions(-)

Quoted 5 lines

Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Jagan Teki <[email protected]>
I couldn't find this patch on patchwork, pls- provide the link?

I don't see it in patchworks, either (nor do I see my P2571 cleanup patch that was sent the same day/time). Maybe patchwork was down/busy that day and dropped it?

Are you OK with my taking this in via u-boot-tegra, or do you want to take it in via u-boot-spi?

Tom
--
nvpublic

Quoted 4 lines

thanks!
--
Jagan | openedev.

Jagan Teki

2015-08-05 16:09 UTC #5 lore raw

PATCH 1/1 Tegra: spi: Move TEGRA114_SPI switch to defconfigs

Quoted 32 lines · Tom Warren

Jagan,
Quoted 30 lines
-----Original Message-----
From: Jagan Teki [mailto:jteki at openedev.com]
Sent: Wednesday, August 05, 2015 1:35 AM
To: Simon Glass
Cc: Tom Warren; U-Boot Mailing List; Stephen Warren; Tom Warren
Subject: Re: [U-Boot] [PATCH] Tegra: spi: Move TEGRA114_SPI switch to defconfigs
Quoted 21 lines · Simon Glass
Quoted 19 lines · Tom Warren
All T114+ Tegra boards should be using the Kconfig TEGRA114_SPI switch. Remove it from include/config and put it into defconfig. Also removed unused TEGRA114_SPI_CTRLS from T114+ configs.
All Tegra SoCs build OK with this change.
Signed-off-by Tom Warren <[email protected]>
---
 configs/dalmore_defconfig    | 1 +
 configs/jetson-tk1_defconfig | 1 +
 configs/nyan-big_defconfig   | 1 +
 configs/p2571_defconfig      | 1 +
 configs/venice2_defconfig    | 1 +
 include/configs/dalmore.h    | 2 --
 include/configs/jetson-tk1.h | 2 --
 include/configs/nyan-big.h   | 2 --
 include/configs/p2571.h      | 2 --
 include/configs/venice2.h    | 2 --
 10 files changed, 5 insertions(+), 10 deletions(-)

Quoted 8 lines

Quoted 5 lines
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Jagan Teki <[email protected]>
I couldn't find this patch on patchwork, pls- provide the link?
I don't see it in patchworks, either (nor do I see my P2571 cleanup patch that was sent the same day/time). Maybe patchwork was down/busy that day and dropped it?
Are you OK with my taking this in via u-boot-tegra, or do you want to take it in via u-boot-spi?

You can take it, no issues.

thanks!

Signature · 1 line

Jagan | openedev.