Skip to contentSkip to conversation

Hook collie frontlight into sysfs

PATCH Pavel Machek 2 participants 3 messages Mar 30, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hook backlight handling into backlight subsystem, so that backlight is controllable using /sys . I had to shuffle code around a bit in order to avoid prototypes.

PATCH FOLLOWS
KernelVersion: 2.6.16-git

arch/arm/common/locomo.c +21 -22
index a7dc137..8c53ebc 100644
@@ -507,7 +507,7 @@ locomo_init_one_child(struct locomo *lch
 		goto out;
 	}
 
-	strncpy(dev->dev.bus_id,info->name,sizeof(dev->dev.bus_id));
+	strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));
 	/*
 	 * If the parent device has a DMA mask associated with it,
 	 * propagate it down to the children.
@@ -629,21 +629,6 @@ static int locomo_resume(struct platform
 #endif
 
 
-#define LCM_ALC_EN	0x8000
-
-void frontlight_set(struct locomo *lchip, int duty, int vr, int bpwf)
-{
-	unsigned long flags;
-
-	spin_lock_irqsave(&lchip->lock, flags);
-	locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
-	udelay(100);
-	locomo_writel(duty, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
-	locomo_writel(bpwf | LCM_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
-	spin_unlock_irqrestore(&lchip->lock, flags);
-}
-
-
 /**
  *	locomo_probe - probe for a single LoCoMo chip.
  *	@phys_addr: physical address of device.
@@ -698,14 +683,10 @@ __locomo_probe(struct device *me, struct
 			, lchip->base + LOCOMO_GPD);
 	locomo_writel(0, lchip->base + LOCOMO_GIE);
 
-	/* FrontLight */
+	/* Frontlight */
 	locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
 	locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
 
-	/* Same constants can be used for collie and poodle
-	   (depending on CONFIG options in original sharp code)? */
-	frontlight_set(lchip, 163, 0, 148);
-
 	/* Longtime timer */
 	locomo_writel(0, lchip->base + LOCOMO_LTINT);
 	/* SPI */
@@ -749,7 +730,6 @@ __locomo_probe(struct device *me, struct
 
 	for (i = 0; i < ARRAY_SIZE(locomo_devices); i++)
 		locomo_init_one_child(lchip, &locomo_devices[i]);
-
 	return 0;
 
  out:
@@ -1063,6 +1043,25 @@ void locomo_m62332_senddata(struct locom
 }
 
 /*
+ *	Frontlight control
+ */
+
+static struct locomo *locomo_chip_driver(struct locomo_dev *ldev);
+
+void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf)
+{
+	unsigned long flags;
+	struct locomo *lchip = locomo_chip_driver(dev);
+
+	spin_lock_irqsave(&lchip->lock, flags);
+	locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
+	udelay(100);
+	locomo_writel(duty, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
+	locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
+	spin_unlock_irqrestore(&lchip->lock, flags);
+}
+
+/*
  *	LoCoMo "Register Access Bus."
  *
  *	We model this as a regular bus type, and hang devices directly
drivers/video/backlight/locomolcd.c +41 -0

67 lines not on this page · raw message

include/asm-arm/hardware/locomo.h +3 -0
@@ -203,4 +203,7 @@ void locomo_gpio_write(struct locomo_dev
 /* M62332 control function */
 void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int channel);
 
+/* Frontlight control */
+void locomo_frontlight_set(struct locomo_dev *dev, int duty, int vr, int bpwf);
+
 #endif
Signature · 1 line
Picture of sleeping (Linux) penguin wanted...
#1 lore raw
Quoted 3 lines · Pavel Machek

Hook backlight handling into backlight subsystem, so that backlight is controllable using /sys . I had to shuffle code around a bit in order to avoid prototypes.

Hi Pavel,

There are a few issues with this. Firstly,

CC arch/arm/common/locomo.o
arch/arm/common/locomo.c: In function `locomo_frontlight_set':
arch/arm/common/locomo.c:1061: error: `LOCOMO_ALC_EN' undeclared (first use in this function) arch/arm/common/locomo.c:1061: error: (Each undeclared identifier is reported only once arch/arm/common/locomo.c:1061: error: for each function it appears in.) make[1]: *** [arch/arm/common/locomo.o] Error 1

