Commit f6d94e71 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Stefan Agner

drm: mxsfb: Update internal IP version number for i.MX6SX

The LCDIF present in the i.MX6SX has extra features compared to
the i.MX28. It has however lost its IP version register, so no official
version number is known. Bump the version to MXSFB_V6 following the i.MX
version, in preparation for support for the additional features.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200727020654.8231-18-laurent.pinchart@ideasonboard.com
parent b13aeb9e
...@@ -35,6 +35,11 @@ ...@@ -35,6 +35,11 @@
enum mxsfb_devtype { enum mxsfb_devtype {
MXSFB_V3, MXSFB_V3,
MXSFB_V4, MXSFB_V4,
/*
* Starting at i.MX6 the hardware version register is gone, use the
* i.MX family number as the version.
*/
MXSFB_V6,
}; };
static const struct mxsfb_devdata mxsfb_devdata[] = { static const struct mxsfb_devdata mxsfb_devdata[] = {
...@@ -52,6 +57,13 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { ...@@ -52,6 +57,13 @@ static const struct mxsfb_devdata mxsfb_devdata[] = {
.hs_wdth_mask = 0x3fff, .hs_wdth_mask = 0x3fff,
.hs_wdth_shift = 18, .hs_wdth_shift = 18,
}, },
[MXSFB_V6] = {
.transfer_count = LCDC_V4_TRANSFER_COUNT,
.cur_buf = LCDC_V4_CUR_BUF,
.next_buf = LCDC_V4_NEXT_BUF,
.hs_wdth_mask = 0x3fff,
.hs_wdth_shift = 18,
},
}; };
void mxsfb_enable_axi_clk(struct mxsfb_drm_private *mxsfb) void mxsfb_enable_axi_clk(struct mxsfb_drm_private *mxsfb)
...@@ -271,7 +283,7 @@ static struct drm_driver mxsfb_driver = { ...@@ -271,7 +283,7 @@ static struct drm_driver mxsfb_driver = {
static const struct platform_device_id mxsfb_devtype[] = { static const struct platform_device_id mxsfb_devtype[] = {
{ .name = "imx23-fb", .driver_data = MXSFB_V3, }, { .name = "imx23-fb", .driver_data = MXSFB_V3, },
{ .name = "imx28-fb", .driver_data = MXSFB_V4, }, { .name = "imx28-fb", .driver_data = MXSFB_V4, },
{ .name = "imx6sx-fb", .driver_data = MXSFB_V4, }, { .name = "imx6sx-fb", .driver_data = MXSFB_V6, },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(platform, mxsfb_devtype); MODULE_DEVICE_TABLE(platform, mxsfb_devtype);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment