v4l2: add new V4L2_PIX_FMT_RGB666 pixel format.
Subsystems (6)
PATCH v7 1/7 v4l2: add new V4L2_PIX_FMT_RGB666 pixel format.
That new macro is needed by the imx_drm staging driver
for supporting the QVGA display of the eukrea-cpuimx51 board.
---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
ChangeLog v5->v6:
- Remove people not concerned by this patch from the Cc list.
ChangeLog v3->v4:
- Added Laurent Pinchart's Ack.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Added Mauro Carvalho Chehab's Ack.
- Added documentation.
--- .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 78 ++++++++++++++++++++ include/uapi/linux/videodev2.h | 1 + 2 files changed, 79 insertions(+)
Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml +78 -0
@@ -279,6 +279,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para> <entry></entry> <entry></entry> </row> + <row id="V4L2-PIX-FMT-RGB666"> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row id="V4L2-PIX-FMT-BGR24"> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>
@@ -781,6 +820,45 @@ defined in error. Drivers may interpret them as in <xref <entry></entry> <entry></entry> </row> + <row><!-- id="V4L2-PIX-FMT-RGB666" --> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row><!-- id="V4L2-PIX-FMT-BGR24" --> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>
include/uapi/linux/videodev2.h +1 -0
@@ -294,6 +294,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q')/* 16 RGB-5-5-5 BE */ #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R')/* 16 RGB-5-6-5 BE */ #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H')/* 18 BGR-6-6-6 */ +#define V4L2_PIX_FMT_RGB666 v4l2_fourcc('R', 'G', 'B', 'H')/* 18 RGB-6-6-6 */ #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3')/* 24 BGR-8-8-8 */ #define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3')/* 24 RGB-8-8-8 */ #define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4')/* 32 BGR-8-8-8-8 */
Signature · 1 line
1.7.9.5
PATCH v7 2/7 staging: imx-drm: Add RGB666 support for parallel display.
---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
ChangeLog v5->v6:
- Remove people not concerned by this patch from the Cc list.
ChangeLog v3->v5:
- Use the correct RGB order.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Removed the commit message long desciption that was just a copy of the short description.
- Rebased the patch.
- Fixed a copy-paste error in the ipu_dc_map_clear parameter.
--- .../bindings/staging/imx-drm/fsl-imx-drm.txt | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 9 +++++++++ drivers/staging/imx-drm/parallel-display.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -1
@@ -29,7 +29,7 @@ Required properties: - crtc: the crtc this display is connected to, see below Optional properties: - interface_pix_fmt: How this display is connected to the - crtc. Currently supported types: "rgb24", "rgb565", "bgr666" + crtc. Currently supported types: "rgb24", "rgb565", "bgr666", "rgb666" - edid: verbatim EDID data block describing attached display. - ddc: phandle describing the i2c bus handling the display data channel
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +9 -0
@@ -92,6 +92,7 @@ enum ipu_dc_map {IPU_DC_MAP_GBR24 ,/* TVEv2 */ IPU_DC_MAP_BGR666 ,IPU_DC_MAP_BGR24 , + IPU_DC_MAP_RGB666, }; struct ipu_dc {
@@ -155,6 +156,8 @@ static int ipu_pixfmt_to_map(u32 fmt)return IPU_DC_MAP_BGR666 ;case V4L2_PIX_FMT_BGR24 :return IPU_DC_MAP_BGR24 ; +case V4L2_PIX_FMT_RGB666 : +return IPU_DC_MAP_RGB666 ;default :return -EINVAL ; }
@@ -404,6 +407,12 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,ipu_dc_map_config (priv,IPU_DC_MAP_BGR24 ,1 ,15 ,0xff );/* green */ ipu_dc_map_config (priv,IPU_DC_MAP_BGR24 ,0 ,23 ,0xff );/* blue */ +/* rgb666 */ +ipu_dc_map_clear (priv,IPU_DC_MAP_RGB666 ); +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,0 ,5 ,0xfc );/* blue */ +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,1 ,11 ,0xfc );/* green */ +ipu_dc_map_config (priv,IPU_DC_MAP_RGB666 ,2 ,17 ,0xfc );/* red */ +return 0 ; }
drivers/staging/imx-drm/parallel-display.c +2 -0
@@ -223,6 +223,8 @@ static int imx_pd_probe(struct platform_device *pdev) imxpd->interface_pix_fmt =V4L2_PIX_FMT_RGB565 ; else if (!strcmp(fmt, "bgr666")) imxpd->interface_pix_fmt =V4L2_PIX_FMT_BGR666 ; + else if (!strcmp(fmt, "rgb666")) + imxpd->interface_pix_fmt =V4L2_PIX_FMT_RGB666 ; } imxpd->dev = &pdev->dev;
Signature · 1 line
1.7.9.5
PATCH v7 3/7 staging: imx-drm: Correct BGR666 and the board's dts that use them.
In reply to Denis CarikliThe current BGR666 is not consistent with the other color mapings like BGR24. BGR666 should be in the same byte order than BGR24.
---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
ChangeLog v5->v6:
- Remove people not concerned by this patch from the Cc list.
- Added a better explanation of the change.
ChangeLog v5:
- New patch.
--- arch/arm/boot/dts/imx51-apf51dev.dts | 2 +- arch/arm/boot/dts/imx53-m53evk.dts | 2 +- drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx51-apf51dev.dts +1 -1
@@ -19,7 +19,7 @@ display at di1 { compatible = "fsl,imx-parallel-display"; crtcs = <&ipu 0>; - interface-pix-fmt = "bgr666"; + interface-pix-fmt = "rgb666"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ipu_disp1>;
arch/arm/boot/dts/imx53-m53evk.dts +1 -1
@@ -24,7 +24,7 @@ display at di1 { compatible = "fsl,imx-parallel-display"; crtcs = <&ipu 1>; - interface-pix-fmt = "bgr666"; + interface-pix-fmt = "rgb666"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ipu_disp1>;
drivers/staging/imx-drm/ipu-v3/ipu-dc.c +2 -2
@@ -397,9 +397,9 @@ int ipu_dc_init(struct ipu_soc *ipu, struct device *dev,/* bgr666 */ ipu_dc_map_clear (priv,IPU_DC_MAP_BGR666 ); -ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,0 ,5 ,0xfc );/* blue */ +ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,0 ,17 ,0xfc );/* blue */ ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,1 ,11 ,0xfc );/* green */ -ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,2 ,17 ,0xfc );/* red */ +ipu_dc_map_config (priv,IPU_DC_MAP_BGR666 ,2 ,5 ,0xfc );/* red */ /* bgr24 */ ipu_dc_map_clear (priv,IPU_DC_MAP_BGR24 );
Signature · 1 line
1.7.9.5
PATCH v7 4/7 staging: imx-drm: Use de-active and pixelclk-active display-timings.
In reply to Denis CarikliIf de-active and/or pixelclk-active properties were set in the display-timings DT node, they were not used.
Instead the data-enable and the pixel data clock polarity were hardcoded.
This change is needed for making the eukrea-cpuimx51
QVGA display work.
---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
- Rebased the patch
- val is now initialized in imx_pd_connector_get_modes
ChangeLog v5->v6:
- Remove people not concerned by this patch from the Cc list.
- Removed wrong coments from the code.
- Corrected the code style of the "if (!!val)"
ChangeLog v3->v4:
- The old patch was named "staging: imx-drm: ipuv3-crtc: don't harcode some mode".
- Reworked the patch entierly: we now takes the mode flags from the device tree.
ChangeLog v2->v3:
- Added some interested people in the Cc list.
- Ajusted the flags to match the changes in "drm: Add the lacking DRM_MODE_FLAG_* for matching the DISPLAY_FLAGS_*"
--- drivers/staging/imx-drm/imx-drm.h | 3 +++ drivers/staging/imx-drm/ipuv3-crtc.c | 8 ++++++-- drivers/staging/imx-drm/parallel-display.c | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-)
drivers/staging/imx-drm/imx-drm.h +3 -0
@@ -5,6 +5,9 @@#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') +#define IMXDRM_MODE_FLAG_DE_HIGH (1<<0) +#define IMXDRM_MODE_FLAG_PIXDATA_POSEDGE (1<<1) +struct drm_crtc ;struct drm_connector ;struct drm_device ;
drivers/staging/imx-drm/ipuv3-crtc.c +6 -2
@@ -156,8 +156,12 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc,if (mode->flags &DRM_MODE_FLAG_PVSYNC ) sig_cfg.Vsync_pol =1 ; - sig_cfg.enable_pol =1 ; - sig_cfg.clk_pol =1 ; +if (mode->private_flags &IMXDRM_MODE_FLAG_DE_HIGH ) + sig_cfg.enable_pol =1 ; + +if (mode->private_flags &IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ) + sig_cfg.clk_pol =1 ; + sig_cfg.width = mode->hdisplay; sig_cfg.height = mode->vdisplay; sig_cfg.pixel_fmt = out_pixel_fmt;
drivers/staging/imx-drm/parallel-display.c +27 -0
@@ -75,7 +75,34 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)if (np) {struct drm_display_mode *mode =drm_mode_create (connector->dev); +struct device_node *timings_np; +struct device_node *mode_np; +u32 val =1 ; +of_get_drm_display_mode (np, &imxpd->mode,OF_USE_NATIVE_MODE ); + + timings_np =of_get_child_by_name (np,"display-timings" ); +if (timings_np) { +/* get the display mode node */ + mode_np =of_parse_phandle (timings_np, +"native-mode" ,0 ); +if (!mode_np) + mode_np =of_get_next_child (timings_np,NULL ); + +/* set de-active to 1 if not set */ +of_property_read_u32 (mode_np,"de-active" , &val); +if (val) { + imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_DE_HIGH ; + } + +/* set pixelclk-active to 1 if not set */ +of_property_read_u32 (mode_np,"pixelclk-active" , &val); +if (val) { + imxpd->mode.private_flags |= +IMXDRM_MODE_FLAG_PIXDATA_POSEDGE ; + } + }drm_mode_copy (mode, &imxpd->mode); mode->type |=DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ,drm_mode_probed_add (connector, mode);
Signature · 1 line
1.7.9.5
PATCH v7 4/7 staging: imx-drm: Use de-active and pixelclk-active display-timings.
Hi,
Quoted 45 lines · Denis Carikli
If de-active and/or pixelclk-active properties were set in the display-timings DT node, they were not used.
Instead the data-enable and the pixel data clock polarity were hardcoded.
This change is needed for making the eukrea-cpuimx51
QVGA display work.Cc Eric B?nard <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Sascha Hauer <[email protected]>Cc devel at driverdev.osuosl.orgCc linux-arm-kernel at lists.infradead.orgSigned-off-by Denis Carikli <[email protected]>---
ChangeLogv6->v7:
- Shrinked even more the Cc list.
- Rebased the patch
- val is now initialized inimx_pd_connector_get_modesChangeLog
v5->v6:
- Remove people not concerned by this patch from the Cc list.
- Removed wrong coments from the code.
- Corrected the code style of the "if (!!val)"ChangeLog
v3->v4:
- The old patch was named "staging: imx-drm: ipuv3-crtc: don't harcode some mode".
- Reworked the patch entierly: we now takes the mode flags from the device tree.ChangeLog
v2->v3:
- Added some interested people in the Cc list.
- Ajusted the flags to match the changes in "drm: Add the lacking DRM_MODE_FLAG_* for matching the DISPLAY_FLAGS_*"--- drivers/staging/imx-drm/imx-drm.h | 3 +++ drivers/staging/imx-drm/ipuv3-crtc.c | 8 ++++++-- drivers/staging/imx-drm/parallel-display.c | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-)drivers/staging/imx-drm/imx-drm.h +0
-0
drivers/staging/imx-drm/imx-drm.h line 10
Quoted 6 lines
drivers/staging/imx-drm/imx-drm.h +3
-0@@ -5,6 +5,9 @@#define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3') +#define IMXDRM_MODE_FLAG_DE_HIGH (1<<0) +#define IMXDRM_MODE_FLAG_PIXDATA_POSEDGE (1<<1) +
CodingStyle: spaces around operators...?
Lothar Wa?mann
Signature · 9 lines
___________________________________________________________ Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10 Gesch?ftsf?hrer: Matthias Kaussen Handelsregistereintrag: Amtsgericht Aachen, HRB 4996 www.karo-electronics.de | info at karo-electronics.de ___________________________________________________________
PATCH v7 5/7 staging: imx-drm: parallel display: add regulator support.
In reply to Denis Carikli---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
- Rebased the patch and included video/of_display_timing.h
--- .../bindings/staging/imx-drm/fsl-imx-drm.txt | 1 + drivers/staging/imx-drm/parallel-display.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)
Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt +1 -0
@@ -28,6 +28,7 @@ Required properties: - compatible: Should be "fsl,imx-parallel-display" - crtc: the crtc this display is connected to, see below Optional properties: +- display-supply : phandle to the regulator device tree node if needed. - interface_pix_fmt: How this display is connected to the crtc. Currently supported types: "rgb24", "rgb565", "bgr666", "rgb666" - edid: verbatim EDID data block describing attached display.
drivers/staging/imx-drm/parallel-display.c +13 -0
@@ -22,6 +22,7 @@#include <drm/drmP.h> #include <drm/drm_fb_helper.h> #include <drm/drm_crtc_helper.h> +#include <linux/regulator/consumer.h> #include <linux/videodev2.h> #include <video/of_display_timing.h>
@@ -36,6 +37,7 @@ struct imx_parallel_display {struct drm_encoder encoder;struct imx_drm_encoder *imx_drm_encoder;struct device *dev; +struct regulator *disp_reg;void *edid;int edid_len;u32 interface_pix_fmt;
@@ -141,6 +143,9 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder) {struct imx_parallel_display *imxpd =enc_to_imxpd (encoder); +if (regulator_enable (imxpd->disp_reg)) +dev_err (imxpd->dev,"Failed to enable regulator.\n" ); +imx_drm_crtc_panel_format (encoder->crtc,DRM_MODE_ENCODER_NONE , imxpd->interface_pix_fmt); }
@@ -157,6 +162,10 @@ static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,static void imx_pd_encoder_disable (struct drm_encoder *encoder) { +struct imx_parallel_display *imxpd =enc_to_imxpd (encoder); + +if (regulator_disable (imxpd->disp_reg)) +dev_err (imxpd->dev,"Failed to disable regulator.\n" ); }static void imx_pd_encoder_destroy (struct drm_encoder *encoder)
@@ -260,6 +269,10 @@ static int imx_pd_probe(struct platform_device *pdev)if (ret)return ret; + imxpd->disp_reg =devm_regulator_get (&pdev->dev,"display" ); +if (IS_ERR (imxpd->disp_reg)) +return PTR_ERR (imxpd->disp_reg); + ret =imx_drm_encoder_add_possible_crtcs (imxpd->imx_drm_encoder, np);platform_set_drvdata (pdev, imxpd);
Signature · 1 line
1.7.9.5
PATCH v7 6/7 ARM: dts: mbimx51sd: Add display support.
In reply to Denis CarikliThe CMO-QVGA, DVI-SVGA and DVI-VGA are added.
---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
- Since the pingrp headers were removed, the references to it where replaced by the actual pins.
- Added the targets to arch/arm/boot/dts/Makefile
ChangeLog v5->v6:
- Reordered the Cc list.
ChangeLog v3->v5:
- Updated to new GPIO defines.
- Updated to new licenses checkpatch requirements.
- one whitespace cleanup.
ChangeLog v2->v3:
- Splitted out from the patch that added support for the cpuimx51/mbimxsd51 boards.
- This patch now only adds display support.
- Added some interested people in the Cc list, and removed some people that might be annoyed by the receiving of that patch which is unrelated to their subsystem.
- rebased and reworked the dts displays addition.
- Also rebased and reworked the fsl,pins usage.
--- arch/arm/boot/dts/Makefile | 3 ++ .../imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts | 55 ++++++++++++++++++++ .../imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts | 42 +++++++++++++++ .../imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts | 42 +++++++++++++++ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 40 ++++++++++++++ 5 files changed, 182 insertions(+) create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts
arch/arm/boot/dts/Makefile +3 -0
@@ -154,6 +154,9 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx51-apf51dev.dtb \ imx51-babbage.dtb \ imx51-eukrea-mbimxsd51-baseboard.dtb \ + imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dtb \ + imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dtb \ + imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dtb \ imx53-ard.dtb \ imx53-m53evk.dtb \ imx53-mba53.dtb \
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts new file +55 -0
55 lines not on this page · raw message
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-svga.dts new file +42 -0
42 lines not on this page · raw message
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-dvi-vga.dts new file +42 -0
42 lines not on this page · raw message
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +40 -0
@@ -24,6 +24,15 @@ model = "Eukrea CPUIMX51"; compatible = "eukrea,mbimxsd51","eukrea,cpuimx51", "fsl,imx51"; + display: display at di0 { + compatible = "fsl,imx-parallel-display"; + crtcs = <&ipu 0>; + interface-pix-fmt = "rgb666"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu_disp1>; + status = "disabled"; + }; + gpio_keys { compatible = "gpio-keys"; pinctrl-names = "default";
@@ -146,6 +155,37 @@ >; }; + pinctrl_ipu_disp1: ipudisp1grp { + fsl,pins = < + MX51_PAD_DISP1_DAT0__DISP1_DAT0 0x5 + MX51_PAD_DISP1_DAT1__DISP1_DAT1 0x5 + MX51_PAD_DISP1_DAT2__DISP1_DAT2 0x5 + MX51_PAD_DISP1_DAT3__DISP1_DAT3 0x5 + MX51_PAD_DISP1_DAT4__DISP1_DAT4 0x5 + MX51_PAD_DISP1_DAT5__DISP1_DAT5 0x5 + MX51_PAD_DISP1_DAT6__DISP1_DAT6 0x5 + MX51_PAD_DISP1_DAT7__DISP1_DAT7 0x5 + MX51_PAD_DISP1_DAT8__DISP1_DAT8 0x5 + MX51_PAD_DISP1_DAT9__DISP1_DAT9 0x5 + MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5 + MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5 + MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5 + MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5 + MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5 + MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5 + MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5 + MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5 + MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5 + MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5 + MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5 + MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5 + MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5 + MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5 + MX51_PAD_DI1_PIN2__DI1_PIN2 0x5 + MX51_PAD_DI1_PIN3__DI1_PIN3 0x5 + >; + }; + pinctrl_reg_lcd_3v3: reg_lcd_3v3 { fsl,pins = < MX51_PAD_CSI1_D9__GPIO3_13 0x1f5
Signature · 1 line
1.7.9.5
PATCH v7 7/7 ARM: dts: mbimx51sd: Add CMO-QVGA backlight support.
In reply to Denis Carikli---
ChangeLog v6->v7:
- Shrinked even more the Cc list.
ChangeLog v5->v6:
- Reordered the Cc list.
ChangeLog v3->v5:
- Updated to the new GPIO defines.
ChangeLog v2->v3:
- Splitted out from the patch that added support for the cpuimx51/mbimxsd51 boards.
- This patch now only adds backlight support.
- Added some interested people in the Cc list, and removed some people that might be annoyed by the receiving of that patch which is unrelated to their subsystem.
--- .../imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard-cmo-qvga.dts +8 -0
@@ -17,6 +17,14 @@ model = "Eukrea MBIMXSD51 with the CMO-QVGA Display"; compatible = "eukrea,mbimxsd51-baseboard-cmo-qvga", "eukrea,mbimxsd51-baseboard", "eukrea,cpuimx51", "fsl,imx51"; + backlight { + compatible = "gpio-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight_1>; + gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>; + default-brightness-level = <1>; + }; + reg_lcd_3v3: lcd-en { compatible = "regulator-fixed"; pinctrl-names = "default";
Signature · 1 line
1.7.9.5
Quoted 9 lines · Denis Carikli
That new macro is needed by the
imx_drmstaging driver
for supporting the QVGA display of the eukrea-cpuimx51 board.Cc Eric Bénard <[email protected]>CC Troy Kisky <[email protected]>Signed-off-by Denis Carikli <[email protected]>Acked-by Laurent Pinchart <[email protected]>
Denis,
I'm only responsible for taking arch/arm/boot/dts/imx* changes, and other changes should be sent to subsystem maintainers.
Shawn
Quoted 129 lines
---
ChangeLogv6->v7:
- Shrinked even more the Cc list.
ChangeLogv5->v6:
- Remove people not concerned by this patch from the Cc list.ChangeLog
v3->v4:
- Added Laurent Pinchart's Ack.ChangeLog
v2->v3:
- Added some interested people in the Cc list.
- Added Mauro Carvalho Chehab's Ack.
- Added documentation.--- .../DocBook/media/v4l/pixfmt-packed-rgb.xml | 78 ++++++++++++++++++++ include/uapi/linux/videodev2.h | 1 + 2 files changed, 79 insertions(+)Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml +78
-0@@ -279,6 +279,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para> <entry></entry> <entry></entry> </row> + <row id="V4L2-PIX-FMT-RGB666"> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row id="V4L2-PIX-FMT-BGR24"> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>@@ -781,6 +820,45 @@ defined in error. Drivers may interpret them as in <xref <entry></entry> <entry></entry> </row> + <row><!-- id="V4L2-PIX-FMT-RGB666" --> + <entry><constant>V4L2_PIX_FMT_RGB666</constant></entry> + <entry>'RGBH'</entry> + <entry></entry> + <entry>r<subscript>5</subscript></entry> + <entry>r<subscript>4</subscript></entry> + <entry>r<subscript>3</subscript></entry> + <entry>r<subscript>2</subscript></entry> + <entry>r<subscript>1</subscript></entry> + <entry>r<subscript>0</subscript></entry> + <entry>g<subscript>5</subscript></entry> + <entry>g<subscript>4</subscript></entry> + <entry></entry> + <entry>g<subscript>3</subscript></entry> + <entry>g<subscript>2</subscript></entry> + <entry>g<subscript>1</subscript></entry> + <entry>g<subscript>0</subscript></entry> + <entry>b<subscript>5</subscript></entry> + <entry>b<subscript>4</subscript></entry> + <entry>b<subscript>3</subscript></entry> + <entry>b<subscript>2</subscript></entry> + <entry></entry> + <entry>b<subscript>1</subscript></entry> + <entry>b<subscript>0</subscript></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry></entry> + </row> <row><!-- id="V4L2-PIX-FMT-BGR24" --> <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry> <entry>'BGR3'</entry>include/uapi/linux/videodev2.h +1
-0@@ -294,6 +294,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q')/* 16 RGB-5-5-5 BE */ #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R')/* 16 RGB-5-6-5 BE */ #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H')/* 18 BGR-6-6-6 */ +#define V4L2_PIX_FMT_RGB666 v4l2_fourcc('R', 'G', 'B', 'H')/* 18 RGB-6-6-6 */ #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3')/* 24 BGR-8-8-8 */ #define V4L2_PIX_FMT_RGB24 v4l2_fourcc('R', 'G', 'B', '3')/* 24 RGB-8-8-8 */ #define V4L2_PIX_FMT_BGR32 v4l2_fourcc('B', 'G', 'R', '4')/* 32 BGR-8-8-8-8 */ Signature · 1 line
1.7.9.5