Commit 9ab073bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev changes from Tomi Valkeinen:
 - Improvements to da8xx-fb to make it support v2 of the LCDC IP, used
   eg in BeagleBone
 - Himax HX8369 controller support
 - Various small fixes and cleanups

* tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
  video: da8xx-fb: fix the polarities of the hsync/vsync pulse
  video: da8xx-fb: support lcdc v2 timing register expansion
  video: da8xx-fb: fixing timing off by one errors
  video: da8xx-fb fixing incorrect porch mappings
  video: xilinxfb: replace devm_request_and_ioremap by devm_ioremap_resource
  fbmem: move EXPORT_SYMBOL annotation next to symbol declarations
  drivers: video: fbcmap: remove the redundency and incorrect checkings
  video: mxsfb: simplify use of devm_ioremap_resource
  Release efifb's colormap in efifb_destroy()
  at91/avr32/atmel_lcdfb: prepare clk before calling enable
  video: exynos: Ensure definitions match prototypes
  OMAPDSS: fix WARN_ON in 'alpha_blending_enabled' sysfs file
  OMAPDSS: HDMI: Fix possible NULL reference
  video: da8xx-fb: adding am33xx as dependency
  video: da8xx-fb: let compiler decide what to inline
  video: da8xx-fb: make clock naming consistent
  video: da8xx-fb: set upstream clock rate (if reqd)
  video: da8xx-fb: reorganize panel detection
  video: da8xx-fb: ensure non-null cfg in pdata
  video: da8xx-fb: use devres
  ...
parents eced5a0a 028cd86b

Documentation/devicetree/bindings/video/simple-framebuffer.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
- stride: The number of bytes in each line of the framebuffer.

- format: The format of the framebuffer surface. Valid values are:

  - r5g6b5 (16-bit pixels, d[15:11]=r, d[10:5]=g, d[4:0]=b).

  - a8b8g8r8 (32-bit pixels, d[31:24]=a, d[23:16]=b, d[15:8]=g, d[7:0]=r).



Example:

drivers/video/Kconfig

+5 −10
Original line number Diff line number Diff line
@@ -2100,13 +2100,6 @@ config GPM1040A0_320X240 
        bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD"

        depends on FB_NUC900



config FB_NUC900_DEBUG

        bool "NUC900 lcd debug messages"

        depends on FB_NUC900

        help

          Turn on debugging messages. Note that you can set/unset at run time

          through sysfs



config FB_SM501

	tristate "Silicon Motion SM501 framebuffer support"

	depends on FB && MFD_SM501
@@ -2228,15 +2221,17 @@ config FB_SH7760 
	  panels <= 320 pixel horizontal resolution.



config FB_DA8XX

	tristate "DA8xx/OMAP-L1xx Framebuffer support"

	depends on FB && ARCH_DAVINCI_DA8XX

	tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"

	depends on FB && (ARCH_DAVINCI_DA8XX || SOC_AM33XX)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_CFB_REV_PIXELS_IN_BYTE

	select FB_MODE_HELPERS

	select VIDEOMODE_HELPERS

	---help---

	  This is the frame buffer device driver for the TI LCD controller

	  found on DA8xx/OMAP-L1xx SoCs.

	  found on DA8xx/OMAP-L1xx/AM335x SoCs.

	  If unsure, say N.



config FB_VIRTUAL

drivers/video/atmel_lcdfb.c

+4 −4
Original line number Diff line number Diff line
@@ -902,14 +902,14 @@ static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo) 


static void atmel_lcdfb_start_clock(struct atmel_lcdfb_info *sinfo)

{

	clk_enable(sinfo->bus_clk);

	clk_enable(sinfo->lcdc_clk);

	clk_prepare_enable(sinfo->bus_clk);

	clk_prepare_enable(sinfo->lcdc_clk);

}



static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo)

{

	clk_disable(sinfo->bus_clk);

	clk_disable(sinfo->lcdc_clk);

	clk_disable_unprepare(sinfo->bus_clk);

	clk_disable_unprepare(sinfo->lcdc_clk);

}

drivers/video/backlight/hx8357.c

+234 −35
Original line number Diff line number Diff line
@@ -71,11 +71,24 @@ 
#define HX8357_SET_POWER_NORMAL		0xd2

#define HX8357_SET_PANEL_RELATED	0xe9



