From patchwork Fri Oct 14 18:04:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 2781 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp314029wrs; Fri, 14 Oct 2022 11:08:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5mGcffh03sOMAVS9su3T87eym2WvJcy6oK5eiLdNU9gTiIERxUMvF3uArACdyagb/EpNeW X-Received: by 2002:a17:907:969e:b0:782:6b92:6b1f with SMTP id hd30-20020a170907969e00b007826b926b1fmr4232909ejc.140.1665770881480; Fri, 14 Oct 2022 11:08:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665770881; cv=none; d=google.com; s=arc-20160816; b=KTK8pZymzrAL0Sk2mRUy0aZoVrFnMhJJEI/fPzZNGPJr8Lqw3u/zluLieEManwnRxO qIWQ2EQ6Uwyku1BWBi5ymzAUyVtEeN78UzQQx4DHqM7sgAcEzBonkNfHrbFq47mgqmMC dWlrPXE2TlPyu5cX+u6jBV/bKcosWxznuEDUwk1BP9rYwGg8Zxws6xhz27riHVCEpc2n 7KipjWLTmpDHXNpVXl/vMyXdbDyEJlRNGWC5aV62sfxWu8FJ7HegAYaaoBkIbG16S+xT AGh2GwLF0AA7x7f8JWZf5Vu8HqSAUn7GrrId2Dr82J6a7pgCuVclDuA6I9Sh+9QsF5IU 11lA== 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=uePB6f3cOQ67QvrNVkkf4TASROMgpAHE8s8QFUOA3u0=; b=0i/SDPMuljyun2n/C0cJbY9mgP0SyfCMGzR+UvKB3RdbMNW9+cEHx3RLB6TOv2R3Pu GqbQCVjcap+9LQULTduEg5GC0FNObKCTQLx3ErX4c4dZtwWyAQ/EKn65VyDC1Rn9Km4S PABHzYtuAaWrw+JFCgdL8BTgZRSEjr1BgVDhHIlsRPKO1Jg8H3RId+9IgHMLzpPU+05h sTs0dTDHrjkWqWm+O+xZuHQmtz0E7Jyt4EuIQ3zf+1lFFPHxFqMTUE0zD9MIvQyNBsws oIL2/mqsTVdsToFK4sGMwTnbfLf5f2+2uRjOSoujSrmrQFhtOqThG9Nuy5OtDIv8zIvR jnAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JU3xGPhd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n16-20020aa7db50000000b0045c956aeb81si2453963edt.253.2022.10.14.11.07.35; Fri, 14 Oct 2022 11:08:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JU3xGPhd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229573AbiJNSEg (ORCPT + 99 others); Fri, 14 Oct 2022 14:04:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbiJNSEc (ORCPT ); Fri, 14 Oct 2022 14:04:32 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C491B1C69E1 for ; Fri, 14 Oct 2022 11:04:30 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id t4so3593573wmj.5 for ; Fri, 14 Oct 2022 11:04:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uePB6f3cOQ67QvrNVkkf4TASROMgpAHE8s8QFUOA3u0=; b=JU3xGPhdpIZfhk2w+xP49BNNZFOrTLNT0007vj6oG9mFtKX2UdIdPhuudxdZCHoX2Z 2OD1MvZhxSlkwXV7Ev+C+gSBjlMsCc2MdGeWSjJzdzxuI1wnJi1AtJKB4Rjx+ylboyoH XK9IaHz1LNek6mzVFiAL433+6mtg0MFy9qH2OPJ+qLwe/TD/xxeQVj5pjFXz2Pn8jCah OwMDsQ2DSwLaklnsPL+opKmmaQoS4vqepPd9pMMVW9Kp5V7QQE4WQqd4yJx6HLQSKcFh +aAAkb4jp+SEnh+1MomG+ky5Sq9MWnALwim5A3fVZMlWHo1q1L+Ulxtv5+LFpimcO2oy mHzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uePB6f3cOQ67QvrNVkkf4TASROMgpAHE8s8QFUOA3u0=; b=2QnYea+/b4H9nLWD2Vz33qfZg4ZCuZEAamLM77c+kXlRbp+5p1B1E2o3zW5hrO/BIM NgN9n7SPQdSAKjm5iR4LWVvqMVSlgoUbvTkzOiGoE6iMQ1y4Vxn7mH7CmBCGXJbXFIdk pa1DYkQCjxPFsXHg/e/4F75NsV6U7DQk3RasOv3KKNsIKTxnt9WN5Dg/LAEmgzKAH+XP Cd5STBnFZ3k90lUy8emJvQOo0odpTB+cx4n4zC4YiHFch24LVMyd6MOTr15w3C01kKbX 9WiQyI+7Qj5IZNl+PLwr+mZWwACUhxZ/Del1HGC9hpXxSyYIsHhQC27qeVENeZJZ7ZNB Xikw== X-Gm-Message-State: ACrzQf3kx7dK22v1U6l91iixu45bmj+ZyKCQaVcODOTKYZAKJd3oAKx9 7uNxSyyiouOqFs5A6eJWuIGIYA== X-Received: by 2002:a05:600c:310b:b0:3b4:c1ce:cd83 with SMTP id g11-20020a05600c310b00b003b4c1cecd83mr11087730wmo.91.1665770668879; Fri, 14 Oct 2022 11:04:28 -0700 (PDT) Received: from planet9.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id g17-20020a05600c001100b003c6bbe910fdsm8950346wmc.9.2022.10.14.11.04.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 11:04:28 -0700 (PDT) From: Bryan O'Donoghue To: sakari.ailus@iki.fi, dave.stevenson@raspberrypi.com, jacopo@jmondi.org, paul.j.murphy@intel.com, daniele.alessandrelli@intel.com, mchehab@kernel.org, linux-media@vger.kernel.org Cc: bryan.odonoghue@linaro.org, Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/3] media: i2c: imx412: Assign v4l2 device subname based on compat string Date: Fri, 14 Oct 2022 19:04:16 +0100 Message-Id: <20221014180417.3683285-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221014180417.3683285-1-bryan.odonoghue@linaro.org> References: <20221014180417.3683285-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746687367577635045?= X-GMAIL-MSGID: =?utf-8?q?1746687367577635045?= imx412 and imx577 return the same chip-id when interrogated via i2c. I've confirmed this myself by Sakari suggested we should add a new compat which should be reflected in the name of the media entity https://patchwork.kernel.org/project/linux-media/patch/20220607134057.2427663-3-bryan.odonoghue@linaro.org/#24894500 Set up the .data parameter of of_device_id to pass a string which we use to set the media entity name. Once done we can add in imx577 as a compatible chips with the media names reflecting the directed compat string. Cc: sakari.ailus@iki.fi Cc: dave.stevenson@raspberrypi.com Cc: jacopo@jmondi.org Cc: "Paul J. Murphy" Cc: Daniele Alessandrelli Cc: Mauro Carvalho Chehab Cc: Rob Herring Cc: Krzysztof Kozlowski Cc: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Bryan O'Donoghue --- drivers/media/i2c/imx412.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index 7f6d29e0e7c4..353304312e1c 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -1172,6 +1172,7 @@ static int imx412_init_controls(struct imx412 *imx412) static int imx412_probe(struct i2c_client *client) { struct imx412 *imx412; + const char *name; int ret; imx412 = devm_kzalloc(&client->dev, sizeof(*imx412), GFP_KERNEL); @@ -1179,6 +1180,9 @@ static int imx412_probe(struct i2c_client *client) return -ENOMEM; imx412->dev = &client->dev; + name = device_get_match_data(&client->dev); + if (!name) + return -ENODEV; /* Initialize subdev */ v4l2_i2c_subdev_init(&imx412->sd, client, &imx412_subdev_ops); @@ -1218,6 +1222,8 @@ static int imx412_probe(struct i2c_client *client) imx412->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; imx412->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; + v4l2_i2c_subdev_set_name(&imx412->sd, client, name, NULL); + /* Initialize source pad */ imx412->pad.flags = MEDIA_PAD_FL_SOURCE; ret = media_entity_pads_init(&imx412->sd.entity, 1, &imx412->pad); @@ -1279,7 +1285,7 @@ static const struct dev_pm_ops imx412_pm_ops = { }; static const struct of_device_id imx412_of_match[] = { - { .compatible = "sony,imx412" }, + { .compatible = "sony,imx412", .data = "imx412" }, { } };