Merge branch 'fbdev-3.11' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next (8ea2c864) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/video/ssd1307fb.txt

+7 −3

Original line number	Original line	Diff line number	Diff line
	* Solomon SSD1307 Framebuffer Driver		* Solomon SSD1307 Framebuffer Driver

	Required properties:		Required properties:
	- compatible: Should be "solomon,ssd1307fb-<bus>". The only supported bus for		- compatible: Should be "solomon,<chip>fb-<bus>". The only supported bus for
	now is i2c.		now is i2c, and the supported chips are ssd1306 and ssd1307.
	- reg: Should contain address of the controller on the I2C bus. Most likely		- reg: Should contain address of the controller on the I2C bus. Most likely
	0x3c or 0x3d		0x3c or 0x3d
	- pwm: Should contain the pwm to use according to the OF device tree PWM		- pwm: Should contain the pwm to use according to the OF device tree PWM
	specification [0]		specification [0]. Only required for the ssd1307.
	- reset-gpios: Should contain the GPIO used to reset the OLED display		- reset-gpios: Should contain the GPIO used to reset the OLED display
			- solomon,height: Height in pixel of the screen driven by the controller
			- solomon,width: Width in pixel of the screen driven by the controller
			- solomon,page-offset: Offset of pages (band of 8 pixels) that the screen is
			mapped to.

	Optional properties:		Optional properties:
	- reset-active-low: Is the reset gpio is active on physical low?		- reset-active-low: Is the reset gpio is active on physical low?

drivers/video/of_display_timing.c

+42 −13

