Merge branch 'planes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next (0f90fa53) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_alpha
		Date: May 2012
		Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		Description:
		This file is only available on fb[0-9] devices corresponding
		to overlay planes.

		Stores the alpha blending value for the overlay. Values range
		from 0 (transparent) to 255 (opaque). The value is ignored if
		the mode is not set to Alpha Blending.

		What: /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_mode
		Date: May 2012
		Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		Description:
		This file is only available on fb[0-9] devices corresponding
		to overlay planes.

		Selects the composition mode for the overlay. Possible values
		are

		0 - Alpha Blending
		1 - ROP3

		What: /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_position
		Date: May 2012
		Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		Description:
		This file is only available on fb[0-9] devices corresponding
		to overlay planes.

		Stores the x,y overlay position on the display in pixels. The
		position format is `[0-9]+,[0-9]+'.

		What: /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_rop3
		Date: May 2012
		Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
		Description:
		This file is only available on fb[0-9] devices corresponding
		to overlay planes.

		Stores the raster operation (ROP3) for the overlay. Values
		range from 0 to 255. The value is ignored if the mode is not
		set to ROP3.

+3 −4

Original line number	Diff line number	Diff line
		@@ -127,8 +127,7 @@ static void sh_mipi_shutdown(struct platform_device *pdev)
		sh_mipi_dsi_enable(mipi, false);
		}

		static int __init sh_mipi_setup(struct sh_mipi *mipi,
		struct sh_mipi_dsi_info *pdata)
		static int sh_mipi_setup(struct sh_mipi mipi, struct sh_mipi_dsi_info pdata)
		{
		void __iomem *base = mipi->base;
		struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan;
		@@ -551,7 +550,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
		return ret;
		}

		static int __exit sh_mipi_remove(struct platform_device *pdev)
		static int __devexit sh_mipi_remove(struct platform_device *pdev)
		{
		struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		@@ -592,7 +591,7 @@ static int __exit sh_mipi_remove(struct platform_device *pdev)
		}

		static struct platform_driver sh_mipi_driver = {
		.remove = __exit_p(sh_mipi_remove),
		.remove = __devexit_p(sh_mipi_remove),
		.shutdown = sh_mipi_shutdown,
		.driver = {
		.name = "sh-mipi-dsi",

+886 −96

File changed.

Preview size limit exceeded, changes collapsed.

+7 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,12 @@ struct sh_mobile_lcdc_bl_info {
		int (*get_brightness)(void);
		};

		struct sh_mobile_lcdc_overlay_cfg {
		int fourcc;
		unsigned int max_xres;
		unsigned int max_yres;
		};

		struct sh_mobile_lcdc_chan_cfg {
		int chan;
		int fourcc;
		@@ -186,6 +192,7 @@ struct sh_mobile_lcdc_chan_cfg {
		struct sh_mobile_lcdc_info {
		int clock_source;
		struct sh_mobile_lcdc_chan_cfg ch[2];
		struct sh_mobile_lcdc_overlay_cfg overlays[4];
		struct sh_mobile_meram_info *meram_dev;
		};