From patchwork Fri Dec 1 18:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Knecht X-Patchwork-Id: 172619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1321308vqy; Fri, 1 Dec 2023 10:14:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGbNP88wcw3UyFCBnTluqqwFaZXRBarokRBaCAjliLBpHY61owLpfOBn7yPWO4SOrTT1yfs X-Received: by 2002:a05:6a20:a114:b0:18b:4c44:d09 with SMTP id q20-20020a056a20a11400b0018b4c440d09mr28970077pzk.0.1701454498685; Fri, 01 Dec 2023 10:14:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701454498; cv=none; d=google.com; s=arc-20160816; b=u1WIwORXNDpndSD9/JNHjZVmYGW0LtVdQ2jIbFJKbkJOiU8iOtuM1nGKqDi57JTIQz 7Bl59YwP8JFEQAOHQtRlVqaqvHv22csZ3QyXqP41HcHMNY7ad8kO2KvBLOTrzgM5/wYg R5lq4U4p2xh0ShXD4NENXn0kK+AqikWf7Uf8WscE2Sei7Wt/vHBTaryYf0Fq5WFKGBUB h4FSenZ38wNRRns+kzFM9pbuka5B8wNCBFxJ1oKHgz89+PYWx/F/aS3G8CG5t1POveoz VvzVQljvOkKbnPfWFkZtHiqv7fUTFRhs7bL/rlGNcmP1CAogIYUT6y1/C+bG710AF75B M3jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=x99Qpf3+LiqB5B7sOrC7M+iFR8C6FnZhWHTfofUL38I=; fh=MLPIpDvSgLSH2RGMkeMywVQ9Tq8l5iBh5cHKbDQAJCA=; b=xUzuQEouomVnL23QBRHwLntIR4PZYAna6PEGRLDyV0GgSHCZjqcirZi5pT2GA7ui8N eCYOYWLNNTYfxG3zagh5YPBuyYs8liKJyMm5zFCVEcSU7PvzLjeqHYBtclygAhpccEPI 7c+tlf0wAr24ylNLjBUci+yyu0iklCTGlO8cdtlqSEgCoIkGnAje7K20ZVu8zeqOoqIf +aafy3ww5oaqAxt28WkVZP08D1GfIGVB5qGebHzL7bviP8/IYlTD5mmTjhJjeO58BaF6 IoJkU/JiFZVKdJ2E3BDVPMQnk38BrRTy0Bthutnf5+b3I/IYQo5EvKCVUqpDFi8iRW5l gdow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=VzgnDh5c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id cd24-20020a056a02079800b005c277f3387asi3876430pgb.18.2023.12.01.10.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 10:14:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=VzgnDh5c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id CCA3085D0CAD; Fri, 1 Dec 2023 10:14:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379117AbjLASOh (ORCPT + 99 others); Fri, 1 Dec 2023 13:14:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229780AbjLASOd (ORCPT ); Fri, 1 Dec 2023 13:14:33 -0500 Received: from mailo.com (msg-1.mailo.com [213.182.54.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3F93115; Fri, 1 Dec 2023 10:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo; t=1701454445; bh=LBso1uZhHt0uj5YhUuRR61vXVMULnFH6NsONGw2NEpk=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding; b=VzgnDh5cI26kRDOulJEMi02YIIyNrzJ3ySeNexSc/p1u7r2U4dwxJ31HIWRuhaFQD ZaQM6REfkb/qpTcOW0/PXM9B/cFAwuKpUX3648ga17RiHjCgDtIsYhdJ+xiL5qEQ43 44RI3fMMA/BAf/vGhC+cmfin6YfC8T4hKmBELb+U= Received: by b221-6.in.mailobj.net [192.168.90.26] with ESMTP via ip-22.mailoo.org [213.182.54.22] Fri, 1 Dec 2023 19:14:05 +0100 (CET) X-EA-Auth: wNN2j8v31ubmgWDts7TwNENjNsL7Af2Gz0y4d8MH0A1gYp9Tuc3v3G/ajOExFuYGjL6GItXot7p09v0A44vJjZemqAufFNdp3DcCh2bFGbs= From: Vincent Knecht To: Tianshu Qiu , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , Yassine Oudjana , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vincent Knecht Subject: [PATCH v2 1/3] media: i2c: ak7375: Prepare for supporting another chip Date: Fri, 1 Dec 2023 19:13:48 +0100 Message-ID: <20231201181350.26454-1-vincent.knecht@mailoo.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 01 Dec 2023 10:14:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784104352356250593 X-GMAIL-MSGID: 1784104352356250593 In view of adding support for at least one other chip, change the driver to move chip-specific properties and values in a common structure. No functional changes. Signed-off-by: Vincent Knecht --- v2: no change --- drivers/media/i2c/ak7375.c | 110 ++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 44 deletions(-) diff --git a/drivers/media/i2c/ak7375.c b/drivers/media/i2c/ak7375.c index 463b51d46320..3a14eff41531 100644 --- a/drivers/media/i2c/ak7375.c +++ b/drivers/media/i2c/ak7375.c @@ -10,30 +10,45 @@ #include #include -#define AK7375_MAX_FOCUS_POS 4095 -/* - * This sets the minimum granularity for the focus positions. - * A value of 1 gives maximum accuracy for a desired focus position - */ -#define AK7375_FOCUS_STEPS 1 -/* - * This acts as the minimum granularity of lens movement. - * Keep this value power of 2, so the control steps can be - * uniformly adjusted for gradual lens movement, with desired - * number of control steps. - */ -#define AK7375_CTRL_STEPS 64 -#define AK7375_CTRL_DELAY_US 1000 -/* - * The vcm may take up 10 ms (tDELAY) to power on and start taking - * I2C messages. Based on AK7371 datasheet. - */ -#define AK7375_POWER_DELAY_US 10000 +struct ak73xx_chipdef { + u8 reg_position; + u8 reg_cont; + u8 shift_pos; + u8 mode_active; + u8 mode_standby; + u16 focus_pos_max; + /* + * This sets the minimum granularity for the focus positions. + * A value of 1 gives maximum accuracy for a desired focus position + */ + u16 focus_steps; + /* + * This acts as the minimum granularity of lens movement. + * Keep this value power of 2, so the control steps can be + * uniformly adjusted for gradual lens movement, with desired + * number of control steps. + */ + u16 ctrl_steps; + u16 ctrl_delay_us; + /* + * The vcm may take time (tDELAY) to power on and start taking + * I2C messages. + */ + u16 power_delay_us; +}; -#define AK7375_REG_POSITION 0x0 -#define AK7375_REG_CONT 0x2 -#define AK7375_MODE_ACTIVE 0x0 -#define AK7375_MODE_STANDBY 0x40 +static const struct ak73xx_chipdef ak7375_cdef = { + .reg_position = 0x0, + .reg_cont = 0x2, + .shift_pos = 4, /* 12 bits position values, need to << 4 */ + .mode_active = 0x0, + .mode_standby = 0x40, + .focus_pos_max = 4095, + .focus_steps = 1, + .ctrl_steps = 64, + .ctrl_delay_us = 1000, + .power_delay_us = 10000, +}; static const char * const ak7375_supply_names[] = { "vdd", @@ -42,6 +57,7 @@ static const char * const ak7375_supply_names[] = { /* ak7375 device structure */ struct ak7375_device { + const struct ak73xx_chipdef *cdef; struct v4l2_ctrl_handler ctrls_vcm; struct v4l2_subdev sd; struct v4l2_ctrl *focus; @@ -86,10 +102,11 @@ static int ak7375_i2c_write(struct ak7375_device *ak7375, static int ak7375_set_ctrl(struct v4l2_ctrl *ctrl) { struct ak7375_device *dev_vcm = to_ak7375_vcm(ctrl); + const struct ak73xx_chipdef *cdef = dev_vcm->cdef; if (ctrl->id == V4L2_CID_FOCUS_ABSOLUTE) - return ak7375_i2c_write(dev_vcm, AK7375_REG_POSITION, - ctrl->val << 4, 2); + return ak7375_i2c_write(dev_vcm, cdef->reg_position, + ctrl->val << cdef->shift_pos, 2); return -EINVAL; } @@ -128,11 +145,12 @@ static int ak7375_init_controls(struct ak7375_device *dev_vcm) { struct v4l2_ctrl_handler *hdl = &dev_vcm->ctrls_vcm; const struct v4l2_ctrl_ops *ops = &ak7375_vcm_ctrl_ops; + const struct ak73xx_chipdef *cdef = dev_vcm->cdef; v4l2_ctrl_handler_init(hdl, 1); dev_vcm->focus = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_ABSOLUTE, - 0, AK7375_MAX_FOCUS_POS, AK7375_FOCUS_STEPS, 0); + 0, cdef->focus_pos_max, cdef->focus_steps, 0); if (hdl->error) dev_err(dev_vcm->sd.dev, "%s fail error: 0x%x\n", @@ -153,6 +171,8 @@ static int ak7375_probe(struct i2c_client *client) if (!ak7375_dev) return -ENOMEM; + ak7375_dev->cdef = device_get_match_data(&client->dev); + for (i = 0; i < ARRAY_SIZE(ak7375_supply_names); i++) ak7375_dev->supplies[i].supply = ak7375_supply_names[i]; @@ -206,30 +226,31 @@ static void ak7375_remove(struct i2c_client *client) /* * This function sets the vcm position, so it consumes least current - * The lens position is gradually moved in units of AK7375_CTRL_STEPS, + * The lens position is gradually moved in units of ctrl_steps, * to make the movements smoothly. */ static int __maybe_unused ak7375_vcm_suspend(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd); + const struct ak73xx_chipdef *cdef = ak7375_dev->cdef; int ret, val; if (!ak7375_dev->active) return 0; - for (val = ak7375_dev->focus->val & ~(AK7375_CTRL_STEPS - 1); - val >= 0; val -= AK7375_CTRL_STEPS) { - ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_POSITION, - val << 4, 2); + for (val = ak7375_dev->focus->val & ~(cdef->ctrl_steps - 1); + val >= 0; val -= cdef->ctrl_steps) { + ret = ak7375_i2c_write(ak7375_dev, cdef->reg_position, + val << cdef->shift_pos, 2); if (ret) dev_err_once(dev, "%s I2C failure: %d\n", __func__, ret); - usleep_range(AK7375_CTRL_DELAY_US, AK7375_CTRL_DELAY_US + 10); + usleep_range(cdef->ctrl_delay_us, cdef->ctrl_delay_us + 10); } - ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_CONT, - AK7375_MODE_STANDBY, 1); + ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont, + cdef->mode_standby, 1); if (ret) dev_err(dev, "%s I2C failure: %d\n", __func__, ret); @@ -246,13 +267,14 @@ static int __maybe_unused ak7375_vcm_suspend(struct device *dev) /* * This function sets the vcm position to the value set by the user * through v4l2_ctrl_ops s_ctrl handler - * The lens position is gradually moved in units of AK7375_CTRL_STEPS, + * The lens position is gradually moved in units of ctrl_steps, * to make the movements smoothly. */ static int __maybe_unused ak7375_vcm_resume(struct device *dev) { struct v4l2_subdev *sd = dev_get_drvdata(dev); struct ak7375_device *ak7375_dev = sd_to_ak7375_vcm(sd); + const struct ak73xx_chipdef *cdef = ak7375_dev->cdef; int ret, val; if (ak7375_dev->active) @@ -264,24 +286,24 @@ static int __maybe_unused ak7375_vcm_resume(struct device *dev) return ret; /* Wait for vcm to become ready */ - usleep_range(AK7375_POWER_DELAY_US, AK7375_POWER_DELAY_US + 500); + usleep_range(cdef->power_delay_us, cdef->power_delay_us + 500); - ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_CONT, - AK7375_MODE_ACTIVE, 1); + ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont, + cdef->mode_active, 1); if (ret) { dev_err(dev, "%s I2C failure: %d\n", __func__, ret); return ret; } - for (val = ak7375_dev->focus->val % AK7375_CTRL_STEPS; + for (val = ak7375_dev->focus->val % cdef->ctrl_steps; val <= ak7375_dev->focus->val; - val += AK7375_CTRL_STEPS) { - ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_POSITION, - val << 4, 2); + val += cdef->ctrl_steps) { + ret = ak7375_i2c_write(ak7375_dev, cdef->reg_position, + val << cdef->shift_pos, 2); if (ret) dev_err_ratelimited(dev, "%s I2C failure: %d\n", __func__, ret); - usleep_range(AK7375_CTRL_DELAY_US, AK7375_CTRL_DELAY_US + 10); + usleep_range(cdef->ctrl_delay_us, cdef->ctrl_delay_us + 10); } ak7375_dev->active = true; @@ -290,7 +312,7 @@ static int __maybe_unused ak7375_vcm_resume(struct device *dev) } static const struct of_device_id ak7375_of_table[] = { - { .compatible = "asahi-kasei,ak7375" }, + { .compatible = "asahi-kasei,ak7375", .data = &ak7375_cdef, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ak7375_of_table); From patchwork Fri Dec 1 18:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Knecht X-Patchwork-Id: 172618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1321294vqy; Fri, 1 Dec 2023 10:14:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IEp+BQdhI4YoVM26uK0/MN95a8KerOyuL9km1EVHyTFazhYtaW+b+CCIsKy/XIlk67yFqva X-Received: by 2002:a05:6a00:2190:b0:6cd:fda4:b57c with SMTP id h16-20020a056a00219000b006cdfda4b57cmr3446378pfi.15.1701454497710; Fri, 01 Dec 2023 10:14:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701454497; cv=none; d=google.com; s=arc-20160816; b=xo5ruDbmEmhQI1U7pOJEOY3RfK7YdK/atJPPAuKmjhG9doPVAEMpGILN5eQywx+KXy YG2J/Y8xHBmiC+18FD/2UkR/JPiEqt2OFLtLpdmPdQduxSGIFYdS94GvEuehq8djscrT 3UCBf/SDo0jjkyESqmYPyCZPn7M82O4Zx4mo6kkTKMHW1X6xvEu+3X4cUw6aJteb6ONc 0CFo5Fn+MGWF/wxcP5nEOYfWSuQBS7J9oZVLiHWG8pNhIDHrFY6HYPZalTSvK+QCiDOr b9tC0R6dftZ/ELJoNwIu392GshiD0JWFGipCDYUbTHvd482i6FspPynBSOZkEiXvPGmk f7lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JQLcH/9MN3VIrMkEpz77JBsyH5l6jUibOAuEFBqkcaE=; fh=9xkpIBT0jeIuEXl/1JOUpAuEW6fhdrypM0QiLHBb1Wc=; b=WSlP8HSpt+N15asFxM89FmVU+cAnCiKGCe1iiYTyBFGQVIDF0N3oRTgxB9l0izlnVk WpKToeQhgKJsYj/NaMegTVbMF/SEk6UayHNXkZApwoimUTYkm0IkH+ui41ghU1amhLJg CAq7MjOQ4lswfdXbye9nOW7zPk+aUoJhVTKm/h7COP74cR8iHOI/Cvh47zFGVrIgV10W DF1Wa9QM6cr9Y5ZzJR9jem679qu4vvANNUYL61yaVrg5u4Hzj5ekqEMGmYJgXblJvU1w Tv7EjL9bSaelpV8NFDbhU8ABQjipUYH6m5TKbhX4GPoAOS3XyrqpPdFVRDiC2jEXpbxm fJBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=YYuY5Df9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id x126-20020a636384000000b005be0a705478si3739629pgb.89.2023.12.01.10.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 10:14:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=YYuY5Df9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id BC1D181A204F; Fri, 1 Dec 2023 10:14:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379085AbjLASOf (ORCPT + 99 others); Fri, 1 Dec 2023 13:14:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjLASOd (ORCPT ); Fri, 1 Dec 2023 13:14:33 -0500 Received: from mailo.com (msg-4.mailo.com [213.182.54.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A33F5F9; Fri, 1 Dec 2023 10:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo; t=1701454445; bh=66Wxc8oBzIfIpIL64ix8lAT/45XRAd7lEKzgQU4F6ns=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=YYuY5Df9ro3GQCMYQnTidpOqX/jxNc+xTKpHlonbxjgDNJIx7OaW5VtF6XW5Adgrd 2bjl8S5T4Ruv7CX0ISfJDVK1h+a8chyZSBl23UCD5TtwU3b0JQOzkWmyM23XyGExNb CqMOuiOl6JzSBTaBpycSlbUG36Wjj8L33xkXrN+M= Received: by b221-6.in.mailobj.net [192.168.90.26] with ESMTP via ip-22.mailoo.org [213.182.54.22] Fri, 1 Dec 2023 19:14:05 +0100 (CET) X-EA-Auth: n5s91a8huocHReaPogKTmuy+cMqxvoEKUxxcrW3YBBVPcZ0xU9Fy/MUNkEjicxBFv3ibysTPbAnbuEIqKIdDfo6iVQY91FjXy9E1pb+sHAQ= From: Vincent Knecht To: Tianshu Qiu , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , Yassine Oudjana , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vincent Knecht , Conor Dooley Subject: [PATCH v2 2/3] media: dt-bindings: ak7375: Add ak7345 support Date: Fri, 1 Dec 2023 19:13:49 +0100 Message-ID: <20231201181350.26454-2-vincent.knecht@mailoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231201181350.26454-1-vincent.knecht@mailoo.org> References: <20231201181350.26454-1-vincent.knecht@mailoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 01 Dec 2023 10:14:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784104351392264818 X-GMAIL-MSGID: 1784104351392264818 Document AK7345 bindings. Compared to AK7375, it has only 9 bits position values (instead of 12), 20 ms power-up delay (instead of 10), and no known standby register setting. Acked-by: Conor Dooley Signed-off-by: Vincent Knecht --- v2 : changed commit message with details about AK7345 vs. AK7375 --- .../devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml b/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml index 22a810fc7222..fe312cc6a873 100644 --- a/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml +++ b/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml @@ -15,7 +15,9 @@ description: properties: compatible: - const: asahi-kasei,ak7375 + enum: + - asahi-kasei,ak7345 + - asahi-kasei,ak7375 reg: maxItems: 1 From patchwork Fri Dec 1 18:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Knecht X-Patchwork-Id: 172617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1321198vqy; Fri, 1 Dec 2023 10:14:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpvPbxyuIn9H61UZNZoNibEr7VoYfdQrzr29X15fw9F7XDn/IW/Hq7JZCvr18bBWsKHomJ X-Received: by 2002:a17:90a:f48c:b0:285:490d:10cd with SMTP id bx12-20020a17090af48c00b00285490d10cdmr40157309pjb.3.1701454488798; Fri, 01 Dec 2023 10:14:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701454488; cv=none; d=google.com; s=arc-20160816; b=jyYdRgyFeB3eIH7QDKD0j66zezU1YzLvA87WQi7cLJlJ0j99FaBqhXS+Hl7f4NR+yv 2AJbuSV+zo9uubbvVNg3B1qXWcJ+jzJUntvWDtW1KnmBC8IYyzdnpz4iCfBepND4RbtV si1VzMOBVJTrHGh9zYUYSlZ40a7/eKC4i/XKVvOg4wgsLIDqRGbJEaSiiGq7DuvNzs4U 3/pSBGcCKTC79hEIYgCv6SGSYhBDDMpJIGOaHrrmso7aGvUYio2rXjYFeDHKYs8PyN/I SyZPxyneMFn3vkVTm+Gtd6gnT4+iuIoR2lf/MnBTzUMoErTsIiNZ7HpD+05XOfuTF5n4 33Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uAkKAESQs5jnE70rUQhjNeaKmjUqRWEj8dpJUKQErKE=; fh=MLPIpDvSgLSH2RGMkeMywVQ9Tq8l5iBh5cHKbDQAJCA=; b=JKmkD1woIL7zqsK7eLJEsMhdzaC3zqdZwIHiX1CHlYuI/04TKtOiHhI83YnZoHabPk yhjnl1VXF3gMlm/BrzE7YY/eEo9x7GRp2ysjdbsxJX+1L5aRdlBoJTTibhZBIx7OamIn ileQuMF4ETDTsEej9IjLjPssnDA6FQvL5nMF6dp8p2lj+POPywyZlzk5r8RcXOBglCsg RJDe805pjIv5IGZJSziHRkxc/eiHAaq0M+VE420DxsYET1DY3XvI6gqxEJCvA2VXvkaK S7DLW/d+5NZ/cCLqTw02qNhTcVu9Qnhm2KSrjbrgI9q3ns2pnIxVj/hmgHRyE1R0mpQS DMmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=BlRJe1Xo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id ot13-20020a17090b3b4d00b002839e1cb23csi6467323pjb.117.2023.12.01.10.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 10:14:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=fail header.i=@mailoo.org header.s=mailo header.b=BlRJe1Xo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailoo.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id DDFBC8116E75; Fri, 1 Dec 2023 10:14:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230249AbjLASOe (ORCPT + 99 others); Fri, 1 Dec 2023 13:14:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjLASOd (ORCPT ); Fri, 1 Dec 2023 13:14:33 -0500 Received: from mailo.com (msg-2.mailo.com [213.182.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3F3A10D; Fri, 1 Dec 2023 10:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailoo.org; s=mailo; t=1701454446; bh=8ItrQJpfnYJNBvx9/ZxfYVCB4X1PSHGmZpReeVMVCbM=; h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=BlRJe1XoLRRfLfBlqX9FKJXDcczc9GjGwiHexrrf2wJDGyH4QwQYFcMP2gml325Ew x7N8QzhHSsMKY7CiqKsYPa6vBzklsiX/NIoj3ILcNFVOLU8i9gQdnDCOwfhj/oiF8Q B3zFDEDOCYN62u80TcrXeY4f3rb7yGbgSSfNzuis= Received: by b221-6.in.mailobj.net [192.168.90.26] with ESMTP via ip-22.mailoo.org [213.182.54.22] Fri, 1 Dec 2023 19:14:05 +0100 (CET) X-EA-Auth: ym1ciIqVgZ9eNjymoAMtLEFtuPM6bDp74qWVWVEHmy5LVtFvlqvwNHZnHGLyOdmKhJr18Ui7S9JftJCkKqCam+ZcJB/sbMs1XtBetbwXJJ0= From: Vincent Knecht To: Tianshu Qiu , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , Yassine Oudjana , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vincent Knecht Subject: [PATCH v2 3/3] media: i2c: ak7375: Add support for ak7345 Date: Fri, 1 Dec 2023 19:13:50 +0100 Message-ID: <20231201181350.26454-3-vincent.knecht@mailoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231201181350.26454-1-vincent.knecht@mailoo.org> References: <20231201181350.26454-1-vincent.knecht@mailoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 01 Dec 2023 10:14:44 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784104342200580480 X-GMAIL-MSGID: 1784104342200580480 Add support for ak7345 VCM, which has 9 bits position values, longer power-up delay, and no known standby register setting. Might be compatible as-is with ak7348. Tested on msm8916-alcatel-idol347 phone. Signed-off-by: Vincent Knecht --- v2: no change --- drivers/media/i2c/ak7375.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ak7375.c b/drivers/media/i2c/ak7375.c index 3a14eff41531..9a2432cea3ff 100644 --- a/drivers/media/i2c/ak7375.c +++ b/drivers/media/i2c/ak7375.c @@ -16,6 +16,7 @@ struct ak73xx_chipdef { u8 shift_pos; u8 mode_active; u8 mode_standby; + bool has_standby; /* Some chips may not have standby mode */ u16 focus_pos_max; /* * This sets the minimum granularity for the focus positions. @@ -37,12 +38,26 @@ struct ak73xx_chipdef { u16 power_delay_us; }; +static const struct ak73xx_chipdef ak7345_cdef = { + .reg_position = 0x0, + .reg_cont = 0x2, + .shift_pos = 7, /* 9 bits position values, need to << 7 */ + .mode_active = 0x0, + .has_standby = false, + .focus_pos_max = 511, + .focus_steps = 1, + .ctrl_steps = 16, + .ctrl_delay_us = 1000, + .power_delay_us = 20000, +}; + static const struct ak73xx_chipdef ak7375_cdef = { .reg_position = 0x0, .reg_cont = 0x2, .shift_pos = 4, /* 12 bits position values, need to << 4 */ .mode_active = 0x0, .mode_standby = 0x40, + .has_standby = true, .focus_pos_max = 4095, .focus_steps = 1, .ctrl_steps = 64, @@ -249,10 +264,12 @@ static int __maybe_unused ak7375_vcm_suspend(struct device *dev) usleep_range(cdef->ctrl_delay_us, cdef->ctrl_delay_us + 10); } - ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont, - cdef->mode_standby, 1); - if (ret) - dev_err(dev, "%s I2C failure: %d\n", __func__, ret); + if (cdef->has_standby) { + ret = ak7375_i2c_write(ak7375_dev, cdef->reg_cont, + cdef->mode_standby, 1); + if (ret) + dev_err(dev, "%s I2C failure: %d\n", __func__, ret); + } ret = regulator_bulk_disable(ARRAY_SIZE(ak7375_supply_names), ak7375_dev->supplies); @@ -312,6 +329,7 @@ static int __maybe_unused ak7375_vcm_resume(struct device *dev) } static const struct of_device_id ak7375_of_table[] = { + { .compatible = "asahi-kasei,ak7345", .data = &ak7345_cdef, }, { .compatible = "asahi-kasei,ak7375", .data = &ak7375_cdef, }, { /* sentinel */ } };