TWL4030: make LEDs selectable in twl4030_led_init()
PATCH 1/1 TWL4030: make LEDs selectable in twl4030_led_init()
Not all boards have both LEDs hooked, so enabling both on boards with single LED will just waste power. Make it possible to choose LEDs by adding argument to twl4030_led_init().
Using this turn on only LEDB for pandora, leave both LEDs on for all other boards, as it was before this patch.
--- board/logicpd/zoom1/zoom1.c | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- board/overo/overo.c | 2 +- board/pandora/pandora.c | 2 +- board/ti/beagle/beagle.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- drivers/misc/twl4030_led.c | 11 +++++++---- include/twl4030.h | 5 ++++- 8 files changed, 17 insertions(+), 11 deletions(-)
board/logicpd/zoom1/zoom1.c +1 -1
@@ -62,7 +62,7 @@ int board_init(void)int misc_init_r (void ) {twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );dieid_num_r ();/*
board/logicpd/zoom2/zoom2.c +1 -1
@@ -148,7 +148,7 @@ int misc_init_r(void) {zoom2_identify ();twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );dieid_num_r ();/*
board/overo/overo.c +1 -1
@@ -67,7 +67,7 @@ int board_init(void)int misc_init_r (void ) {twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );#if defined(CONFIG_CMD_NET )setup_net_chip ();
board/pandora/pandora.c +1 -1
@@ -66,7 +66,7 @@ int misc_init_r(void)struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE ;twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDB );/* Configure GPIOs to output */ writel (~(GPIO14 |GPIO15 |GPIO16 |GPIO23 ), &gpio1_base->oe);
board/ti/beagle/beagle.c +1 -1
@@ -107,7 +107,7 @@ int misc_init_r(void)struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE ;twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );/* Configure GPIOs to output */ writel (~(GPIO23 |GPIO10 |GPIO8 |GPIO2 |GPIO1 ), &gpio6_base->oe);
board/timll/devkit8000/devkit8000.c +1 -1
@@ -76,7 +76,7 @@ int misc_init_r(void)twl4030_power_init ();#ifdef CONFIG_TWL4030_LED -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );#endif #ifdef CONFIG_DRIVER_DM9000
drivers/misc/twl4030_led.c +7 -4
@@ -39,12 +39,15 @@#define LEDAPWM (0x1 << 4)#define LEDBPWM (0x1 << 5) -void twl4030_led_init (void ) +void twl4030_led_init (unsigned int ledon_mask) { -unsigned char byte; +unsigned char byte =0 ; -/* enable LED */ - byte =LEDBPWM |LEDAPWM |LEDBON |LEDAON ; +/* enable LEDs */ +if (ledon_mask &TWL4030_LEDON_LEDA ) + byte |=LEDAPWM |LEDAON ; +if (ledon_mask &TWL4030_LEDON_LEDB ) + byte |=LEDBPWM |LEDBON ;twl4030_i2c_write_u8 (TWL4030_CHIP_LED , byte,TWL4030_LED_LEDEN );
include/twl4030.h +4 -1
@@ -396,6 +396,9 @@ void twl4030_power_mmc_init(void);/* * LED */ -void twl4030_led_init (void ); +#define TWL4030_LEDON_LEDA (1 << 0) +#define TWL4030_LEDON_LEDB (1 << 1) + +void twl4030_led_init (unsigned int ledon_mask);#endif /* TWL4030_H */
Signature · 1 line
1.6.3.3
PATCH 1/1 TWL4030: make LEDs selectable in twl4030_led_init()
Quoted 107 lines · Grazvydas Ignotas
Not all boards have both LEDs hooked, so enabling both on boards with single LED will just waste power. Make it possible to choose LEDs by adding argument to
twl4030_led_init().Using this turn on only LEDB for pandora, leave both LEDs on for all other boards, as it was before this patch.
Signed-off-by Grazvydas Ignotas <[email protected]>--- board/logicpd/zoom1/zoom1.c | 2 +- board/logicpd/zoom2/zoom2.c | 2 +- board/overo/overo.c | 2 +- board/pandora/pandora.c | 2 +- board/ti/beagle/beagle.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- drivers/misc/twl4030_led.c | 11 +++++++---- include/twl4030.h | 5 ++++- 8 files changed, 17 insertions(+), 11 deletions(-)board/logicpd/zoom1/zoom1.c +1
-1@@ -62,7 +62,7 @@ int board_init(void)int misc_init_r (void ) {twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );dieid_num_r ();/* board/logicpd/zoom2/zoom2.c +1
-1@@ -148,7 +148,7 @@ int misc_init_r(void) {zoom2_identify ();twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );dieid_num_r ();/* board/overo/overo.c +1
-1@@ -67,7 +67,7 @@ int board_init(void)int misc_init_r (void ) {twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );#if defined(CONFIG_CMD_NET )setup_net_chip ();board/pandora/pandora.c +1
-1@@ -66,7 +66,7 @@ int misc_init_r(void)struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE ;twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDB );/* Configure GPIOs to output */ writel (~(GPIO14 |GPIO15 |GPIO16 |GPIO23 ), &gpio1_base->oe);board/ti/beagle/beagle.c +1
-1@@ -107,7 +107,7 @@ int misc_init_r(void)struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE ;twl4030_power_init (); -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );/* Configure GPIOs to output */ writel (~(GPIO23 |GPIO10 |GPIO8 |GPIO2 |GPIO1 ), &gpio6_base->oe);board/timll/devkit8000/devkit8000.c +1
-1@@ -76,7 +76,7 @@ int misc_init_r(void)twl4030_power_init ();#ifdef CONFIG_TWL4030_LED -twl4030_led_init (); +twl4030_led_init (TWL4030_LEDON_LEDA |TWL4030_LEDON_LEDB );#endif #ifdef CONFIG_DRIVER_DM9000 drivers/misc/twl4030_led.c +0
-1@@ -39,12 +39,15 @@#define LEDAPWM (0x1 << 4)#define LEDBPWM (0x1 << 5) -void twl4030_led_init (void )
drivers/misc/twl4030_led.c line 48
Quoted 10 lines
drivers/misc/twl4030_led.c +5
-3+void twl4030_led_init (unsigned int ledon_mask) { -unsigned char byte; +unsigned char byte =0 ; -/* enable LED */ - byte =LEDBPWM |LEDAPWM |LEDBON |LEDAON ; +/* enable LEDs */ +if (ledon_mask &TWL4030_LEDON_LEDA ) + byte |=LEDAPWM |LEDAON ;
TWL4030_LEDON_LEDA and LEDAON are the same. You can move all the #defined twl4030 bits to twl4030. So there there should be
#define TWL4030_LED_LEDEN_LEDAON (0x1 << 0)
#define TWL4030_LED_LEDEN_LEDBON (0x1 << 1)
#define TWL4030_LED_LEDEN_LEDAPWM (0x1 << 4)
#define TWL4030_LED_LEDEN_LEDBPWM (0x1 << 5)
These should be listed under the LED define
/* LED */
#define TWL4030_LED_LEDEN 0xEE
Quoted 20 lines
drivers/misc/twl4030_led.c +2
-0+if (ledon_mask &TWL4030_LEDON_LEDB ) + byte |=LEDBPWM |LEDBON ;twl4030_i2c_write_u8 (TWL4030_CHIP_LED , byte,TWL4030_LED_LEDEN );include/twl4030.h +4
-1@@ -396,6 +396,9 @@ void twl4030_power_mmc_init(void);/* * LED */ -void twl4030_led_init (void ); +#define TWL4030_LEDON_LEDA (1 << 0) +#define TWL4030_LEDON_LEDB (1 << 1) + +void twl4030_led_init (unsigned int ledon_mask);#endif /* TWL4030_H */
PATCH 1/1 TWL4030: make LEDs selectable in twl4030_led_init()
Quoted 2 lines · Tom
Quoted 1 line · Grazvydas Ignotas
<snip>
Quoted 27 lines
Quoted 12 lines
drivers/misc/twl4030_led.c +2
-1@@ -39,12 +39,15 @@ ?#define LEDAPWM ? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 4) ?#define LEDBPWM ? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 5) ?-void twl4030_led_init(void) +void twl4030_led_init(unsigned int ledon_mask) ?{ - ? ? ? unsigned char byte; + ? ? ? unsigned char byte = 0;Quoted 5 lines
?- ? ? ? /* enable LED */
- ? ? ? byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON;
+ ? ? ? /* enable LEDs */
+ ? ? ? if (ledon_mask&TWL4030_LEDON_LEDA)
+ ? ? ? ? ? ? ? byte |= LEDAPWM | LEDAON;
TWL4030_LEDON_LEDAand LEDAON are the same. You can move all the #defined twl4030 bits to twl4030. So there there should be#define
TWL4030_LED_LEDEN_LEDAON? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 0) #defineTWL4030_LED_LEDEN_LEDBON? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 1) #defineTWL4030_LED_LEDEN_LEDAPWM? ? ? ? ? ? ? ? ? ? ? (0x1<< 4) #defineTWL4030_LED_LEDEN_LEDBPWM? ? ? ? ? ? ? ? ? ? ? (0x1<< 5)
Quoted 4 lines
These should be listed under the LED define
/* LED */
#defineTWL4030_LED_LEDEN? ? ? ? ? ? ? ? ? ? ? ? ? ? ?0xEE
So, do you want twl4030_led_init() argument to take raw LEDEN register value, or just move TWL4030_LED* defines to twl4030.h? If twl4030_led_init() will just take register value now, maybe it can be replaced with twl4030_i2c_write_u8() and drivers/misc/twl4030_led.c removed, as it just becomes wrapper?
Quoted 22 lines
Quoted 20 lines
+ ? ? ? if (
ledon_mask&TWL4030_LEDON_LEDB)
+ ? ? ? ? ? ? ? byte |= LEDBPWM | LEDBON;
? ? ? ? ?twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte, ? ? ? ? ? ? ? ? ? ? ? ? ? ?TWL4030_LED_LEDEN);include/twl4030.h +0
-0@@ -396,6 +396,9 @@ void twl4030_power_mmc_init(void);?/*
?* LED
?*/include/twl4030.h +4
-1-void twl4030_led_init (void ); +#define TWL4030_LEDON_LEDA ? ? (1 << 0) +#define TWL4030_LEDON_LEDB ? ? (1 << 1) + +void twl4030_led_init (unsigned int ledon_mask);??#endif /*
TWL4030_H*/