Skip to contentSkip to conversation

TWL4030: make LEDs selectable in twl4030_led_init()

RFC PATCH New Grazvydas Ignotas 2 participants 3 messages Nov 30, 2009 – Dec 1, 2009 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

RFC 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 arguments to twl4030_led_init().

---
 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                   |    2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)
board/logicpd/zoom1/zoom1.c +1 -1
index f4d3754..093b1bf 100644
@@ -62,7 +62,7 @@ int board_init(void)
 int misc_init_r(void)
 {
 	twl4030_power_init();
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 	dieid_num_r();
 
 	/*
board/logicpd/zoom2/zoom2.c +1 -1
index dadbeb6..c93aeec 100644
@@ -148,7 +148,7 @@ int misc_init_r(void)
 {
 	zoom2_identify();
 	twl4030_power_init();
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 	dieid_num_r();
 
 	/*
board/overo/overo.c +1 -1
index d42dc13..29600b0 100644
@@ -67,7 +67,7 @@ int board_init(void)
 int misc_init_r(void)
 {
 	twl4030_power_init();
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 
 #if defined(CONFIG_CMD_NET)
 	setup_net_chip();
board/pandora/pandora.c +1 -1
index 460ed12..c8007dc 100644
@@ -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(0, 1);
 
 	/* Configure GPIOs to output */
 	writel(~(GPIO14 | GPIO15 | GPIO16 | GPIO23), &gpio1_base->oe);
board/ti/beagle/beagle.c +1 -1
index 32d501e..87c9b0f 100644
@@ -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(1, 1);
 
 	/* Configure GPIOs to output */
 	writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe);
board/timll/devkit8000/devkit8000.c +1 -1
index db7d2e2..7eb7793 100644
@@ -76,7 +76,7 @@ int misc_init_r(void)
 
 	twl4030_power_init();
 #ifdef CONFIG_TWL4030_LED
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 #endif
 
 #ifdef CONFIG_DRIVER_DM9000
drivers/misc/twl4030_led.c +7 -4
index bfdafef..9e945a4 100644
@@ -39,12 +39,15 @@
 #define LEDAPWM			(0x1 << 4)
 #define LEDBPWM			(0x1 << 5)
 
-void twl4030_led_init(void)
+void twl4030_led_init(int leda_on, int ledb_on)
 {
-	unsigned char byte;
+	unsigned char byte = 0;
 
-	/* enable LED */
-	byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON;
+	/* enable LEDs */
+	if (leda_on)
+		byte |= LEDAPWM | LEDAON;
+	if (ledb_on)
+		byte |= LEDBPWM | LEDBON;
 
 	twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte,
 			     TWL4030_LED_LEDEN);
include/twl4030.h +1 -1
index f260ecb..82b3682 100644
@@ -396,6 +396,6 @@ void twl4030_power_mmc_init(void);
 /*
  * LED
  */
-void twl4030_led_init(void);
+void twl4030_led_init(int leda_on, int ledb_on);
 
 #endif /* TWL4030_H */
Signature · 1 line
1.6.3.3
#1 lore raw

RFC PATCH 1/1 TWL4030: make LEDs selectable in twl4030_led_init()

Quoted 3 lines · Grazvydas Ignotas

Not all boards have both LEDs hooked, so enabling both on boards with single LED will just waste power.

This looks like a pandora specific change.
Please say something like, "For Pandora, only 1 led is required.. "

In some cases, the twl4030 led is the only led for the board. In this case, it would be good if the twl4030 led was hooked into the status led functionality. There is already an interface to turning led's on and off.

Quoted 20 lines

Make it possible to choose LEDs by adding arguments to twl4030_led_init().

---
 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                   |    2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)
board/logicpd/zoom1/zoom1.c +0 -0
index f4d3754..093b1bf 100644

board/logicpd/zoom1/zoom1.c int board_init(void) · line 65

Quoted 5 lines
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(1, 1);

I do not like passing in immediates.

Quoted 73 lines
board/logicpd/zoom1/zoom1.c +0 -0
 	dieid_num_r();
 
 	/*
board/logicpd/zoom2/zoom2.c +1 -1
index dadbeb6..c93aeec 100644
@@ -148,7 +148,7 @@ int misc_init_r(void)
 {
 	zoom2_identify();
 	twl4030_power_init();
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 	dieid_num_r();
 
 	/*
board/overo/overo.c +1 -1
index d42dc13..29600b0 100644
@@ -67,7 +67,7 @@ int board_init(void)
 int misc_init_r(void)
 {
 	twl4030_power_init();
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 
 #if defined(CONFIG_CMD_NET)
 	setup_net_chip();
board/pandora/pandora.c +1 -1
index 460ed12..c8007dc 100644
@@ -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(0, 1);
 
 	/* Configure GPIOs to output */
 	writel(~(GPIO14 | GPIO15 | GPIO16 | GPIO23), &gpio1_base->oe);
