[U-Boot] [PATCH 0/2] power: TWL4030: Move CONFIG_TWL4030_POWER to Kconfig
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
As requested, I added the CONFIG_TWL4030_POWER to Kconfig and made it the implied default when selecting OMAP34XX as a platform.
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7812f21..f9ecded 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -702,6 +702,7 @@ config OMAP34XX imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT imply SYS_THUMB_BUILD + imply TWL4030_POWER
config OMAP44XX bool "OMAP44XX SoC" diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 64e5bc2..4b00b35 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -304,4 +304,11 @@ config SY8106A_VOUT1_VOLT is typically used to power the VDD-CPU and should be 1200mV. Values can range from 680mV till 1950mV.
+config TWL4030_POWER + depends on OMAP34XX + bool "Enable driver for TI TWL4030 power management chip" + ---help--- + The TWL4030 in a combination audio CODEC/power management with + GPIO and it is commonly used with the OMAP3 family of processors + endmenu
On 26 April 2017 at 12:41, Adam Ford aford173@gmail.com wrote:
As requested, I added the CONFIG_TWL4030_POWER to Kconfig and made it the implied default when selecting OMAP34XX as a platform.
Signed-off-by: Adam Ford aford173@gmail.com
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Apr 26, 2017 at 01:41:31PM -0500, Adam Ford wrote:
As requested, I added the CONFIG_TWL4030_POWER to Kconfig and made it the implied default when selecting OMAP34XX as a platform.
Signed-off-by: Adam Ford aford173@gmail.com Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7812f21..f9ecded 100644
Applied to u-boot/master, thanks!
With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8e6571b..8d15c78 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -109,7 +109,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index e99968c..c2c02b1 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -128,7 +128,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED #define CONFIG_TWL4030_KEYPAD
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 329dc73..bf5b2f5 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -89,7 +89,6 @@ #define CONFIG_SDRC /* The chip has SDRC controller */
#define CONFIG_OMAP3_EVM /* This is a OMAP3 EVM */ -#define CONFIG_TWL4030_POWER /* with TWL4030 PMIC */
/* * Clock related definitions diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 6ddb83f..5214827 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -83,12 +83,6 @@ #define CONFIG_I2C_MULTI_BUS
/* - * Power - */ - -#define CONFIG_TWL4030_POWER - -/* * Input */
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 3f2da57..3ea2caf 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -90,7 +90,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 0147662..393d867 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -58,9 +58,6 @@
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
-/* TWL4030 */ -#define CONFIG_TWL4030_POWER - /* SPL */ #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index fc70be1..9741ca5 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -82,7 +82,6 @@ #define CONFIG_SYS_EEPROM_BUS_NUM 1
/* TWL4030 */ -#define CONFIG_TWL4030_POWER #define CONFIG_TWL4030_LED
/* Board NAND Info */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5e515d2..d39a16e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -6360,7 +6360,6 @@ CONFIG_TUXX1 CONFIG_TWL4030_INPUT CONFIG_TWL4030_KEYPAD CONFIG_TWL4030_LED -CONFIG_TWL4030_POWER CONFIG_TWL4030_PWM CONFIG_TWL4030_USB CONFIG_TWL6030_INPUT
On 26 April 2017 at 12:41, Adam Ford aford173@gmail.com wrote:
With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com
Missing -- here?
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, Apr 28, 2017 at 7:28 PM, Simon Glass sjg@chromium.org wrote:
On 26 April 2017 at 12:41, Adam Ford aford173@gmail.com wrote:
With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com
Missing -- here?
I am not sure what you're saying.
adam
Reviewed-by: Simon Glass sjg@chromium.org
Hi Adam,
On 29 April 2017 at 09:21, Adam Ford aford173@gmail.com wrote:
On Fri, Apr 28, 2017 at 7:28 PM, Simon Glass sjg@chromium.org wrote:
On 26 April 2017 at 12:41, Adam Ford aford173@gmail.com wrote:
With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com
Missing -- here?
I am not sure what you're saying.
Normally there is a line in the patch like this:
---
which separates the commit message from the patch. How did you generate this patch?
adam
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Apr 26, 2017 at 01:41:32PM -0500, Adam Ford wrote:
With the addition of Kconfig now having CONFIG_TWL4030_POWER and with that being the default when OMAP34XX is selected, this is no longer needed in include/configs and can be removed from the whitelist.
This has only been tested on logic PD DM3730 using ti_omap3_common.h
Signed-off-by: Adam Ford aford173@gmail.com Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8e6571b..8d15c78 100644
Applied to u-boot/master, thanks!
On Wed, Apr 26, 2017 at 01:41:30PM -0500, Adam Ford wrote:
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
This looks good, but should just be a single patch that adds to Kconfig and updates the include files. Thanks for doing this!
On Wed, Apr 26, 2017 at 2:49 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 01:41:30PM -0500, Adam Ford wrote:
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
This looks good, but should just be a single patch that adds to Kconfig and updates the include files. Thanks for doing this!
Do you want me to re-post with a V2 with them merged?
-- Tom
On Wed, Apr 26, 2017 at 02:55:08PM -0500, Adam Ford wrote:
On Wed, Apr 26, 2017 at 2:49 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 01:41:30PM -0500, Adam Ford wrote:
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
This looks good, but should just be a single patch that adds to Kconfig and updates the include files. Thanks for doing this!
Do you want me to re-post with a V2 with them merged?
No, that's OK. Just keep in mind in case anyone else has comments. Thanks!
On Wed, Apr 26, 2017 at 3:19 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 02:55:08PM -0500, Adam Ford wrote:
On Wed, Apr 26, 2017 at 2:49 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 01:41:30PM -0500, Adam Ford wrote:
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
This looks good, but should just be a single patch that adds to Kconfig and updates the include files. Thanks for doing this!
Do you want me to re-post with a V2 with them merged?
No, that's OK. Just keep in mind in case anyone else has comments. Thanks!
So, call me oblivious, but I just learned about moveconfigs.py (facepalm)
I was going tackle more Kconfig migration, but I was struggling figuring out how to autoupdate defconfigs. Is there an example I can follow?
adam
-- Tom
On Thu, Apr 27, 2017 at 09:33:58AM -0500, Adam Ford wrote:
On Wed, Apr 26, 2017 at 3:19 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 02:55:08PM -0500, Adam Ford wrote:
On Wed, Apr 26, 2017 at 2:49 PM, Tom Rini trini@konsulko.com wrote:
On Wed, Apr 26, 2017 at 01:41:30PM -0500, Adam Ford wrote:
This series will move CONFIG_TWL4030_POWER to Kconfig from include/configs. It will enable it by default when selecting OMAP34XX and remove it from a small handful of include/config files that are not yet using ti_omap3_common.h as well as ti_omap3_common.h. I do not have the other hardware, but I tested this with a Logic PD Torpedo based on a DM3730 (OMAP3630) without issue.
Adam Ford (2): power: twl4030: Move CONFIG_TWL4030_POWER to Kconfig power: twl4030: Remove CONFIG_TWL4030_POWER from include/configs
arch/arm/Kconfig | 1 + drivers/power/Kconfig | 7 +++++++ include/configs/cm_t35.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/sniper.h | 6 ------ include/configs/tao3530.h | 1 - include/configs/ti_omap3_common.h | 3 --- include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 1 - 10 files changed, 8 insertions(+), 15 deletions(-)
This looks good, but should just be a single patch that adds to Kconfig and updates the include files. Thanks for doing this!
Do you want me to re-post with a V2 with them merged?
No, that's OK. Just keep in mind in case anyone else has comments. Thanks!
So, call me oblivious, but I just learned about moveconfigs.py (facepalm)
I was going tackle more Kconfig migration, but I was struggling figuring out how to autoupdate defconfigs. Is there an example I can follow?
Well, my workflow is to add X to the Kconfig file and run my moveconfig.py wrapper for the new option, and then check over the changes, to see if I should use imply or default y if ... in places. And I start out by doing a moveconfig.py -sC to re-sync all defconfigs first so I don't see that noise.
My wrapper around moveconfig.py is just to make sure PATH has all of the cross toolchains, and then to set CROSS_COMPILE_xxx for a lot of architectures.
participants (3)
-
Adam Ford -
Simon Glass -
Tom Rini