#define HX8369_SET_DISPLAY_BRIGHTNESS		0x51

#define HX8369_WRITE_CABC_DISPLAY_VALUE		0x53

#define HX8369_WRITE_CABC_BRIGHT_CTRL		0x55

#define HX8369_WRITE_CABC_MIN_BRIGHTNESS	0x5e

#define HX8369_SET_POWER			0xb1

#define HX8369_SET_DISPLAY_MODE			0xb2

#define HX8369_SET_DISPLAY_WAVEFORM_CYC		0xb4

#define HX8369_SET_VCOM				0xb6

#define HX8369_SET_EXTENSION_COMMAND		0xb9

#define HX8369_SET_GIP				0xd5

#define HX8369_SET_GAMMA_CURVE_RELATED		0xe0



struct hx8357_data {

	unsigned		im_pins[HX8357_NUM_IM_PINS];

	unsigned		reset;

	struct spi_device	*spi;

	int			state;

	bool			use_im_pins;

};



static u8 hx8357_seq_power[] = {
@@ -143,6 +156,61 @@ static u8 hx8357_seq_display_mode[] = { 
	HX8357_SET_DISPLAY_MODE_RGB_INTERFACE,

};



static u8 hx8369_seq_write_CABC_min_brightness[] = {

	HX8369_WRITE_CABC_MIN_BRIGHTNESS, 0x00,

};



static u8 hx8369_seq_write_CABC_control[] = {

	HX8369_WRITE_CABC_DISPLAY_VALUE, 0x24,

};



static u8 hx8369_seq_set_display_brightness[] = {

	HX8369_SET_DISPLAY_BRIGHTNESS, 0xFF,

};



static u8 hx8369_seq_write_CABC_control_setting[] = {

	HX8369_WRITE_CABC_BRIGHT_CTRL, 0x02,

};



static u8 hx8369_seq_extension_command[] = {

	HX8369_SET_EXTENSION_COMMAND, 0xff, 0x83, 0x69,

};



static u8 hx8369_seq_display_related[] = {

	HX8369_SET_DISPLAY_MODE, 0x00, 0x2b, 0x03, 0x03, 0x70, 0x00,

	0xff, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00,	0x01,

};



static u8 hx8369_seq_panel_waveform_cycle[] = {

	HX8369_SET_DISPLAY_WAVEFORM_CYC, 0x0a, 0x1d, 0x80, 0x06, 0x02,

};



static u8 hx8369_seq_set_address_mode[] = {

	HX8357_SET_ADDRESS_MODE, 0x00,

};



static u8 hx8369_seq_vcom[] = {

	HX8369_SET_VCOM, 0x3e, 0x3e,

};



static u8 hx8369_seq_gip[] = {

	HX8369_SET_GIP, 0x00, 0x01, 0x03, 0x25, 0x01, 0x02, 0x28, 0x70,

	0x11, 0x13, 0x00, 0x00, 0x40, 0x26, 0x51, 0x37, 0x00, 0x00, 0x71,

	0x35, 0x60, 0x24, 0x07, 0x0f, 0x04, 0x04,

};



static u8 hx8369_seq_power[] = {

	HX8369_SET_POWER, 0x01, 0x00, 0x34, 0x03, 0x00, 0x11, 0x11, 0x32,

	0x2f, 0x3f, 0x3f, 0x01, 0x3a, 0x01, 0xe6, 0xe6, 0xe6, 0xe6, 0xe6,

};



static u8 hx8369_seq_gamma_curve_related[] = {

	HX8369_SET_GAMMA_CURVE_RELATED, 0x00, 0x0d, 0x19, 0x2f, 0x3b, 0x3d,

	0x2e, 0x4a, 0x08, 0x0e, 0x0f, 0x14, 0x16, 0x14, 0x14, 0x14, 0x1e,

	0x00, 0x0d, 0x19, 0x2f, 0x3b, 0x3d, 0x2e, 0x4a, 0x08, 0x0e, 0x0f,

	0x14, 0x16, 0x14, 0x14, 0x14, 0x1e,

};



static int hx8357_spi_write_then_read(struct lcd_device *lcdev,

				u8 *txbuf, u16 txlen,

				u8 *rxbuf, u16 rxlen)
@@ -219,6 +287,10 @@ static int hx8357_enter_standby(struct lcd_device *lcdev) 
	if (ret < 0)

		return ret;



	/*

	 * The controller needs 120ms when entering in sleep mode before we can

	 * send the command to go off sleep mode

	 */

	msleep(120);



	return 0;
@@ -232,6 +304,10 @@ static int hx8357_exit_standby(struct lcd_device *lcdev) 
	if (ret < 0)

		return ret;



	/*

	 * The controller needs 120ms when exiting from sleep mode before we

	 * can send the command to enter in sleep mode

	 */

	msleep(120);



	ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
@@ -241,6 +317,21 @@ static int hx8357_exit_standby(struct lcd_device *lcdev) 
	return 0;

}



