video: Kconfig: fbdev: restore the broader selection of FB_IMX
Subsystems (4)
PATCH v15 1/3 video: Kconfig: fbdev: restore the broader selection of FB_IMX
The following patch:
b359bb0 video: Kconfig: Allow more broad selection of the imxfb framebuffer driver.
Was accidentally reverted by this one:
ed3b5f2 Merge branch '3.15/fb-reorder' into for-next
---
ChangeLog v14->v15:
- New patch
--- drivers/video/fbdev/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/Kconfig +1 -1
@@ -327,7 +327,7 @@ config FB_SA1100 config FB_IMX tristate "Freescale i.MX1/21/25/27 LCD support" - depends on FB && IMX_HAVE_PLATFORM_IMX_FB + depends on FB && ARCH_MXC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
Signature · 1 line
1.7.9.5
PATCH v15 2/3 video: imxfb: Add DT default contrast control register property.
---
ChangeLog v14->v15:
- Moved the Cc into git send-email.
- Rebased.
ChangeLog v5->v14:
- Remove people not concerned by this patch from the Cc list.
- Changed the property name to match the register name and function.
- Updated the documentation, code and commit message accordingly.
--- .../devicetree/bindings/video/fsl,imx-fb.txt | 3 +++ drivers/video/fbdev/imxfb.c | 3 +++ 2 files changed, 6 insertions(+)
Documentation/devicetree/bindings/video/fsl,imx-fb.txt +3 -0
@@ -18,6 +18,9 @@ Optional properties: - lcd-supply: Regulator for LCD supply voltage. - fsl,dmacr: DMA Control Register value. This is optional. By default, the register is not modified as recommended by the datasheet. +- fsl,lpccr: Contrast Control Register value. This property provides the + default value for the contrast control register. + If that property is ommited, the register is zeroed. - fsl,lscr1: LCDC Sharp Configuration Register value. Example:
drivers/video/fbdev/imxfb.c +3 -0
@@ -670,6 +670,9 @@ static int imxfb_init_fbinfo(struct platform_device *pdev) fbi->cmap_static =of_property_read_bool (np,"cmap-static" ); fbi->lscr1 =IMXFB_LSCR1_DEFAULT ; + +of_property_read_u32 (np,"fsl,lpccr" , &fbi->pwmr); +of_property_read_u32 (np,"fsl,lscr1" , &fbi->lscr1);of_property_read_u32 (np,"fsl,dmacr" , &fbi->dmacr);
Signature · 1 line
1.7.9.5
PATCH v15 2/3 video: imxfb: Add DT default contrast control register property.
Quoted 8 lines · Denis Carikli
Signed-off-by Denis Carikli <[email protected]>Acked-by Grant Likely <[email protected]>---
ChangeLogv14->v15:
- Moved the Cc into git send-email.
- Rebased.
Quoted 8 lines
ChangeLog
v5->v14:
- Remove people not concerned by this patch from the Cc list.
- Changed the property name to match the register name and function.
- Updated the documentation, code and commit message accordingly.--- .../devicetree/bindings/video/fsl,imx-fb.txt | 3 +++ drivers/video/fbdev/imxfb.c | 3 +++ 2 files changed, 6 insertions(+)
Queued for 3.15.
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140317/8f94363c/attachment.sig>
PATCH v15 3/3 ARM: dts: imx25: mbimxsd25: Add displays support.
In reply to Denis CarikliThe CMO-QVGA(With backlight), DVI-VGA and DVI-SVGA displays were added.
---
ChangeLog v14->v15:
- Moved the Cc into git-send-email.
- Added a reg property in the regulator at 0 node.
ChangeLog v13->v14:
- Remove people not concerned by this patch from the Cc list.
- changed the fsl,pwmr lcdc property to fsl,lpccr, to match the previous patches in that serie.
ChangeLog v10->v13:
- This patch is the display part splitted out from the patch adding support for the cpuimx25(and its baseboard).
- Shawn Guo was added to the Cc list.
- The regulator part was updated to match the current style.
- The new GPIO defines are now used in the dts(i).
--- .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 72 ++++++++++++++++++++ .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts | 45 ++++++++++++ .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts | 45 ++++++++++++ 3 files changed, 163 insertions(+) create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts new file +73 -0
@@ -0,0 +1,73 @@ +/* + * Copyright 2013 Eukr?a Electromatique <[email protected]> + * + * 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "imx25-eukrea-mbimxsd25-baseboard.dts" + +/ { + model = "Eukrea MBIMXSD25 with the CMO-QVGA Display"; + compatible = "eukrea,mbimxsd25-baseboard-cmo-qvga", "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25"; + + cmo_qvga: display { + model = "CMO-QVGA"; + bits-per-pixel = <16>; + fsl,pcr = <0xcad08b80>; + bus-width = <18>; + native-mode = <&qvga_timings>; + display-timings { + qvga_timings: 320x240 { + clock-frequency = <6500000>; + hactive = <320>; + vactive = <240>; + hback-porch = <30>; + hfront-porch = <38>; + vback-porch = <20>; + vfront-porch = <3>; + hsync-len = <15>; + vsync-len = <4>; + }; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_lcd_3v3: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_lcd_3v3>; + regulator-name = "lcd-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + }; +}; + +&iomuxc { + imx25-eukrea-mbimxsd25-baseboard-cmo-qvga { + pinctrl_reg_lcd_3v3: reg_lcd_3v3 { + fsl,pins = <MX25_PAD_PWM__GPIO_1_26 0x80000000>; + }; + }; +}; + +&lcdc { + display = <&cmo_qvga>; + fsl,lpccr = <0x00a903ff>; + lcd-supply = <®_lcd_3v3>; + status = "okay"; +};
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts new file +45 -0
45 lines not on this page · raw message
arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v15 1/3 video: Kconfig: fbdev: restore the broader selection of FB_IMX
In reply to Denis CarikliQuoted 6 lines · Denis Carikli
The following patch:
b359bb0 video:Kconfig: Allow more broad selection of the imxfb framebuffer driver.
Was accidentally reverted by this one:
ed3b5f2 Merge branch '3.15/fb-reorder' into for-nextSigned-off-by Denis Carikli <[email protected]>
Thanks. I've fixed it.
It was my merge mistake.
Tomi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140317/52c7e205/attachment.sig>