microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

media: ti-vpe: cal: Embed base_fields array in struct cal_csi2_phy 

The base_fields field of cal_csi2_phy points to a fixed-size array of
struct reg_field. This level of indirection isn't needed, embed the
array directly in struct cal_csi2_phy.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart 2020-07-06 20:35:35 +02:00 коммит произвёл Mauro Carvalho Chehab
Родитель 6341aa2ee4
Коммит 5b4426e33b
1 изменённых файлов: 30 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
drivers/media/platform/ti-vpe/cal.c
Просмотреть файл

@ -234,7 +234,7 @@ enum cal_camerarx_field {
struct cal_csi2_phy {
struct regmap_field *fields[F_MAX_FIELDS];
struct reg_field *base_fields;
struct reg_field base_fields[F_MAX_FIELDS];
const int num_lanes;
};
@ -245,27 +245,23 @@ struct cal_data {
const unsigned int flags;
};
static struct reg_field dra72x_ctrl_core_csi0_reg_fields[F_MAX_FIELDS] = {
static struct cal_csi2_phy dra72x_cal_csi_phy[] = {
{
.base_fields = {
[F_CTRLCLKEN] = REG_FIELD(0, 10, 10),
[F_CAMMODE] = REG_FIELD(0, 11, 12),
[F_LANEENABLE] = REG_FIELD(0, 13, 16),
[F_CSI_MODE] = REG_FIELD(0, 17, 17),
};
static struct reg_field dra72x_ctrl_core_csi1_reg_fields[F_MAX_FIELDS] = {
},
.num_lanes = 4,
},
{
.base_fields = {
[F_CTRLCLKEN] = REG_FIELD(0, 0, 0),
[F_CAMMODE] = REG_FIELD(0, 1, 2),
[F_LANEENABLE] = REG_FIELD(0, 3, 4),
[F_CSI_MODE] = REG_FIELD(0, 5, 5),
};
static struct cal_csi2_phy dra72x_cal_csi_phy[] = {
{
.base_fields = dra72x_ctrl_core_csi0_reg_fields,
.num_lanes = 4,
},
{
.base_fields = dra72x_ctrl_core_csi1_reg_fields,
.num_lanes = 2,
},
};
@ -281,27 +277,23 @@ static const struct cal_data dra72x_es1_cal_data = {
.flags = DRA72_CAL_PRE_ES2_LDO_DISABLE,
};
static struct reg_field dra76x_ctrl_core_csi0_reg_fields[F_MAX_FIELDS] = {
static struct cal_csi2_phy dra76x_cal_csi_phy[] = {
{
.base_fields = {
[F_CTRLCLKEN] = REG_FIELD(0, 8, 8),
[F_CAMMODE] = REG_FIELD(0, 9, 10),
[F_CSI_MODE] = REG_FIELD(0, 11, 11),
[F_LANEENABLE] = REG_FIELD(0, 27, 31),
};
static struct reg_field dra76x_ctrl_core_csi1_reg_fields[F_MAX_FIELDS] = {
},
.num_lanes = 5,
},
{
.base_fields = {
[F_CTRLCLKEN] = REG_FIELD(0, 0, 0),
[F_CAMMODE] = REG_FIELD(0, 1, 2),
[F_CSI_MODE] = REG_FIELD(0, 3, 3),
[F_LANEENABLE] = REG_FIELD(0, 24, 26),
};
static struct cal_csi2_phy dra76x_cal_csi_phy[] = {
{
.base_fields = dra76x_ctrl_core_csi0_reg_fields,
.num_lanes = 5,
},
{
.base_fields = dra76x_ctrl_core_csi1_reg_fields,
.num_lanes = 3,
},
};
@ -311,15 +303,13 @@ static const struct cal_data dra76x_cal_data = {
.num_csi2_phy = ARRAY_SIZE(dra76x_cal_csi_phy),
};
static struct reg_field am654_ctrl_core_csi0_reg_fields[F_MAX_FIELDS] = {
static struct cal_csi2_phy am654_cal_csi_phy[] = {
{
.base_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,
},
};