Quoted 17 lines
drivers/video/backlight/locomolcd.c +9 -0
index 60831bb..a95cd25 100644
@@ -105,6 +106,38 @@ void locomolcd_power(int on)
 }
 EXPORT_SYMBOL(locomolcd_power);
 
+
+static int current_intensity;
+
+static int set_intensity(struct backlight_device *bd, int intensity)
+{
+	switch (intensity) {
+	/* AC and non-AC are handled differently, but produce same results in sharp code? */
+	case 0: locomo_frontlight_set(locomolcd_dev, 0, 0, 161); break;
+	case 1: locomo_frontlight_set(locomolcd_dev, 117, 0, 161); break;

drivers/video/backlight/locomolcd.c void locomolcd_power(int on) · line 127

Quoted 10 lines
drivers/video/backlight/locomolcd.c +10 -0
+	case 2: locomo_frontlight_set(locomolcd_dev, 163, 0, 148); break;
+	case 3: locomo_frontlight_set(locomolcd_dev, 194, 0, 161); break;
+	case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break;
+
+	default:
+		locomo_frontlight_set(locomolcd_dev, intensity, 0, 148); break;
+	}
+	current_intensity = intensity;
+	return 0;
+}

That default statement gives cause for concern. Should it not return -EINVAL for intensities outside of 0-4?

drivers/video/backlight/locomolcd.c void locomolcd_power(int on) · line 138

Quoted 10 lines
drivers/video/backlight/locomolcd.c +10 -0
+static int get_intensity(struct backlight_device *bd)
+{
+	return current_intensity;
+}
+
+static struct backlight_properties locomobl_data = {
+	.owner		= THIS_MODULE,
+	.get_brightness = get_intensity,
+	.set_brightness = set_intensity,
+	.max_brightness = 5,

Maximum brightness is 4 above?

Quoted 6 lines
drivers/video/backlight/locomolcd.c +2 -0
+};
+
 static int poodle_lcd_probe(struct locomo_dev *dev)
 {
 	unsigned long flags;

drivers/video/backlight/locomolcd.c static int __init poodle_lcd_init(void) · line 190

Quoted 8 lines
drivers/video/backlight/locomolcd.c +2 -0
@@ -147,8 +183,13 @@ static int __init poodle_lcd_init(void)
 
 #ifdef CONFIG_SA1100_COLLIE
 	sa1100fb_lcd_power = locomolcd_power;
+
+	backlight_device_register("collie-bl", NULL, &locomobl_data);
 #endif
 	return 0;
 }

Could this be changed to:

#ifdef CONFIG_SA1100_COLLIE
	sa1100fb_lcd_power = locomolcd_power;
#endif
	backlight_device_register("locomo-bl", NULL, &locomobl_data);

return 0;

This means that it will also present a backlight interface on poodle. In fact I've already helped a poodle user test this and it works!

Also note that there are some backlight interface changes sitting in -mm (see the linux-fbdev-devel mailing list) which this patch isn't covered by. If this patch gets merged first, I'll make sure it gets adapted to the new interface though (which actually brings some benefits like power attribute implementation for free).

Cheers,

Richard

#2 lore raw

Hi!

Quoted 6 lines
Quoted 3 lines

Hook backlight handling into backlight subsystem, so that backlight is controllable using /sys . I had to shuffle code around a bit in order to avoid prototypes.

Hi Pavel,

Quoted 8 lines

There are a few issues with this. Firstly,

CC arch/arm/common/locomo.o
arch/arm/common/locomo.c: In function `locomo_frontlight_set':
arch/arm/common/locomo.c:1061: error: `LOCOMO_ALC_EN' undeclared (first use in this function) arch/arm/common/locomo.c:1061: error: (Each undeclared identifier is reported only once arch/arm/common/locomo.c:1061: error: for each function it appears in.) make[1]: *** [arch/arm/common/locomo.o] Error 1

Oops, too much hand editing, probably.

Quoted 11 lines
Quoted 11 lines
(quoted diff) +11 -0
+static int set_intensity(struct backlight_device *bd, int intensity)
+{
+	switch (intensity) {
+	/* AC and non-AC are handled differently, but produce same results in sharp code? */
+	case 0: locomo_frontlight_set(locomolcd_dev, 0, 0, 161); break;
+	case 1: locomo_frontlight_set(locomolcd_dev, 117, 0, 161); break;
+	case 2: locomo_frontlight_set(locomolcd_dev, 163, 0, 148); break;
+	case 3: locomo_frontlight_set(locomolcd_dev, 194, 0, 161); break;
+	case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break;
+
+	default:
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+		locomo_frontlight_set(locomolcd_dev, intensity, 0, 148); break;
+	}
+	current_intensity = intensity;
+	return 0;
+}

