From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 16:49:32 +0000 (-0700)
Subject: Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
X-Git-Tag: v3.12-rc1~137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ab073bc45b8b523cc39658925bb44bef35ca657;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'fbdev-3.12' of git://git./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
  ...
---

9ab073bc45b8b523cc39658925bb44bef35ca657
diff --cc include/linux/platform_data/simplefb.h
index 53774b0,0000000..077303c
mode 100644,000000..100644
--- a/include/linux/platform_data/simplefb.h
+++ b/include/linux/platform_data/simplefb.h
@@@ -1,63 -1,0 +1,64 @@@
 +/*
 + * simplefb.h - Simple Framebuffer Device
 + *
 + * Copyright (C) 2013 David Herrmann <dh.herrmann@gmail.com>
 + *
 + * 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.
 + */
 +
 +#ifndef __PLATFORM_DATA_SIMPLEFB_H__
 +#define __PLATFORM_DATA_SIMPLEFB_H__
 +
 +#include <drm/drm_fourcc.h>
 +#include <linux/fb.h>
 +#include <linux/kernel.h>
 +
 +/* format array, use it to initialize a "struct simplefb_format" array */
 +#define SIMPLEFB_FORMATS \
 +{ \
 +	{ "r5g6b5", 16, {11, 5}, {5, 6}, {0, 5}, {0, 0}, DRM_FORMAT_RGB565 }, \
 +	{ "x1r5g5b5", 16, {10, 5}, {5, 5}, {0, 5}, {0, 0}, DRM_FORMAT_XRGB1555 }, \
 +	{ "a1r5g5b5", 16, {10, 5}, {5, 5}, {0, 5}, {15, 1}, DRM_FORMAT_ARGB1555 }, \
 +	{ "r8g8b8", 24, {16, 8}, {8, 8}, {0, 8}, {0, 0}, DRM_FORMAT_RGB888 }, \
 +	{ "x8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {0, 0}, DRM_FORMAT_XRGB8888 }, \
 +	{ "a8r8g8b8", 32, {16, 8}, {8, 8}, {0, 8}, {24, 8}, DRM_FORMAT_ARGB8888 }, \
++	{ "a8b8g8r8", 32, {0, 8}, {8, 8}, {16, 8}, {24, 8}, DRM_FORMAT_ABGR8888 }, \
 +	{ "x2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {0, 0}, DRM_FORMAT_XRGB2101010 }, \
 +	{ "a2r10g10b10", 32, {20, 10}, {10, 10}, {0, 10}, {30, 2}, DRM_FORMAT_ARGB2101010 }, \
 +}
 +
 +/*
 + * Data-Format for Simple-Framebuffers
 + * @name: unique 0-terminated name that can be used to identify the mode
 + * @red,green,blue: Offsets and sizes of the single RGB parts
 + * @transp: Offset and size of the alpha bits. length=0 means no alpha
 + * @fourcc: 32bit DRM four-CC code (see drm_fourcc.h)
 + */
 +struct simplefb_format {
 +	const char *name;
 +	u32 bits_per_pixel;
 +	struct fb_bitfield red;
 +	struct fb_bitfield green;
 +	struct fb_bitfield blue;
 +	struct fb_bitfield transp;
 +	u32 fourcc;
 +};
 +
 +/*
 + * Simple-Framebuffer description
 + * If the arch-boot code creates simple-framebuffers without DT support, it
 + * can pass the width, height, stride and format via this platform-data object.
 + * The framebuffer location must be given as IORESOURCE_MEM resource.
 + * @format must be a format as described in "struct simplefb_format" above.
 + */
 +struct simplefb_platform_data {
 +	u32 width;
 +	u32 height;
 +	u32 stride;
 +	const char *format;
 +};
 +
 +#endif /* __PLATFORM_DATA_SIMPLEFB_H__ */