static void hx8357_lcd_reset(struct lcd_device *lcdev)

{

	struct hx8357_data *lcd = lcd_get_data(lcdev);



	/* Reset the screen */

	gpio_set_value(lcd->reset, 1);

	usleep_range(10000, 12000);

	gpio_set_value(lcd->reset, 0);

	usleep_range(10000, 12000);

	gpio_set_value(lcd->reset, 1);



	/* The controller needs 120ms to recover from reset */

	msleep(120);

}



static int hx8357_lcd_init(struct lcd_device *lcdev)

{

	struct hx8357_data *lcd = lcd_get_data(lcdev);
@@ -250,17 +341,11 @@ static int hx8357_lcd_init(struct lcd_device *lcdev) 
	 * Set the interface selection pins to SPI mode, with three

	 * wires

	 */

	if (lcd->use_im_pins) {

		gpio_set_value_cansleep(lcd->im_pins[0], 1);

		gpio_set_value_cansleep(lcd->im_pins[1], 0);

		gpio_set_value_cansleep(lcd->im_pins[2], 1);



	/* Reset the screen */

	gpio_set_value(lcd->reset, 1);

	usleep_range(10000, 12000);

	gpio_set_value(lcd->reset, 0);

	usleep_range(10000, 12000);

	gpio_set_value(lcd->reset, 1);

	msleep(120);

	}



	ret = hx8357_spi_write_array(lcdev, hx8357_seq_power,

				ARRAY_SIZE(hx8357_seq_power));
@@ -341,6 +426,9 @@ static int hx8357_lcd_init(struct lcd_device *lcdev) 
	if (ret < 0)

		return ret;



	/*

	 * The controller needs 120ms to fully recover from exiting sleep mode

	 */

	msleep(120);



	ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);
@@ -356,6 +444,96 @@ static int hx8357_lcd_init(struct lcd_device *lcdev) 
	return 0;

}



static int hx8369_lcd_init(struct lcd_device *lcdev)

{

	int ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_extension_command,

				ARRAY_SIZE(hx8369_seq_extension_command));

	if (ret < 0)

		return ret;

	usleep_range(10000, 12000);



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_display_related,

				ARRAY_SIZE(hx8369_seq_display_related));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_panel_waveform_cycle,

				ARRAY_SIZE(hx8369_seq_panel_waveform_cycle));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_set_address_mode,

				ARRAY_SIZE(hx8369_seq_set_address_mode));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_vcom,

				ARRAY_SIZE(hx8369_seq_vcom));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_gip,

				ARRAY_SIZE(hx8369_seq_gip));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_power,

				ARRAY_SIZE(hx8369_seq_power));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_byte(lcdev, HX8357_EXIT_SLEEP_MODE);

	if (ret < 0)

		return ret;



	/*

	 * The controller needs 120ms to fully recover from exiting sleep mode

	 */

	msleep(120);



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_gamma_curve_related,

				ARRAY_SIZE(hx8369_seq_gamma_curve_related));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_byte(lcdev, HX8357_EXIT_SLEEP_MODE);

	if (ret < 0)

		return ret;

	usleep_range(1000, 1200);



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_write_CABC_control,

				ARRAY_SIZE(hx8369_seq_write_CABC_control));

	if (ret < 0)

		return ret;

	usleep_range(10000, 12000);



	ret = hx8357_spi_write_array(lcdev,

			hx8369_seq_write_CABC_control_setting,

			ARRAY_SIZE(hx8369_seq_write_CABC_control_setting));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_array(lcdev,

			hx8369_seq_write_CABC_min_brightness,

			ARRAY_SIZE(hx8369_seq_write_CABC_min_brightness));

	if (ret < 0)

		return ret;

	usleep_range(10000, 12000);



	ret = hx8357_spi_write_array(lcdev, hx8369_seq_set_display_brightness,

				ARRAY_SIZE(hx8369_seq_set_display_brightness));

	if (ret < 0)

		return ret;



	ret = hx8357_spi_write_byte(lcdev, HX8357_SET_DISPLAY_ON);

	if (ret < 0)

		return ret;



	return 0;

}