That default statement gives cause for concern. Should it not return -EINVAL for intensities outside of 0-4?

Well.. I noticed that values 80..194 actually provide continuous selection of backlights, so this was my little hack to play with.

I am not sure if it is okay to leave backlight at some state like that for long ammount of time, nor how is third parameter related...

I guess I'll simply return -EINVAL.

Quoted 4 lines
Quoted 4 lines
(quoted diff) +4 -0
+static int get_intensity(struct backlight_device *bd)
+{
+	return current_intensity;
+}
Quoted 8 lines

Review

Quoted 6 lines
(quoted diff) +6 -0
+
+static struct backlight_properties locomobl_data = {
+	.owner		= THIS_MODULE,
+	.get_brightness = get_intensity,
+	.set_brightness = set_intensity,
+	.max_brightness = 5,

Maximum brightness is 4 above?

It seems to be ignored, anyway, but will fix.

Quoted 17 lines

Review static int __init poodle_lcd_init(void) · line 190

Quoted 9 lines
(quoted diff) +2 -0
@@ -147,8 +183,13 @@ static int __init poodle_lcd_init(void)
 
 #ifdef CONFIG_SA1100_COLLIE
 	sa1100fb_lcd_power = locomolcd_power;
+
+	backlight_device_register("collie-bl", NULL, &locomobl_data);
 #endif
 	return 0;
 }

Could this be changed to:

#ifdef CONFIG_SA1100_COLLIE
	sa1100fb_lcd_power = locomolcd_power;
#endif
	backlight_device_register("locomo-bl", NULL, &locomobl_data);
Quoted 4 lines

return 0;

This means that it will also present a backlight interface on poodle. In fact I've already helped a poodle user test this and it works!

Good -- I had no idea if it would work. Changed.

Quoted 5 lines

Also note that there are some backlight interface changes sitting in -mm (see the linux-fbdev-devel mailing list) which this patch isn't covered by. If this patch gets merged first, I'll make sure it gets adapted to the new interface though (which actually brings some benefits like power attribute implementation for free).

Perhaps I can merge it into your tree (instead of rmk's?).
Pavel

This incremental diff should fix these issues...

PATCH FOLLOWS
KernelVersion: 2.6.16-git-previouspatch

arch/arm/common/locomo.c +1 -0
index bcce028..84b0226 100644
@@ -1090,6 +1090,7 @@ void locomo_frontlight_set(struct locomo
 	locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
 	udelay(100);
 	locomo_writel(duty, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
+#define LOCOMO_ALC_EN	0x8000
 	locomo_writel(bpwf | LOCOMO_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
 	spin_unlock_irqrestore(&lchip->lock, flags);
 }
drivers/video/backlight/locomolcd.c +6 -4
index a95cd25..d033471 100644
@@ -120,7 +120,9 @@ static int set_intensity(struct backligh
 	case 4: locomo_frontlight_set(locomolcd_dev, 194, 1, 161); break;
 
 	default:
-		locomo_frontlight_set(locomolcd_dev, intensity, 0, 148); break;
+		return -EINVAL;
+		/* Actually, other values are possible, too. Everything between 80..194
+		   seems to work as duty parameter */
 	}
 	current_intensity = intensity;
 	return 0;
@@ -135,7 +137,7 @@ static struct backlight_properties locom
 	.owner		= THIS_MODULE,
 	.get_brightness = get_intensity,
 	.set_brightness = set_intensity,
-	.max_brightness = 5,
+	.max_brightness = 4,
 };
 
 static int poodle_lcd_probe(struct locomo_dev *dev)
@@ -183,9 +185,9 @@ static int __init poodle_lcd_init(void)
 
 #ifdef CONFIG_SA1100_COLLIE
 	sa1100fb_lcd_power = locomolcd_power;
-
-	backlight_device_register("collie-bl", NULL, &locomobl_data);
 #endif
+	backlight_device_register("collie-bl", NULL, &locomobl_data);
+
 	return 0;
 }
 device_initcall(poodle_lcd_init);
Signature · 1 line
Picture of sleeping (Linux) penguin wanted...