From: Svyatoslav Ryhel <clamor95@gmail.com> To: Mauro Carvalho Chehab <mchehab@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Svyatoslav Ryhel <clamor95@gmail.com>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Luca Ceresoli <luca.ceresoli@bootlin.com>, Jean Delvare <jdelvare@suse.de>, Sebastian Reichel <sebastian.reichel@collabora.com>, Daniel Jeong <gshark.jeong@gmail.com>, Ldd-Mlp <ldd-mlp@list.ti.com> Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] media: lm3560: convent to OF Date: Wed, 8 Mar 2023 11:52:09 +0200 [thread overview] Message-ID: <20230308095209.14700-3-clamor95@gmail.com> (raw) In-Reply-To: <20230308095209.14700-1-clamor95@gmail.com> If no pdata is available, try to read from device tree. Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com> --- drivers/media/i2c/lm3560.c | 128 +++++++++++++++++++++++++++---------- 1 file changed, 93 insertions(+), 35 deletions(-) diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c index 5ef613604be7..5541051616b7 100644 --- a/drivers/media/i2c/lm3560.c +++ b/drivers/media/i2c/lm3560.c @@ -11,6 +11,7 @@ #include <linux/delay.h> #include <linux/module.h> +#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/slab.h> #include <linux/mutex.h> @@ -22,16 +23,16 @@ /* registers definitions */ #define REG_ENABLE 0x10 -#define REG_TORCH_BR 0xa0 -#define REG_FLASH_BR 0xb0 -#define REG_FLASH_TOUT 0xc0 +#define REG_TORCH_BR 0xa0 +#define REG_FLASH_BR 0xb0 +#define REG_FLASH_TOUT 0xc0 #define REG_FLAG 0xd0 #define REG_CONFIG1 0xe0 /* fault mask */ -#define FAULT_TIMEOUT (1<<0) -#define FAULT_OVERTEMP (1<<1) -#define FAULT_SHORT_CIRCUIT (1<<2) +#define FAULT_TIMEOUT BIT(0) +#define FAULT_OVERTEMP BIT(1) +#define FAULT_SHORT_CIRCUIT BIT(2) enum led_enable { MODE_SHDN = 0x0, @@ -54,6 +55,7 @@ struct lm3560_flash { struct device *dev; struct lm3560_platform_data *pdata; struct regmap *regmap; + struct gpio_desc *hwen_gpio; struct mutex lock; enum v4l2_flash_led_mode led_mode; @@ -356,12 +358,19 @@ static int lm3560_subdev_init(struct lm3560_flash *flash, flash->subdev_led[led_no].flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; strscpy(flash->subdev_led[led_no].name, led_name, sizeof(flash->subdev_led[led_no].name)); + rval = lm3560_init_controls(flash, led_no); - if (rval) + if (rval) { + dev_err(flash->dev, "failed to init controls: %d\n", rval); goto err_out; + } + rval = media_entity_pads_init(&flash->subdev_led[led_no].entity, 0, NULL); - if (rval < 0) + if (rval < 0) { + dev_err(flash->dev, "failed to init media entity pads: %d\n", rval); goto err_out; + } + flash->subdev_led[led_no].entity.function = MEDIA_ENT_F_FLASH; return rval; @@ -391,6 +400,49 @@ static int lm3560_init_device(struct lm3560_flash *flash) return rval; } +static int lm3560_of_probe(struct lm3560_flash *flash) +{ + struct lm3560_platform_data *pdata; + struct fwnode_handle *node; + int ret, reg; + + pdata = devm_kzalloc(flash->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENODEV; + + ret = device_property_read_u32(flash->dev, + "ti,peak-current", &pdata->peak); + if (ret) + pdata->peak = LM3560_PEAK_3600mA; + + ret = device_property_read_u32(flash->dev, + "ti,max-flash-timeout", + &pdata->max_flash_timeout); + if (ret) + pdata->max_flash_timeout = LM3560_FLASH_TOUT_MAX; + + device_for_each_child_node(flash->dev, node) { + fwnode_property_read_u32(node, "reg", ®); + + if (reg == LM3560_LED0 || reg == LM3560_LED1) { + ret = device_property_read_u32(flash->dev, + "ti,max-flash-current", + &pdata->max_flash_brt[reg]); + if (ret) + pdata->max_flash_brt[reg] = LM3560_FLASH_TOUT_MAX; + + ret = device_property_read_u32(flash->dev, + "ti,max-torch-current", + &pdata->max_torch_brt[reg]); + if (ret) + pdata->max_torch_brt[reg] = LM3560_TORCH_BRT_MAX; + } + } + flash->pdata = pdata; + + return 0; +} + static int lm3560_probe(struct i2c_client *client) { struct lm3560_flash *flash; @@ -398,44 +450,41 @@ static int lm3560_probe(struct i2c_client *client) int rval; flash = devm_kzalloc(&client->dev, sizeof(*flash), GFP_KERNEL); - if (flash == NULL) + if (!flash) return -ENOMEM; flash->regmap = devm_regmap_init_i2c(client, &lm3560_regmap); - if (IS_ERR(flash->regmap)) { - rval = PTR_ERR(flash->regmap); - return rval; - } + if (IS_ERR(flash->regmap)) + return dev_err_probe(&client->dev, PTR_ERR(flash->regmap), + "failed to init regmap\n"); - /* if there is no platform data, use chip default value */ - if (pdata == NULL) { - pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); - if (pdata == NULL) - return -ENODEV; - pdata->peak = LM3560_PEAK_3600mA; - pdata->max_flash_timeout = LM3560_FLASH_TOUT_MAX; - /* led 1 */ - pdata->max_flash_brt[LM3560_LED0] = LM3560_FLASH_BRT_MAX; - pdata->max_torch_brt[LM3560_LED0] = LM3560_TORCH_BRT_MAX; - /* led 2 */ - pdata->max_flash_brt[LM3560_LED1] = LM3560_FLASH_BRT_MAX; - pdata->max_torch_brt[LM3560_LED1] = LM3560_TORCH_BRT_MAX; - } - flash->pdata = pdata; flash->dev = &client->dev; mutex_init(&flash->lock); + /* if there is no platform data, try to read from device tree */ + if (!pdata) + lm3560_of_probe(flash); + + flash->hwen_gpio = devm_gpiod_get_optional(flash->dev, "enable", + GPIOD_OUT_HIGH); + if (IS_ERR(flash->hwen_gpio)) + return dev_err_probe(&client->dev, PTR_ERR(flash->hwen_gpio), + "failed to get hwen gpio\n"); + rval = lm3560_subdev_init(flash, LM3560_LED0, "lm3560-led0"); if (rval < 0) - return rval; + return dev_err_probe(&client->dev, rval, + "failed to init led0 subdev\n"); rval = lm3560_subdev_init(flash, LM3560_LED1, "lm3560-led1"); if (rval < 0) - return rval; + return dev_err_probe(&client->dev, rval, + "failed to init led1 subdev\n"); rval = lm3560_init_device(flash); if (rval < 0) - return rval; + return dev_err_probe(&client->dev, rval, + "failed to init device\n"); i2c_set_clientdata(client, flash); @@ -452,21 +501,30 @@ static void lm3560_remove(struct i2c_client *client) v4l2_ctrl_handler_free(&flash->ctrls_led[i]); media_entity_cleanup(&flash->subdev_led[i].entity); } + + gpiod_set_value_cansleep(flash->hwen_gpio, 0); } +static const struct of_device_id lm3560_match[] = { + { .compatible = "ti,lm3559" }, + { .compatible = "ti,lm3560" }, + { } +}; +MODULE_DEVICE_TABLE(of, lm3560_match); + static const struct i2c_device_id lm3560_id_table[] = { {LM3559_NAME, 0}, {LM3560_NAME, 0}, {} }; - MODULE_DEVICE_TABLE(i2c, lm3560_id_table); static struct i2c_driver lm3560_i2c_driver = { .driver = { - .name = LM3560_NAME, - .pm = NULL, - }, + .name = LM3560_NAME, + .pm = NULL, + .of_match_table = lm3560_match, + }, .probe_new = lm3560_probe, .remove = lm3560_remove, .id_table = lm3560_id_table, -- 2.37.2
prev parent reply other threads:[~2023-03-08 9:52 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-08 9:52 [PATCH v1 0/2] Add OF support for LM3560 Svyatoslav Ryhel 2023-03-08 9:52 ` [PATCH v1 1/2] dt-bindings: media: i2c: add lm3560 binding Svyatoslav Ryhel 2023-03-08 14:06 ` Rob Herring 2023-03-08 18:21 ` Rob Herring 2023-03-08 9:52 ` Svyatoslav Ryhel [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230308095209.14700-3-clamor95@gmail.com \ --to=clamor95@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=gshark.jeong@gmail.com \ --cc=hverkuil-cisco@xs4all.nl \ --cc=jdelvare@suse.de \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=ldd-mlp@list.ti.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=luca.ceresoli@bootlin.com \ --cc=mchehab@kernel.org \ --cc=robh+dt@kernel.org \ --cc=sebastian.reichel@collabora.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).
Read more here: Source link