board/ti/beagle/beagle.c +1 -1
index 32d501e..87c9b0f 100644
@@ -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(1, 1);
 
 	/* Configure GPIOs to output */
 	writel(~(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1), &gpio6_base->oe);
board/timll/devkit8000/devkit8000.c +1 -1
index db7d2e2..7eb7793 100644
@@ -76,7 +76,7 @@ int misc_init_r(void)
 
 	twl4030_power_init();
 #ifdef CONFIG_TWL4030_LED
-	twl4030_led_init();
+	twl4030_led_init(1, 1);
 #endif
 
 #ifdef CONFIG_DRIVER_DM9000
drivers/misc/twl4030_led.c +0 -0
index bfdafef..9e945a4 100644

drivers/misc/twl4030_led.c line 43

Quoted 6 lines
drivers/misc/twl4030_led.c +1 -1
@@ -39,12 +39,15 @@
 #define LEDAPWM			(0x1 << 4)
 #define LEDBPWM			(0x1 << 5)
 
-void twl4030_led_init(void)
+void twl4030_led_init(int leda_on, int ledb_on)
 {

This must change to passing in a #defin-ed parameters. This can be something like

void twl4030_led_init(unsigned char ledon)

where ledon can be

at most (LEDAON | LEDBON)

Export LEDAON and LEDBON so the namespace is ok. Something like TWL4030_LED_LEDEN_LEDAON etc should be added to twl4030.h

Quoted 25 lines
drivers/misc/twl4030_led.c +6 -3
-	unsigned char byte;
+	unsigned char byte = 0;
 
-	/* enable LED */
-	byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON;
+	/* enable LEDs */
+	if (leda_on)
+		byte |= LEDAPWM | LEDAON;
+	if (ledb_on)
+		byte |= LEDBPWM | LEDBON;
 
 	twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte,
 			     TWL4030_LED_LEDEN);
include/twl4030.h +1 -1
index f260ecb..82b3682 100644
@@ -396,6 +396,6 @@ void twl4030_power_mmc_init(void);
 /*
  * LED
  */
-void twl4030_led_init(void);
+void twl4030_led_init(int leda_on, int ledb_on);
 
 #endif /* TWL4030_H */
#2 lore raw

RFC PATCH 1/1 TWL4030: make LEDs selectable in twl4030_led_init()

Quoted 8 lines · Tom
Quoted 4 lines · Grazvydas Ignotas

Not all boards have both LEDs hooked, so enabling both on boards with single LED will just waste power.

This looks like a pandora specific change.
Please say something like, "For Pandora, only 1 led is required.. "

ok

Quoted 4 lines

In some cases, the twl4030 led is the only led for the board. In this case, it would be good if the twl4030 led was hooked into the status led functionality. ?There is already an interface to turning led's on and off.

Yes, but that code would have to be duplicated for all such boards (as LEDs are board specific), and it would make more difficult to add additional non-TWL4030 controlled LEDs later (for example pandora has some but doesn't expose them to u-boot).

<snip>

Quoted 14 lines

drivers/misc/twl4030_led.c line 43

Quoted 8 lines
drivers/misc/twl4030_led.c +1 -0
@@ -39,12 +39,15 @@
 ?#define LEDAPWM ? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 4)
 ?#define LEDBPWM ? ? ? ? ? ? ? ? ? ? ? ?(0x1 << 5)
 ?-void twl4030_led_init(void)
+void twl4030_led_init(int leda_on, int ledb_on)
 ?{

This must change to passing in a #defin-ed parameters. This can be something like

void twl4030_led_init(unsigned char ledon)

Quoted 7 lines

where ledon can be

at most (LEDAON | LEDBON)

Export LEDAON and LEDBON so the namespace is ok. Something like TWL4030_LED_LEDEN_LEDAON etc should be added to twl4030.h

ok, will do this then.

Quoted 25 lines
Quoted 23 lines
drivers/misc/twl4030_led.c +1 -1
- ? ? ? unsigned char byte;
+ ? ? ? unsigned char byte = 0;

?- ? ? ? /* enable LED */
- ? ? ? byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON;
+ ? ? ? /* enable LEDs */
+ ? ? ? if (leda_on)
+ ? ? ? ? ? ? ? byte |= LEDAPWM | LEDAON;
+ ? ? ? if (ledb_on)
+ ? ? ? ? ? ? ? byte |= LEDBPWM | LEDBON;
? ? ? ? ?twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte, ? ? ? ? ? ? ? ? ? ? ? ? ? ? TWL4030_LED_LEDEN);

include/twl4030.h +0 -0
index f260ecb..82b3682 100644
@@ -396,6 +396,6 @@ void twl4030_power_mmc_init(void);

?/*
?* LED
?*/

include/twl4030.h +1 -1
-void twl4030_led_init(void);
+void twl4030_led_init(int leda_on, int ledb_on);

??#endif /* TWL4030_H */