| Message ID | 20191104193140.31145-15-bparrot@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ti-vpe: cal: maintenance | expand |
Hi Benoit, On Mon, Nov 04, 2019 at 01:31:34PM -0600, Benoit Parrot wrote: > Add the needed control module register bit layout to support the AM654 > family of devices. > > Signed-off-by: Benoit Parrot <bparrot@ti.com> > --- > drivers/media/platform/Kconfig | 2 +- > drivers/media/platform/ti-vpe/cal.c | 28 +++++++++++++++++++++++++++- > 2 files changed, 28 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index e84f35d3a68e..995f4c67f764 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -151,7 +151,7 @@ source "drivers/media/platform/sunxi/Kconfig" > config VIDEO_TI_CAL > tristate "TI CAL (Camera Adaptation Layer) driver" > depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API > - depends on SOC_DRA7XX || COMPILE_TEST > + depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST > select VIDEOBUF2_DMA_CONTIG > select V4L2_FWNODE > help > diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c > index 72ed2348389d..45653e9ed6cd 100644 > --- a/drivers/media/platform/ti-vpe/cal.c > +++ b/drivers/media/platform/ti-vpe/cal.c > @@ -322,6 +322,26 @@ static struct cal_data dra76x_cal_data = { > .flags = 0, > }; > > +static struct reg_field am654_ctrl_core_csi0_reg_fields[F_MAX_FIELDS] = { > + [F_CTRLCLKEN] = REG_FIELD(0, 15, 15), > + [F_CAMMODE] = REG_FIELD(0, 24, 25), > + [F_LANEENABLE] = REG_FIELD(0, 0, 4), > +}; > + > +static struct cal_csi2_phy am654_cal_csi_phy[] = { > + { > + .base_fields = am654_ctrl_core_csi0_reg_fields, > + .num_lanes = 5, > + }, > +}; > + > +static struct cal_data am654_cal_data = { > + .csi2_phy_core = am654_cal_csi_phy, > + .num_csi2_phy = ARRAY_SIZE(am654_cal_csi_phy), > + > + .flags = 0, Same comments as on 12th patch. Could all these structs be const? > +}; > + > /* > * there is one cal_dev structure in the driver, it is shared by > * all instances. > @@ -548,7 +568,9 @@ static void camerarx_phy_enable(struct cal_ctx *ctx) > /* Always enable all lanes at the phy control level */ > max_lanes = (1 << cal_data_get_phy_max_lanes(ctx)) - 1; > regmap_field_write(phy->fields[F_LANEENABLE], max_lanes); > - regmap_field_write(phy->fields[F_CSI_MODE], 1); > + /* F_CSI_MODE is not present on every architecture */ > + if (phy->fields[F_CSI_MODE]) > + regmap_field_write(phy->fields[F_CSI_MODE], 1); > regmap_field_write(phy->fields[F_CTRLCLKEN], 1); > } >
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index e84f35d3a68e..995f4c67f764 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -151,7 +151,7 @@ source "drivers/media/platform/sunxi/Kconfig" config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - depends on SOC_DRA7XX || COMPILE_TEST + depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_FWNODE help diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c index 72ed2348389d..45653e9ed6cd 100644 --- a/drivers/media/platform/ti-vpe/cal.c +++ b/drivers/media/platform/ti-vpe/cal.c @@ -322,6 +322,26 @@ static struct cal_data dra76x_cal_data = { .flags = 0, }; +static struct reg_field am654_ctrl_core_csi0_reg_fields[F_MAX_FIELDS] = { + [F_CTRLCLKEN] = REG_FIELD(0, 15, 15), + [F_CAMMODE] = REG_FIELD(0, 24, 25), + [F_LANEENABLE] = REG_FIELD(0, 0, 4), +}; + +static struct cal_csi2_phy am654_cal_csi_phy[] = { + { + .base_fields = am654_ctrl_core_csi0_reg_fields, + .num_lanes = 5, + }, +}; + +static struct cal_data am654_cal_data = { + .csi2_phy_core = am654_cal_csi_phy, + .num_csi2_phy = ARRAY_SIZE(am654_cal_csi_phy), + + .flags = 0, +}; + /* * there is one cal_dev structure in the driver, it is shared by * all instances. @@ -548,7 +568,9 @@ static void camerarx_phy_enable(struct cal_ctx *ctx) /* Always enable all lanes at the phy control level */ max_lanes = (1 << cal_data_get_phy_max_lanes(ctx)) - 1; regmap_field_write(phy->fields[F_LANEENABLE], max_lanes); - regmap_field_write(phy->fields[F_CSI_MODE], 1); + /* F_CSI_MODE is not present on every architecture */ + if (phy->fields[F_CSI_MODE]) + regmap_field_write(phy->fields[F_CSI_MODE], 1); regmap_field_write(phy->fields[F_CTRLCLKEN], 1); } @@ -2321,6 +2343,10 @@ static const struct of_device_id cal_of_match[] = { .compatible = "ti,dra76-cal", .data = (void *)&dra76x_cal_data, }, + { + .compatible = "ti,am654-cal", + .data = (void *)&am654_cal_data, + }, {}, }; MODULE_DEVICE_TABLE(of, cal_of_match);
Add the needed control module register bit layout to support the AM654 family of devices. Signed-off-by: Benoit Parrot <bparrot@ti.com> --- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/ti-vpe/cal.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-)