Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: gta02: Use pcf50633 backlight driver instead of platform backlight driver. backlight: pcf50633: Register a pcf50633-backlight device in pcf50633 core driver. backlight: Add pcf50633 backlight driver backlight: 88pm860x_bl: fix error handling in pm860x_backlight_probe backlight: max8925_bl: Fix error handling path backlight: l4f00242t03: fix error handling in l4f00242t03_probe backlight: add S6E63M0 AMOLED LCD Panel driver backlight: adp8860: add support for ADP8861 & ADP8863 backlight: mbp_nvidia_bl - Fix DMI_SYS_VENDOR for MacBook1,1 backlight: Add Cirrus EP93xx backlight driver backlight: l4f00242t03: Fix regulators handling code in remove function backlight: fix adp8860_bl build errors backlight: new driver for the ADP8860 backlight parts backlight: 88pm860x_bl - potential memory leak backlight: mbp_nvidia_bl - add support for older MacBookPro and MacBook 6,1. backlight: Kconfig cleanup backlight: backlight_device_register() return ERR_PTR()
This commit is contained in:
Linus Torvalds
154
include/linux/i2c/adp8860.h
Normal file
154
include/linux/i2c/adp8860.h
Normal file
@@ -0,0 +1,154 @@
|
||||
/*
|
||||
* Definitions and platform data for Analog Devices
|
||||
* Backlight drivers ADP8860
|
||||
*
|
||||
* Copyright 2009-2010 Analog Devices Inc.
|
||||
*
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_I2C_ADP8860_H
|
||||
#define __LINUX_I2C_ADP8860_H
|
||||
|
||||
#include <linux/leds.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#define ID_ADP8860 8860
|
||||
|
||||
#define ADP8860_MAX_BRIGHTNESS 0x7F
|
||||
#define FLAG_OFFT_SHIFT 8
|
||||
|
||||
/*
|
||||
* LEDs subdevice platform data
|
||||
*/
|
||||
|
||||
#define ADP8860_LED_DIS_BLINK (0 << FLAG_OFFT_SHIFT)
|
||||
#define ADP8860_LED_OFFT_600ms (1 << FLAG_OFFT_SHIFT)
|
||||
#define ADP8860_LED_OFFT_1200ms (2 << FLAG_OFFT_SHIFT)
|
||||
#define ADP8860_LED_OFFT_1800ms (3 << FLAG_OFFT_SHIFT)
|
||||
|
||||
#define ADP8860_LED_ONT_200ms 0
|
||||
#define ADP8860_LED_ONT_600ms 1
|
||||
#define ADP8860_LED_ONT_800ms 2
|
||||
#define ADP8860_LED_ONT_1200ms 3
|
||||
|
||||
#define ADP8860_LED_D7 (7)
|
||||
#define ADP8860_LED_D6 (6)
|
||||
#define ADP8860_LED_D5 (5)
|
||||
#define ADP8860_LED_D4 (4)
|
||||
#define ADP8860_LED_D3 (3)
|
||||
#define ADP8860_LED_D2 (2)
|
||||
#define ADP8860_LED_D1 (1)
|
||||
|
||||
/*
|
||||
* Backlight subdevice platform data
|
||||
*/
|
||||
|
||||
#define ADP8860_BL_D7 (1 << 6)
|
||||
#define ADP8860_BL_D6 (1 << 5)
|
||||
#define ADP8860_BL_D5 (1 << 4)
|
||||
#define ADP8860_BL_D4 (1 << 3)
|
||||
#define ADP8860_BL_D3 (1 << 2)
|
||||
#define ADP8860_BL_D2 (1 << 1)
|
||||
#define ADP8860_BL_D1 (1 << 0)
|
||||
|
||||
#define ADP8860_FADE_T_DIS 0 /* Fade Timer Disabled */
|
||||
#define ADP8860_FADE_T_300ms 1 /* 0.3 Sec */
|
||||
#define ADP8860_FADE_T_600ms 2
|
||||
#define ADP8860_FADE_T_900ms 3
|
||||
#define ADP8860_FADE_T_1200ms 4
|
||||
#define ADP8860_FADE_T_1500ms 5
|
||||
#define ADP8860_FADE_T_1800ms 6
|
||||
#define ADP8860_FADE_T_2100ms 7
|
||||
#define ADP8860_FADE_T_2400ms 8
|
||||
#define ADP8860_FADE_T_2700ms 9
|
||||
#define ADP8860_FADE_T_3000ms 10
|
||||
#define ADP8860_FADE_T_3500ms 11
|
||||
#define ADP8860_FADE_T_4000ms 12
|
||||
#define ADP8860_FADE_T_4500ms 13
|
||||
#define ADP8860_FADE_T_5000ms 14
|
||||
#define ADP8860_FADE_T_5500ms 15 /* 5.5 Sec */
|
||||
|
||||
#define ADP8860_FADE_LAW_LINEAR 0
|
||||
#define ADP8860_FADE_LAW_SQUARE 1
|
||||
#define ADP8860_FADE_LAW_CUBIC1 2
|
||||
#define ADP8860_FADE_LAW_CUBIC2 3
|
||||
|
||||
#define ADP8860_BL_AMBL_FILT_80ms 0 /* Light sensor filter time */
|
||||
#define ADP8860_BL_AMBL_FILT_160ms 1
|
||||
#define ADP8860_BL_AMBL_FILT_320ms 2
|
||||
#define ADP8860_BL_AMBL_FILT_640ms 3
|
||||
#define ADP8860_BL_AMBL_FILT_1280ms 4
|
||||
#define ADP8860_BL_AMBL_FILT_2560ms 5
|
||||
#define ADP8860_BL_AMBL_FILT_5120ms 6
|
||||
#define ADP8860_BL_AMBL_FILT_10240ms 7 /* 10.24 sec */
|
||||
|
||||
/*
|
||||
* Blacklight current 0..30mA
|
||||
*/
|
||||
#define ADP8860_BL_CUR_mA(I) ((I * 127) / 30)
|
||||
|
||||
/*
|
||||
* L2 comparator current 0..1106uA
|
||||
*/
|
||||
#define ADP8860_L2_COMP_CURR_uA(I) ((I * 255) / 1106)
|
||||
|
||||
/*
|
||||
* L3 comparator current 0..138uA
|
||||
*/
|
||||
#define ADP8860_L3_COMP_CURR_uA(I) ((I * 255) / 138)
|
||||
|
||||
struct adp8860_backlight_platform_data {
|
||||
u8 bl_led_assign; /* 1 = Backlight 0 = Individual LED */
|
||||
|
||||
u8 bl_fade_in; /* Backlight Fade-In Timer */
|
||||
u8 bl_fade_out; /* Backlight Fade-Out Timer */
|
||||
u8 bl_fade_law; /* fade-on/fade-off transfer characteristic */
|
||||
|
||||
u8 en_ambl_sens; /* 1 = enable ambient light sensor */
|
||||
u8 abml_filt; /* Light sensor filter time */
|
||||
|
||||
u8 l1_daylight_max; /* use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
u8 l1_daylight_dim; /* typ = 0, use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
u8 l2_office_max; /* use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
u8 l2_office_dim; /* typ = 0, use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
u8 l3_dark_max; /* use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
u8 l3_dark_dim; /* typ = 0, use BL_CUR_mA(I) 0 <= I <= 30 mA */
|
||||
|
||||
u8 l2_trip; /* use L2_COMP_CURR_uA(I) 0 <= I <= 1106 uA */
|
||||
u8 l2_hyst; /* use L2_COMP_CURR_uA(I) 0 <= I <= 1106 uA */
|
||||
u8 l3_trip; /* use L3_COMP_CURR_uA(I) 0 <= I <= 551 uA */
|
||||
u8 l3_hyst; /* use L3_COMP_CURR_uA(I) 0 <= I <= 551 uA */
|
||||
|
||||
/**
|
||||
* Independent Current Sinks / LEDS
|
||||
* Sinks not assigned to the Backlight can be exposed to
|
||||
* user space using the LEDS CLASS interface
|
||||
*/
|
||||
|
||||
int num_leds;
|
||||
struct led_info *leds;
|
||||
u8 led_fade_in; /* LED Fade-In Timer */
|
||||
u8 led_fade_out; /* LED Fade-Out Timer */
|
||||
u8 led_fade_law; /* fade-on/fade-off transfer characteristic */
|
||||
u8 led_on_time;
|
||||
|
||||
/**
|
||||
* Gain down disable. Setting this option does not allow the
|
||||
* charge pump to switch to lower gains. NOT AVAILABLE on ADP8860
|
||||
* 1 = the charge pump doesn't switch down in gain until all LEDs are 0.
|
||||
* The charge pump switches up in gain as needed. This feature is
|
||||
* useful if the ADP8863 charge pump is used to drive an external load.
|
||||
* This feature must be used when utilizing small fly capacitors
|
||||
* (0402 or smaller).
|
||||
* 0 = the charge pump automatically switches up and down in gain.
|
||||
* This provides optimal efficiency, but is not suitable for driving
|
||||
* loads that are not connected through the ADP8863 diode drivers.
|
||||
* Additionally, the charge pump fly capacitors should be low ESR
|
||||
* and sized 0603 or greater.
|
||||
*/
|
||||
|
||||
u8 gdwn_dis;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_I2C_ADP8860_H */
|
||||
@@ -69,6 +69,29 @@ struct lcd_device {
|
||||
struct device dev;
|
||||
};
|
||||
|
||||
struct lcd_platform_data {
|
||||
/* reset lcd panel device. */
|
||||
int (*reset)(struct lcd_device *ld);
|
||||
/* on or off to lcd panel. if 'enable' is 0 then
|
||||
lcd power off and 1, lcd power on. */
|
||||
int (*power_on)(struct lcd_device *ld, int enable);
|
||||
|
||||
/* it indicates whether lcd panel was enabled
|
||||
from bootloader or not. */
|
||||
int lcd_enabled;
|
||||
/* it means delay for stable time when it becomes low to high
|
||||
or high to low that is dependent on whether reset gpio is
|
||||
low active or high active. */
|
||||
unsigned int reset_delay;
|
||||
/* stable time needing to become lcd power on. */
|
||||
unsigned int power_on_delay;
|
||||
/* stable time needing to become lcd power off. */
|
||||
unsigned int power_off_delay;
|
||||
|
||||
/* it could be used for any purpose. */
|
||||
void *pdata;
|
||||
};
|
||||
|
||||
static inline void lcd_set_power(struct lcd_device *ld, int power)
|
||||
{
|
||||
mutex_lock(&ld->update_lock);
|
||||
|
||||
51
include/linux/mfd/pcf50633/backlight.h
Normal file
51
include/linux/mfd/pcf50633/backlight.h
Normal file
@@ -0,0 +1,51 @@
|
||||
/*
|
||||
* Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
|
||||
* PCF50633 backlight device driver
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MFD_PCF50633_BACKLIGHT
|
||||
#define __LINUX_MFD_PCF50633_BACKLIGHT
|
||||
|
||||
/*
|
||||
* @default_brightness: Backlight brightness is initialized to this value
|
||||
*
|
||||
* Brightness to be used after the driver has been probed.
|
||||
* Valid range 0-63.
|
||||
*
|
||||
* @default_brightness_limit: The actual brightness is limited by this value
|
||||
*
|
||||
* Brightness limit to be used after the driver has been probed. This is useful
|
||||
* when it is not known how much power is available for the backlight during
|
||||
* probe.
|
||||
* Valid range 0-63. Can be changed later with pcf50633_bl_set_brightness_limit.
|
||||
*
|
||||
* @ramp_time: Display ramp time when changing brightness
|
||||
*
|
||||
* When changing the backlights brightness the change is not instant, instead
|
||||
* it fades smooth from one state to another. This value specifies how long
|
||||
* the fade should take. The lower the value the higher the fade time.
|
||||
* Valid range 0-255
|
||||
*/
|
||||
struct pcf50633_bl_platform_data {
|
||||
unsigned int default_brightness;
|
||||
unsigned int default_brightness_limit;
|
||||
uint8_t ramp_time;
|
||||
};
|
||||
|
||||
|
||||
struct pcf50633;
|
||||
|
||||
int pcf50633_bl_set_brightness_limit(struct pcf50633 *pcf, unsigned int limit);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <linux/regulator/driver.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/power_supply.h>
|
||||
#include <linux/mfd/pcf50633/backlight.h>
|
||||
|
||||
struct pcf50633;
|
||||
|
||||
@@ -43,6 +44,8 @@ struct pcf50633_platform_data {
|
||||
void (*force_shutdown)(struct pcf50633 *);
|
||||
|
||||
u8 resumers[5];
|
||||
|
||||
struct pcf50633_bl_platform_data *backlight_data;
|
||||
};
|
||||
|
||||
struct pcf50633_irq {
|
||||
@@ -152,6 +155,7 @@ struct pcf50633 {
|
||||
struct platform_device *mbc_pdev;
|
||||
struct platform_device *adc_pdev;
|
||||
struct platform_device *input_pdev;
|
||||
struct platform_device *bl_pdev;
|
||||
struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS];
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user