Skip to content

L
linux
Commit 0d814017 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Mauro Carvalho Chehab
Browse files
Options

media: camss: Add regulator_bulk support 

Add the ability to enable or disable multiple regulators in bulk with
camss. This is useful for sm8250, sdm845 and it looks like sdm660 where we
have more than one CSI regulator to do at once.

It should just work for standalone existing vdda regulators and parts which
don't have an explicitly defined CSI regulator.

[hverkuil: fix camss-csid.c:163:13: warning: 'ret' may be used uninitialized in this function]
Reported-by: default avatarVladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 088c0384
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 64 deletions
drivers/media/platform/qcom/camss/camss-csid.c
View file @ 0d814017
......@@ -160,7 +160,7 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
struct device *dev = camss->dev;
struct vfe_device *vfe = &camss->vfe[csid->id];
u32 version = camss->version;
int ret;
int ret = 0;
if (on) {
if (version == CAMSS_8250 || version == CAMSS_845) {
......@@ -173,7 +173,8 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
if (ret < 0)
return ret;
ret = csid->vdda ? regulator_enable(csid->vdda) : 0;
ret = regulator_bulk_enable(csid->num_supplies,
csid->supplies);
if (ret < 0) {
pm_runtime_put_sync(dev);
return ret;
......@@ -181,16 +182,16 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
ret = csid_set_clock_rates(csid);
if (ret < 0) {
if (csid->vdda)
regulator_disable(csid->vdda);
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
return ret;
}
ret = camss_enable_clocks(csid->nclocks, csid->clock, dev);
if (ret < 0) {
if (csid->vdda)
regulator_disable(csid->vdda);
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
return ret;
}
......@@ -201,8 +202,8 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
if (ret < 0) {
disable_irq(csid->irq);
camss_disable_clocks(csid->nclocks, csid->clock);
if (csid->vdda)
regulator_disable(csid->vdda);
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
return ret;
}
......@@ -211,7 +212,8 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
} else {
disable_irq(csid->irq);
camss_disable_clocks(csid->nclocks, csid->clock);
ret = csid->vdda ? regulator_disable(csid->vdda) : 0;
regulator_bulk_disable(csid->num_supplies,
csid->supplies);
pm_runtime_put_sync(dev);
if (version == CAMSS_8250 || version == CAMSS_845)
vfe_put(vfe);
......@@ -656,15 +658,28 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
}
/* Regulator */
for (i = 0; i < ARRAY_SIZE(res->regulators); i++) {
if (res->regulators[i])
csid->num_supplies++;
}
csid->vdda = NULL;
if (res->regulator[0])
csid->vdda = devm_regulator_get(dev, res->regulator[0]);
if (IS_ERR(csid->vdda)) {
dev_err(dev, "could not get regulator\n");
return PTR_ERR(csid->vdda);
if (csid->num_supplies) {
csid->supplies = devm_kmalloc_array(camss->dev,
csid->num_supplies,
sizeof(csid->supplies),
GFP_KERNEL);
if (!csid->supplies)
return -ENOMEM;
}
for (i = 0; i < csid->num_supplies; i++)
csid->supplies[i].supply = res->regulators[i];
ret = devm_regulator_bulk_get(camss->dev, csid->num_supplies,
csid->supplies);
if (ret)
return ret;
init_completion(&csid->reset_complete);
return 0;
......
drivers/media/platform/qcom/camss/camss-csid.h
View file @ 0d814017
......@@ -152,7 +152,8 @@ struct csid_device {
char irq_name[30];
struct camss_clock *clock;
int nclocks;
struct regulator *vdda;
struct regulator_bulk_data *supplies;
int num_supplies;
struct completion reset_complete;
struct csid_testgen_config testgen;
struct csid_phy_config phy;
......
drivers/media/platform/qcom/camss/camss.c
View file @ 0d814017
......@@ -34,7 +34,7 @@
static const struct resources csiphy_res_8x16[] = {
/* CSIPHY0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" },
.clock_rate = { { 0 },
{ 0 },
......@@ -46,7 +46,7 @@ static const struct resources csiphy_res_8x16[] = {
/* CSIPHY1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" },
.clock_rate = { { 0 },
{ 0 },
......@@ -60,7 +60,7 @@ static const struct resources csiphy_res_8x16[] = {
static const struct resources csid_res_8x16[] = {
/* CSID0 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",
"csi0", "csi0_phy", "csi0_pix", "csi0_rdi" },
.clock_rate = { { 0 },
......@@ -77,7 +77,7 @@ static const struct resources csid_res_8x16[] = {
/* CSID1 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",
"csi1", "csi1_phy", "csi1_pix", "csi1_rdi" },
.clock_rate = { { 0 },
......@@ -107,7 +107,7 @@ static const struct resources_ispif ispif_res_8x16 = {
static const struct resources vfe_res_8x16[] = {
/* VFE0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "vfe0", "csi_vfe0",
"vfe_ahb", "vfe_axi", "ahb" },
.clock_rate = { { 0 },
......@@ -129,7 +129,7 @@ static const struct resources vfe_res_8x16[] = {
static const struct resources csiphy_res_8x96[] = {
/* CSIPHY0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer" },
.clock_rate = { { 0 },
{ 0 },
......@@ -141,7 +141,7 @@ static const struct resources csiphy_res_8x96[] = {
/* CSIPHY1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer" },
.clock_rate = { { 0 },
{ 0 },
......@@ -153,7 +153,7 @@ static const struct resources csiphy_res_8x96[] = {
/* CSIPHY2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy2_timer" },
.clock_rate = { { 0 },
{ 0 },
......@@ -167,7 +167,7 @@ static const struct resources csiphy_res_8x96[] = {
static const struct resources csid_res_8x96[] = {
/* CSID0 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",
"csi0", "csi0_phy", "csi0_pix", "csi0_rdi" },
.clock_rate = { { 0 },
......@@ -184,7 +184,7 @@ static const struct resources csid_res_8x96[] = {
/* CSID1 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",
"csi1", "csi1_phy", "csi1_pix", "csi1_rdi" },
.clock_rate = { { 0 },
......@@ -201,7 +201,7 @@ static const struct resources csid_res_8x96[] = {
/* CSID2 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb",
"csi2", "csi2_phy", "csi2_pix", "csi2_rdi" },
.clock_rate = { { 0 },
......@@ -218,7 +218,7 @@ static const struct resources csid_res_8x96[] = {
/* CSID3 */
{
.regulator = { "vdda" },
.regulators = { "vdda" },
.clock = { "top_ahb", "ispif_ahb", "csi3_ahb", "ahb",
"csi3", "csi3_phy", "csi3_pix", "csi3_rdi" },
.clock_rate = { { 0 },
......@@ -249,7 +249,7 @@ static const struct resources_ispif ispif_res_8x96 = {
static const struct resources vfe_res_8x96[] = {
/* VFE0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ahb", "vfe0", "csi_vfe0", "vfe_ahb",
"vfe0_ahb", "vfe_axi", "vfe0_stream"},
.clock_rate = { { 0 },
......@@ -267,7 +267,7 @@ static const struct resources vfe_res_8x96[] = {
/* VFE1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ahb", "vfe1", "csi_vfe1", "vfe_ahb",
"vfe1_ahb", "vfe_axi", "vfe1_stream"},
.clock_rate = { { 0 },
......@@ -287,7 +287,7 @@ static const struct resources vfe_res_8x96[] = {
static const struct resources csiphy_res_660[] = {
/* CSIPHY0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy0_timer",
"csi0_phy", "csiphy_ahb2crif" },
.clock_rate = { { 0 },
......@@ -301,7 +301,7 @@ static const struct resources csiphy_res_660[] = {
/* CSIPHY1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy1_timer",
"csi1_phy", "csiphy_ahb2crif" },
.clock_rate = { { 0 },
......@@ -315,7 +315,7 @@ static const struct resources csiphy_res_660[] = {
/* CSIPHY2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "top_ahb", "ispif_ahb", "ahb", "csiphy2_timer",
"csi2_phy", "csiphy_ahb2crif" },
.clock_rate = { { 0 },
......@@ -331,7 +331,7 @@ static const struct resources csiphy_res_660[] = {
static const struct resources csid_res_660[] = {
/* CSID0 */
{
.regulator = { "vdda", "vdd_sec" },
.regulators = { "vdda", "vdd_sec" },
.clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb",
"csi0", "csi0_phy", "csi0_pix", "csi0_rdi",
"cphy_csid0" },
......@@ -351,7 +351,7 @@ static const struct resources csid_res_660[] = {
/* CSID1 */
{
.regulator = { "vdda", "vdd_sec" },
.regulators = { "vdda", "vdd_sec" },
.clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb",
"csi1", "csi1_phy", "csi1_pix", "csi1_rdi",
"cphy_csid1" },
......@@ -371,7 +371,7 @@ static const struct resources csid_res_660[] = {
/* CSID2 */
{
.regulator = { "vdda", "vdd_sec" },
.regulators = { "vdda", "vdd_sec" },
.clock = { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb",
"csi2", "csi2_phy", "csi2_pix", "csi2_rdi",
"cphy_csid2" },
......@@ -391,7 +391,7 @@ static const struct resources csid_res_660[] = {
/* CSID3 */
{
.regulator = { "vdda", "vdd_sec" },
.regulators = { "vdda", "vdd_sec" },
.clock = { "top_ahb", "ispif_ahb", "csi3_ahb", "ahb",
"csi3", "csi3_phy", "csi3_pix", "csi3_rdi",
"cphy_csid3" },
......@@ -425,7 +425,7 @@ static const struct resources_ispif ispif_res_660 = {
static const struct resources vfe_res_660[] = {
/* VFE0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "throttle_axi", "top_ahb", "ahb", "vfe0",
"csi_vfe0", "vfe_ahb", "vfe0_ahb", "vfe_axi",
"vfe0_stream"},
......@@ -446,7 +446,7 @@ static const struct resources vfe_res_660[] = {
/* VFE1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "throttle_axi", "top_ahb", "ahb", "vfe1",
"csi_vfe1", "vfe_ahb", "vfe1_ahb", "vfe_axi",
"vfe1_stream"},
......@@ -469,7 +469,7 @@ static const struct resources vfe_res_660[] = {
static const struct resources csiphy_res_845[] = {
/* CSIPHY0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
"cpas_ahb", "cphy_rx_src", "csiphy0",
"csiphy0_timer_src", "csiphy0_timer" },
......@@ -487,7 +487,7 @@ static const struct resources csiphy_res_845[] = {
/* CSIPHY1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
"cpas_ahb", "cphy_rx_src", "csiphy1",
"csiphy1_timer_src", "csiphy1_timer" },
......@@ -505,7 +505,7 @@ static const struct resources csiphy_res_845[] = {
/* CSIPHY2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
"cpas_ahb", "cphy_rx_src", "csiphy2",
"csiphy2_timer_src", "csiphy2_timer" },
......@@ -523,7 +523,7 @@ static const struct resources csiphy_res_845[] = {
/* CSIPHY3 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "soc_ahb", "slow_ahb_src",
"cpas_ahb", "cphy_rx_src", "csiphy3",
"csiphy3_timer_src", "csiphy3_timer" },
......@@ -543,7 +543,7 @@ static const struct resources csiphy_res_845[] = {
static const struct resources csid_res_845[] = {
/* CSID0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe0", "vfe0_src",
"vfe0_cphy_rx", "csi0",
......@@ -563,7 +563,7 @@ static const struct resources csid_res_845[] = {
/* CSID1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe1", "vfe1_src",
"vfe1_cphy_rx", "csi1",
......@@ -583,7 +583,7 @@ static const struct resources csid_res_845[] = {
/* CSID2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "cpas_ahb", "cphy_rx_src", "slow_ahb_src",
"soc_ahb", "vfe_lite", "vfe_lite_src",
"vfe_lite_cphy_rx", "csi2",
......@@ -605,7 +605,7 @@ static const struct resources csid_res_845[] = {
static const struct resources vfe_res_845[] = {
/* VFE0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
"soc_ahb", "vfe0", "vfe0_axi",
"vfe0_src", "csi0",
......@@ -625,7 +625,7 @@ static const struct resources vfe_res_845[] = {
/* VFE1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
"soc_ahb", "vfe1", "vfe1_axi",
"vfe1_src", "csi1",
......@@ -645,7 +645,7 @@ static const struct resources vfe_res_845[] = {
/* VFE-lite */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi", "cpas_ahb", "slow_ahb_src",
"soc_ahb", "vfe_lite",
"vfe_lite_src", "csi2",
......@@ -666,7 +666,7 @@ static const struct resources vfe_res_845[] = {
static const struct resources csiphy_res_8250[] = {
/* CSIPHY0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy0", "csiphy0_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -675,7 +675,7 @@ static const struct resources csiphy_res_8250[] = {
},
/* CSIPHY1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy1", "csiphy1_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -684,7 +684,7 @@ static const struct resources csiphy_res_8250[] = {
},
/* CSIPHY2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy2", "csiphy2_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -693,7 +693,7 @@ static const struct resources csiphy_res_8250[] = {
},
/* CSIPHY3 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy3", "csiphy3_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -702,7 +702,7 @@ static const struct resources csiphy_res_8250[] = {
},
/* CSIPHY4 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy4", "csiphy4_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -711,7 +711,7 @@ static const struct resources csiphy_res_8250[] = {
},
/* CSIPHY5 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "csiphy5", "csiphy5_timer" },
.clock_rate = { { 400000000 },
{ 300000000 } },
......@@ -723,7 +723,7 @@ static const struct resources csiphy_res_8250[] = {
static const struct resources csid_res_8250[] = {
/* CSID0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0", "vfe0_areg", "vfe0_ahb" },
.clock_rate = { { 400000000 },
{ 400000000 },
......@@ -735,7 +735,7 @@ static const struct resources csid_res_8250[] = {
},
/* CSID1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1", "vfe1_areg", "vfe1_ahb" },
.clock_rate = { { 400000000 },
{ 400000000 },
......@@ -747,7 +747,7 @@ static const struct resources csid_res_8250[] = {
},
/* CSID2 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" },
.clock_rate = { { 400000000 },
{ 400000000 },
......@@ -758,7 +758,7 @@ static const struct resources csid_res_8250[] = {
},
/* CSID3 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "vfe_lite_ahb" },
.clock_rate = { { 400000000 },
{ 400000000 },
......@@ -772,7 +772,7 @@ static const struct resources csid_res_8250[] = {
static const struct resources vfe_res_8250[] = {
/* VFE0 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi_src", "slow_ahb_src", "cpas_ahb",
"camnoc_axi", "vfe0_ahb", "vfe0_areg", "vfe0",
"vfe0_axi", "cam_hf_axi" },
......@@ -790,7 +790,7 @@ static const struct resources vfe_res_8250[] = {
},
/* VFE1 */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi_src", "slow_ahb_src", "cpas_ahb",
"camnoc_axi", "vfe1_ahb", "vfe1_areg", "vfe1",
"vfe1_axi", "cam_hf_axi" },
......@@ -808,7 +808,7 @@ static const struct resources vfe_res_8250[] = {
},
/* VFE2 (lite) */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi_src", "slow_ahb_src", "cpas_ahb",
"camnoc_axi", "vfe_lite_ahb", "vfe_lite_axi",
"vfe_lite", "cam_hf_axi" },
......@@ -825,7 +825,7 @@ static const struct resources vfe_res_8250[] = {
},
/* VFE3 (lite) */
{
.regulator = { NULL },
.regulators = { NULL },
.clock = { "camnoc_axi_src", "slow_ahb_src", "cpas_ahb",
"camnoc_axi", "vfe_lite_ahb", "vfe_lite_axi",
"vfe_lite", "cam_hf_axi" },
......
drivers/media/platform/qcom/camss/camss.h
View file @ 0d814017
......@@ -42,7 +42,7 @@
#define CAMSS_RES_MAX 17
struct resources {
char *regulator[CAMSS_RES_MAX];
char *regulators[CAMSS_RES_MAX];
char *clock[CAMSS_RES_MAX];
u32 clock_rate[CAMSS_RES_MAX][CAMSS_RES_MAX];
char *reg[CAMSS_RES_MAX];
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7