Original line number	Original line	Diff line number	Diff line
	@@ -53,21 +53,16 @@ static int parse_timing_property(struct device_node np, const char name,
	}		}

	/**		/**
	* of_get_display_timing - parse display_timing entry from device_node		* of_parse_display_timing - parse display_timing entry from device_node
	* @np: device_node with the properties		* @np: device_node with the properties
	**/		**/
	static struct display_timing of_get_display_timing(struct device_node np)		static int of_parse_display_timing(struct device_node *np,
			struct display_timing *dt)
	{		{
	struct display_timing *dt;
	u32 val = 0;		u32 val = 0;
	int ret = 0;		int ret = 0;

	dt = kzalloc(sizeof(*dt), GFP_KERNEL);		memset(dt, 0, sizeof(*dt));
	if (!dt) {
	pr_err("%s: could not allocate display_timing struct\n",
	of_node_full_name(np));
	return NULL;
	}

	ret \|= parse_timing_property(np, "hback-porch", &dt->hback_porch);		ret \|= parse_timing_property(np, "hback-porch", &dt->hback_porch);
	ret \|= parse_timing_property(np, "hfront-porch", &dt->hfront_porch);		ret \|= parse_timing_property(np, "hfront-porch", &dt->hfront_porch);
	@@ -101,13 +96,39 @@ static struct display_timing of_get_display_timing(struct device_node np)
	if (ret) {		if (ret) {
	pr_err("%s: error reading timing properties\n",		pr_err("%s: error reading timing properties\n",
	of_node_full_name(np));		of_node_full_name(np));
	kfree(dt);		return -EINVAL;
	return NULL;
	}		}

	return dt;		return 0;
	}		}

			/**
			* of_get_display_timing - parse a display_timing entry
			* @np: device_node with the timing subnode
			* @name: name of the timing node
			* @dt: display_timing struct to fill
			**/
			int of_get_display_timing(struct device_node np, const char name,
			struct display_timing *dt)
			{
			struct device_node *timing_np;

			if (!np) {
			pr_err("%s: no devicenode given\n", of_node_full_name(np));
			return -EINVAL;
			}

			timing_np = of_find_node_by_name(np, name);
			if (!timing_np) {
			pr_err("%s: could not find node '%s'\n",
			of_node_full_name(np), name);
			return -ENOENT;
			}

			return of_parse_display_timing(timing_np, dt);
			}
			EXPORT_SYMBOL_GPL(of_get_display_timing);

	/**		/**
	* of_get_display_timings - parse all display_timing entries from a device_node		* of_get_display_timings - parse all display_timing entries from a device_node
	* @np: device_node with the subnodes		* @np: device_node with the subnodes
	@@ -174,9 +195,17 @@ struct display_timings of_get_display_timings(struct device_node np)

	for_each_child_of_node(timings_np, entry) {		for_each_child_of_node(timings_np, entry) {
	struct display_timing *dt;		struct display_timing *dt;
			int r;

	dt = of_get_display_timing(entry);		dt = kzalloc(sizeof(*dt), GFP_KERNEL);
	if (!dt) {		if (!dt) {
			pr_err("%s: could not allocate display_timing struct\n",
			of_node_full_name(np));
			goto timingfail;
			}

			r = of_parse_display_timing(entry, dt);
			if (r) {
	/*		/*
	* to not encourage wrong devicetrees, fail in case of		* to not encourage wrong devicetrees, fail in case of
	* an error		* an error

drivers/video/ssd1307fb.c

+288 −104

Original line number	Original line	Diff line number	Diff line
	@@ -16,24 +16,50 @@
	#include <linux/pwm.h>		#include <linux/pwm.h>
	#include <linux/delay.h>		#include <linux/delay.h>

	#define SSD1307FB_WIDTH 96
	#define SSD1307FB_HEIGHT 16

	#define SSD1307FB_DATA 0x40		#define SSD1307FB_DATA 0x40
	#define SSD1307FB_COMMAND 0x80		#define SSD1307FB_COMMAND 0x80

			#define SSD1307FB_SET_ADDRESS_MODE 0x20
			#define SSD1307FB_SET_ADDRESS_MODE_HORIZONTAL (0x00)
			#define SSD1307FB_SET_ADDRESS_MODE_VERTICAL (0x01)
			#define SSD1307FB_SET_ADDRESS_MODE_PAGE (0x02)
			#define SSD1307FB_SET_COL_RANGE 0x21
			#define SSD1307FB_SET_PAGE_RANGE 0x22
	#define SSD1307FB_CONTRAST 0x81		#define SSD1307FB_CONTRAST 0x81
			#define SSD1307FB_CHARGE_PUMP 0x8d
	#define SSD1307FB_SEG_REMAP_ON 0xa1		#define SSD1307FB_SEG_REMAP_ON 0xa1
	#define SSD1307FB_DISPLAY_OFF 0xae		#define SSD1307FB_DISPLAY_OFF 0xae
			#define SSD1307FB_SET_MULTIPLEX_RATIO 0xa8
	#define SSD1307FB_DISPLAY_ON 0xaf		#define SSD1307FB_DISPLAY_ON 0xaf
	#define SSD1307FB_START_PAGE_ADDRESS 0xb0		#define SSD1307FB_START_PAGE_ADDRESS 0xb0
			#define SSD1307FB_SET_DISPLAY_OFFSET 0xd3
			#define SSD1307FB_SET_CLOCK_FREQ 0xd5
			#define SSD1307FB_SET_PRECHARGE_PERIOD 0xd9
			#define SSD1307FB_SET_COM_PINS_CONFIG 0xda
			#define SSD1307FB_SET_VCOMH 0xdb

			struct ssd1307fb_par;

			struct ssd1307fb_ops {
			int (init)(struct ssd1307fb_par );
			int (remove)(struct ssd1307fb_par );
			};

	struct ssd1307fb_par {		struct ssd1307fb_par {
	struct i2c_client *client;		struct i2c_client *client;
			u32 height;
	struct fb_info *info;		struct fb_info *info;
			struct ssd1307fb_ops *ops;
			u32 page_offset;
	struct pwm_device *pwm;		struct pwm_device *pwm;
	u32 pwm_period;		u32 pwm_period;
	int reset;		int reset;
			u32 width;
			};

			struct ssd1307fb_array {
			u8 type;
			u8 data[0];
	};		};

	static struct fb_fix_screeninfo ssd1307fb_fix = {		static struct fb_fix_screeninfo ssd1307fb_fix = {
	@@ -43,68 +69,87 @@ static struct fb_fix_screeninfo ssd1307fb_fix = {
	.xpanstep = 0,		.xpanstep = 0,
	.ypanstep = 0,		.ypanstep = 0,
	.ywrapstep = 0,		.ywrapstep = 0,
	.line_length = SSD1307FB_WIDTH / 8,
	.accel = FB_ACCEL_NONE,		.accel = FB_ACCEL_NONE,
	};		};

	static struct fb_var_screeninfo ssd1307fb_var = {		static struct fb_var_screeninfo ssd1307fb_var = {
	.xres = SSD1307FB_WIDTH,
	.yres = SSD1307FB_HEIGHT,
	.xres_virtual = SSD1307FB_WIDTH,
	.yres_virtual = SSD1307FB_HEIGHT,
	.bits_per_pixel = 1,		.bits_per_pixel = 1,
	};		};

	static int ssd1307fb_write_array(struct i2c_client client, u8 type, u8 cmd, u32 len)		static struct ssd1307fb_array *ssd1307fb_alloc_array(u32 len, u8 type)
	{		{
	u8 *buf;		struct ssd1307fb_array *array;
	int ret = 0;

	buf = kzalloc(len + 1, GFP_KERNEL);		array = kzalloc(sizeof(struct ssd1307fb_array) + len, GFP_KERNEL);
	if (!buf) {		if (!array)
	dev_err(&client->dev, "Couldn't allocate sending buffer.\n");		return NULL;
	return -ENOMEM;
	}

	buf[0] = type;		array->type = type;
	memcpy(buf + 1, cmd, len);

	ret = i2c_master_send(client, buf, len + 1);		return array;
	if (ret != len + 1) {
	dev_err(&client->dev, "Couldn't send I2C command.\n");
	goto error;
	}		}

	error:		static int ssd1307fb_write_array(struct i2c_client *client,
	kfree(buf);		struct ssd1307fb_array *array, u32 len)
			{
			int ret;

			len += sizeof(struct ssd1307fb_array);

			ret = i2c_master_send(client, (u8 *)array, len);
			if (ret != len) {
			dev_err(&client->dev, "Couldn't send I2C command.\n");
	return ret;		return ret;
	}		}

	static inline int ssd1307fb_write_cmd_array(struct i2c_client client, u8 cmd, u32 len)		return 0;
	{
	return ssd1307fb_write_array(client, SSD1307FB_COMMAND, cmd, len);
	}		}

	static inline int ssd1307fb_write_cmd(struct i2c_client *client, u8 cmd)		static inline int ssd1307fb_write_cmd(struct i2c_client *client, u8 cmd)
	{		{
	return ssd1307fb_write_cmd_array(client, &cmd, 1);		struct ssd1307fb_array *array;
	}		int ret;

	static inline int ssd1307fb_write_data_array(struct i2c_client client, u8 cmd, u32 len)		array = ssd1307fb_alloc_array(1, SSD1307FB_COMMAND);
	{		if (!array)
	return ssd1307fb_write_array(client, SSD1307FB_DATA, cmd, len);		return -ENOMEM;

			array->data[0] = cmd;

			ret = ssd1307fb_write_array(client, array, 1);
			kfree(array);

			return ret;
	}		}

	static inline int ssd1307fb_write_data(struct i2c_client *client, u8 data)		static inline int ssd1307fb_write_data(struct i2c_client *client, u8 data)
	{		{
	return ssd1307fb_write_data_array(client, &data, 1);		struct ssd1307fb_array *array;
			int ret;

			array = ssd1307fb_alloc_array(1, SSD1307FB_DATA);
			if (!array)
			return -ENOMEM;

			array->data[0] = data;

			ret = ssd1307fb_write_array(client, array, 1);
			kfree(array);

			return ret;
	}		}

	static void ssd1307fb_update_display(struct ssd1307fb_par *par)		static void ssd1307fb_update_display(struct ssd1307fb_par *par)
	{		{
			struct ssd1307fb_array *array;
	u8 *vmem = par->info->screen_base;		u8 *vmem = par->info->screen_base;
	int i, j, k;		int i, j, k;

			array = ssd1307fb_alloc_array(par->width * par->height / 8,
			SSD1307FB_DATA);
			if (!array)
			return;

	/*		/*
	* The screen is divided in pages, each having a height of 8		* The screen is divided in pages, each having a height of 8
	* pixels, and the width of the screen. When sending a byte of		* pixels, and the width of the screen. When sending a byte of
	@@ -134,24 +179,23 @@ static void ssd1307fb_update_display(struct ssd1307fb_par *par)
	* (5) A4 B4 C4 D4 E4 F4 G4 H4		* (5) A4 B4 C4 D4 E4 F4 G4 H4
	*/		*/

	for (i = 0; i < (SSD1307FB_HEIGHT / 8); i++) {		for (i = 0; i < (par->height / 8); i++) {
	ssd1307fb_write_cmd(par->client, SSD1307FB_START_PAGE_ADDRESS + (i + 1));		for (j = 0; j < par->width; j++) {
	ssd1307fb_write_cmd(par->client, 0x00);		u32 array_idx = i * par->width + j;
	ssd1307fb_write_cmd(par->client, 0x10);		array->data[array_idx] = 0;

	for (j = 0; j < SSD1307FB_WIDTH; j++) {
	u8 buf = 0;
	for (k = 0; k < 8; k++) {		for (k = 0; k < 8; k++) {
	u32 page_length = SSD1307FB_WIDTH * i;		u32 page_length = par->width * i;
	u32 index = page_length + (SSD1307FB_WIDTH * k + j) / 8;		u32 index = page_length + (par->width * k + j) / 8;
	u8 byte = *(vmem + index);		u8 byte = *(vmem + index);
	u8 bit = byte & (1 << (j % 8));		u8 bit = byte & (1 << (j % 8));
	bit = bit >> (j % 8);		bit = bit >> (j % 8);
	buf \|= bit << k;		array->data[array_idx] \|= bit << k;
	}		}
	ssd1307fb_write_data(par->client, buf);
	}		}
	}		}

			ssd1307fb_write_array(par->client, array, par->width * par->height / 8);
			kfree(array);
	}		}


	@@ -227,16 +271,167 @@ static struct fb_deferred_io ssd1307fb_defio = {
	.deferred_io = ssd1307fb_deferred_io,		.deferred_io = ssd1307fb_deferred_io,
	};		};

			static int ssd1307fb_ssd1307_init(struct ssd1307fb_par *par)
			{
			int ret;

			par->pwm = pwm_get(&par->client->dev, NULL);
			if (IS_ERR(par->pwm)) {
			dev_err(&par->client->dev, "Could not get PWM from device tree!\n");
			return PTR_ERR(par->pwm);
			}

			par->pwm_period = pwm_get_period(par->pwm);
			/* Enable the PWM */
			pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);
			pwm_enable(par->pwm);

			dev_dbg(&par->client->dev, "Using PWM%d with a %dns period.\n",
			par->pwm->pwm, par->pwm_period);

			/* Map column 127 of the OLED to segment 0 */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SEG_REMAP_ON);
			if (ret < 0)
			return ret;

			/* Turn on the display */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_DISPLAY_ON);
			if (ret < 0)
			return ret;

			return 0;
			}

			static int ssd1307fb_ssd1307_remove(struct ssd1307fb_par *par)
			{
			pwm_disable(par->pwm);
			pwm_put(par->pwm);
			return 0;
			}

			static struct ssd1307fb_ops ssd1307fb_ssd1307_ops = {
			.init = ssd1307fb_ssd1307_init,
			.remove = ssd1307fb_ssd1307_remove,
			};

			static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par)
			{
			int ret;

			/* Set initial contrast */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_CONTRAST);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x7f);
			if (ret < 0)
			return ret;

			/* Set COM direction */
			ret = ssd1307fb_write_cmd(par->client, 0xc8);
			if (ret < 0)
			return ret;

			/* Set segment re-map */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SEG_REMAP_ON);
			if (ret < 0)
			return ret;

			/* Set multiplex ratio value */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_MULTIPLEX_RATIO);
			ret = ret & ssd1307fb_write_cmd(par->client, par->height - 1);
			if (ret < 0)
			return ret;

			/* set display offset value */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET);
			ret = ssd1307fb_write_cmd(par->client, 0x20);
			if (ret < 0)
			return ret;

			/* Set clock frequency */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_CLOCK_FREQ);
			ret = ret & ssd1307fb_write_cmd(par->client, 0xf0);
			if (ret < 0)
			return ret;

			/* Set precharge period in number of ticks from the internal clock */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_PRECHARGE_PERIOD);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x22);
			if (ret < 0)
			return ret;

			/* Set COM pins configuration */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_COM_PINS_CONFIG);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x22);
			if (ret < 0)
			return ret;

			/* Set VCOMH */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_VCOMH);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x49);
			if (ret < 0)
			return ret;

			/* Turn on the DC-DC Charge Pump */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_CHARGE_PUMP);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x14);
			if (ret < 0)
			return ret;

			/* Switch to horizontal addressing mode */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_ADDRESS_MODE);
			ret = ret & ssd1307fb_write_cmd(par->client,
			SSD1307FB_SET_ADDRESS_MODE_HORIZONTAL);
			if (ret < 0)
			return ret;

			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_COL_RANGE);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x0);
			ret = ret & ssd1307fb_write_cmd(par->client, par->width - 1);
			if (ret < 0)
			return ret;

			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_PAGE_RANGE);
			ret = ret & ssd1307fb_write_cmd(par->client, 0x0);
			ret = ret & ssd1307fb_write_cmd(par->client,
			par->page_offset + (par->height / 8) - 1);
			if (ret < 0)
			return ret;

			/* Turn on the display */
			ret = ssd1307fb_write_cmd(par->client, SSD1307FB_DISPLAY_ON);
			if (ret < 0)
			return ret;

			return 0;
			}

			static struct ssd1307fb_ops ssd1307fb_ssd1306_ops = {
			.init = ssd1307fb_ssd1306_init,
			};

			static const struct of_device_id ssd1307fb_of_match[] = {
			{
			.compatible = "solomon,ssd1306fb-i2c",
			.data = (void *)&ssd1307fb_ssd1306_ops,
			},
			{
			.compatible = "solomon,ssd1307fb-i2c",
			.data = (void *)&ssd1307fb_ssd1307_ops,
			},
			{},
			};
			MODULE_DEVICE_TABLE(of, ssd1307fb_of_match);

	static int ssd1307fb_probe(struct i2c_client *client,		static int ssd1307fb_probe(struct i2c_client *client,
	const struct i2c_device_id *id)		const struct i2c_device_id *id)
	{		{
	struct fb_info *info;		struct fb_info *info;
	u32 vmem_size = SSD1307FB_WIDTH * SSD1307FB_HEIGHT / 8;		struct device_node *node = client->dev.of_node;
			u32 vmem_size;
	struct ssd1307fb_par *par;		struct ssd1307fb_par *par;
	u8 *vmem;		u8 *vmem;
	int ret;		int ret;

	if (!client->dev.of_node) {		if (!node) {
	dev_err(&client->dev, "No device tree data found!\n");		dev_err(&client->dev, "No device tree data found!\n");
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -247,6 +442,31 @@ static int ssd1307fb_probe(struct i2c_client *client,
	return -ENOMEM;		return -ENOMEM;
	}		}

			par = info->par;
			par->info = info;
			par->client = client;

			par->ops = (struct ssd1307fb_ops *)of_match_device(ssd1307fb_of_match,
			&client->dev)->data;

			par->reset = of_get_named_gpio(client->dev.of_node,
			"reset-gpios", 0);
			if (!gpio_is_valid(par->reset)) {
			ret = -EINVAL;
			goto fb_alloc_error;
			}

			if (of_property_read_u32(node, "solomon,width", &par->width))
			par->width = 96;

			if (of_property_read_u32(node, "solomon,height", &par->height))
			par->width = 16;

			if (of_property_read_u32(node, "solomon,page-offset", &par->page_offset))
			par->page_offset = 1;

			vmem_size = par->width * par->height / 8;

	vmem = devm_kzalloc(&client->dev, vmem_size, GFP_KERNEL);		vmem = devm_kzalloc(&client->dev, vmem_size, GFP_KERNEL);
	if (!vmem) {		if (!vmem) {
	dev_err(&client->dev, "Couldn't allocate graphical memory.\n");		dev_err(&client->dev, "Couldn't allocate graphical memory.\n");
	@@ -256,9 +476,15 @@ static int ssd1307fb_probe(struct i2c_client *client,

	info->fbops = &ssd1307fb_ops;		info->fbops = &ssd1307fb_ops;
	info->fix = ssd1307fb_fix;		info->fix = ssd1307fb_fix;
			info->fix.line_length = par->width / 8;
	info->fbdefio = &ssd1307fb_defio;		info->fbdefio = &ssd1307fb_defio;

	info->var = ssd1307fb_var;		info->var = ssd1307fb_var;
			info->var.xres = par->width;
			info->var.xres_virtual = par->width;
			info->var.yres = par->height;
			info->var.yres_virtual = par->height;

	info->var.red.length = 1;		info->var.red.length = 1;
	info->var.red.offset = 0;		info->var.red.offset = 0;
	info->var.green.length = 1;		info->var.green.length = 1;
	@@ -272,17 +498,6 @@ static int ssd1307fb_probe(struct i2c_client *client,

	fb_deferred_io_init(info);		fb_deferred_io_init(info);

	par = info->par;
	par->info = info;
	par->client = client;

	par->reset = of_get_named_gpio(client->dev.of_node,
	"reset-gpios", 0);
	if (!gpio_is_valid(par->reset)) {
	ret = -EINVAL;
	goto reset_oled_error;
	}

	ret = devm_gpio_request_one(&client->dev, par->reset,		ret = devm_gpio_request_one(&client->dev, par->reset,
	GPIOF_OUT_INIT_HIGH,		GPIOF_OUT_INIT_HIGH,
	"oled-reset");		"oled-reset");
	@@ -293,23 +508,6 @@ static int ssd1307fb_probe(struct i2c_client *client,
	goto reset_oled_error;		goto reset_oled_error;
	}		}

	par->pwm = pwm_get(&client->dev, NULL);
	if (IS_ERR(par->pwm)) {
	dev_err(&client->dev, "Could not get PWM from device tree!\n");
	ret = PTR_ERR(par->pwm);
	goto pwm_error;
	}

	par->pwm_period = pwm_get_period(par->pwm);

	dev_dbg(&client->dev, "Using PWM%d with a %dns period.\n", par->pwm->pwm, par->pwm_period);

	ret = register_framebuffer(info);
	if (ret) {
	dev_err(&client->dev, "Couldn't register the framebuffer\n");
	goto fbreg_error;
	}

	i2c_set_clientdata(client, info);		i2c_set_clientdata(client, info);

	/* Reset the screen */		/* Reset the screen */
	@@ -318,34 +516,25 @@ static int ssd1307fb_probe(struct i2c_client *client,
	gpio_set_value(par->reset, 1);		gpio_set_value(par->reset, 1);
	udelay(4);		udelay(4);

	/* Enable the PWM */		if (par->ops->init) {
	pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);		ret = par->ops->init(par);
	pwm_enable(par->pwm);		if (ret)
			goto reset_oled_error;
	/* Map column 127 of the OLED to segment 0 */
	ret = ssd1307fb_write_cmd(client, SSD1307FB_SEG_REMAP_ON);
	if (ret < 0) {
	dev_err(&client->dev, "Couldn't remap the screen.\n");
	goto remap_error;
	}		}

	/* Turn on the display */		ret = register_framebuffer(info);
	ret = ssd1307fb_write_cmd(client, SSD1307FB_DISPLAY_ON);		if (ret) {
	if (ret < 0) {		dev_err(&client->dev, "Couldn't register the framebuffer\n");
	dev_err(&client->dev, "Couldn't turn the display on.\n");		goto panel_init_error;
	goto remap_error;
	}		}

	dev_info(&client->dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size);		dev_info(&client->dev, "fb%d: %s framebuffer device registered, using %d bytes of video memory\n", info->node, info->fix.id, vmem_size);

	return 0;		return 0;

	remap_error:		panel_init_error:
	unregister_framebuffer(info);		if (par->ops->remove)
	pwm_disable(par->pwm);		par->ops->remove(par);
	fbreg_error:
	pwm_put(par->pwm);
	pwm_error:
	reset_oled_error:		reset_oled_error:
	fb_deferred_io_cleanup(info);		fb_deferred_io_cleanup(info);
	fb_alloc_error:		fb_alloc_error:
	@@ -359,8 +548,8 @@ static int ssd1307fb_remove(struct i2c_client *client)
	struct ssd1307fb_par *par = info->par;		struct ssd1307fb_par *par = info->par;

	unregister_framebuffer(info);		unregister_framebuffer(info);
	pwm_disable(par->pwm);		if (par->ops->remove)
	pwm_put(par->pwm);		par->ops->remove(par);
	fb_deferred_io_cleanup(info);		fb_deferred_io_cleanup(info);
	framebuffer_release(info);		framebuffer_release(info);

	@@ -368,17 +557,12 @@ static int ssd1307fb_remove(struct i2c_client *client)
	}		}

	static const struct i2c_device_id ssd1307fb_i2c_id[] = {		static const struct i2c_device_id ssd1307fb_i2c_id[] = {
			{ "ssd1306fb", 0 },
	{ "ssd1307fb", 0 },		{ "ssd1307fb", 0 },
	{ }		{ }
	};		};
	MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id);		MODULE_DEVICE_TABLE(i2c, ssd1307fb_i2c_id);

	static const struct of_device_id ssd1307fb_of_match[] = {
	{ .compatible = "solomon,ssd1307fb-i2c" },
	{},
	};
	MODULE_DEVICE_TABLE(of, ssd1307fb_of_match);

	static struct i2c_driver ssd1307fb_driver = {		static struct i2c_driver ssd1307fb_driver = {
	.probe = ssd1307fb_probe,		.probe = ssd1307fb_probe,
	.remove = ssd1307fb_remove,		.remove = ssd1307fb_remove,

include/video/of_display_timing.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@ struct display_timings;

	#define OF_USE_NATIVE_MODE -1		#define OF_USE_NATIVE_MODE -1

			int of_get_display_timing(struct device_node np, const char name,
			struct display_timing *dt);
	struct display_timings of_get_display_timings(struct device_node np);		struct display_timings of_get_display_timings(struct device_node np);
	int of_display_timings_exist(struct device_node *np);		int of_display_timings_exist(struct device_node *np);