#define POWER_IS_ON(pwr)	((pwr) <= FB_BLANK_NORMAL)



static int hx8357_set_power(struct lcd_device *lcdev, int power)
@@ -388,10 +566,24 @@ static struct lcd_ops hx8357_ops = { 
	.get_power	= hx8357_get_power,

};



static const struct of_device_id hx8357_dt_ids[] = {

	{

		.compatible = "himax,hx8357",

		.data = hx8357_lcd_init,

	},

	{

		.compatible = "himax,hx8369",

		.data = hx8369_lcd_init,

	},

	{},

};

MODULE_DEVICE_TABLE(of, hx8357_dt_ids);



static int hx8357_probe(struct spi_device *spi)

{

	struct lcd_device *lcdev;

	struct hx8357_data *lcd;

	const struct of_device_id *match;

	int i, ret;



	lcd = devm_kzalloc(&spi->dev, sizeof(*lcd), GFP_KERNEL);
@@ -408,6 +600,10 @@ static int hx8357_probe(struct spi_device *spi) 


	lcd->spi = spi;



	match = of_match_device(hx8357_dt_ids, &spi->dev);

	if (!match || !match->data)

		return -EINVAL;



	lcd->reset = of_get_named_gpio(spi->dev.of_node, "gpios-reset", 0);

	if (!gpio_is_valid(lcd->reset)) {

		dev_err(&spi->dev, "Missing dt property: gpios-reset\n");
@@ -424,6 +620,9 @@ static int hx8357_probe(struct spi_device *spi) 
		return -EINVAL;

	}



	if (of_find_property(spi->dev.of_node, "im-gpios", NULL)) {

		lcd->use_im_pins = 1;



		for (i = 0; i < HX8357_NUM_IM_PINS; i++) {

			lcd->im_pins[i] = of_get_named_gpio(spi->dev.of_node,

							    "im-gpios", i);
@@ -437,13 +636,17 @@ static int hx8357_probe(struct spi_device *spi) 
			}



			ret = devm_gpio_request_one(&spi->dev, lcd->im_pins[i],

					GPIOF_OUT_INIT_LOW, "im_pins");

						    GPIOF_OUT_INIT_LOW,

						    "im_pins");

			if (ret) {

				dev_err(&spi->dev, "failed to request gpio %d: %d\n",

					lcd->im_pins[i], ret);

				return -EINVAL;

			}

		}

	} else {

		lcd->use_im_pins = 0;

	}



	lcdev = lcd_device_register("mxsfb", &spi->dev, lcd, &hx8357_ops);

	if (IS_ERR(lcdev)) {
@@ -452,7 +655,9 @@ static int hx8357_probe(struct spi_device *spi) 
	}

	spi_set_drvdata(spi, lcdev);



	ret = hx8357_lcd_init(lcdev);

	hx8357_lcd_reset(lcdev);



	ret = ((int (*)(struct lcd_device *))match->data)(lcdev);

	if (ret) {

		dev_err(&spi->dev, "Couldn't initialize panel\n");

		goto init_error;
@@ -475,12 +680,6 @@ static int hx8357_remove(struct spi_device *spi) 
	return 0;

}



static const struct of_device_id hx8357_dt_ids[] = {

	{ .compatible = "himax,hx8357" },

	{},

};

MODULE_DEVICE_TABLE(of, hx8357_dt_ids);



static struct spi_driver hx8357_driver = {

	.probe  = hx8357_probe,

	.remove = hx8357_remove,

drivers/video/backlight/lp855x_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int lp855x_bl_update_status(struct backlight_device *bl) 
{

	struct lp855x *lp = bl_get_data(bl);



	if (bl->props.state & BL_CORE_SUSPENDED)

	if (bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))

		bl->props.brightness = 0;



	if (lp->mode == PWM_BASED) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE