From patchwork Mon Mar 17 00:39:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 14018563 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2B85D517 for ; Mon, 17 Mar 2025 00:39:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742171990; cv=none; b=Gcj2Qn4GJqFdm8N5j2J13ceZes04WQhhmYG+6yOvb1EXC9GRwNMg7Icvyn8Cvx90m6EHC8XhSnVjr5Ittxyi+uhWMoNe3OMMrBUYFoZ3/a53eekmkroRoHaVEVV+QRRkLkEMV4/BG58bd8/TtC+5s4AGKNxWmkv01wllO8a6hFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742171990; c=relaxed/simple; bh=R9gQe3qP710QBxP5kvOsE7wmBexZNkhKVtIyauDUWSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R0pSrZyctOf2LfwXek1WPMAU8djDyQXLj1P/1u0f6+WSLNpsVoYiosTGEwNPp4U4o0bDXEq4KFy/8ou1tWTwA+vdflzj+WIpGSNSoUVA34fYgS/TXh5dqrTYGWWRg8519J4bR3X/2UoKUpveLfKbUfYcxyeGap4rIngNMNk7J2w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=SEPwx1IQ; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SEPwx1IQ" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5e8be1c6ff8so3316979a12.1 for ; Sun, 16 Mar 2025 17:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742171987; x=1742776787; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Fa0+XG41AnTpCxI6rUtKEupAlgua8QfZ9lbTB2DppLg=; b=SEPwx1IQrSNh92hFzyoF5ugg/rFJjO5/LcvTcvLrdNeJ+C8jktKA3qESRRmhIiTaOS KkmtSfIM1FXE9tZvnk3dv+JtZ7II5acrZfS86f4rQaIj3YPGyZFIHbvF0IhWzJ3LIzsj TbdAHmcEQxT4EWb3jl5xEDEuKQTh3N1J18JVXcYEqniI35X9ftpMKOmWJa3X9gbOefQd 4BGq6+aYpbxjvKzN5bejZ+b00+cT4AFWImikmpimD341JsXmALAK8Uj7G6a3tcmjRMIL sieH3k4rFNIyq4aLaaoTRgVFm8c+hpUSpg+gH+qZLVN39L6D39rvmwf40h1jv4/vWGb6 btWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742171987; x=1742776787; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fa0+XG41AnTpCxI6rUtKEupAlgua8QfZ9lbTB2DppLg=; b=EeG4O2/kvU1KlzEk+Ha1Qd6EDzkHdCALrZuxwTwxzjEkfi56Y6f5brqMBdYoP/AUMy gpADcpi5S8abveZarKgXQXW2T3KYCbhdhr5eGYjp+WvSnkyvITKhA0GYOz+DnlQi8KwC YFv6FJ+hKm6M49c+ySNvwSu9N1Ueg6ZJqWt5CDRnbT91nRtnyhjmEhx7GsglHGqNpldg fnzsyEY0Lguf+Aq7iN+bqh270muRptX8x3ZFP9ocdhQPvuGqAlfIF+FHmbUBvnT+ln/A 5WTdV+m31eoS9js71iTYi/4ab7hgVYkwDtdvVzetUNPnOteRnMeEjVSYY62d/+ZfMbC3 hFNg== X-Forwarded-Encrypted: i=1; AJvYcCVXKTpIV53WPwgQO3qLfPSLafnkjLnIHJDonGB2viclWBQKtg+6K9v4kU+IOJ5UqJkUKaWNKfSq6FCo9Q==@vger.kernel.org X-Gm-Message-State: AOJu0Yyi42dBfxb75Kt43wfIHQHTm8A64D5s56yOCR0uLsFBv3N47Gd0 zXLXKbFn8QdON4FeNqnXE5uOX4daamDg/21V7fbT7tK0Wk/1M8WfxpVfDWXgifk= X-Gm-Gg: ASbGncvRTHFWyDsl+dMImJ/tPHvsryXhCzqnZOgnMHB4Tje9S4KaOFdfd58Z+qphe/F XnoDqxTVBLUSY7k6b6zsLm0fRMIof1GdYjaX7rDkm0kE1FBj2rJsmNBelAvwut3trDEL2eTapvI cK4dLe5/02slOcXFFH2JWSLmq+3iP9Jv4GdxBDdu7t+ayH1EyV56OIv7XrkKZCUqhPnWPrmGhfu kCkUPmI+9gUvJiChzpUW7679dM1CYPfjObAUUQrBTIIFthOCd5R+79p33gyAvz3ZHIMUz3m4rsq MQASusG+MD8teLjf7DvWn45bqfcO3XbA5ZWrTnE3NiOzDVKMb+2Yrt2qqnh41EaSBCSmlpRakzY 8kcqfnBYsqLalUHrXWH84hGAN5MLdZXahiKMkdS+KIBlimuVUiPvvtlNhY5IGs+x33bju X-Google-Smtp-Source: AGHT+IFGB/6ELCetEqsulbq9XYDj362qmt+yhgOiXelWC2RLXXmy8I2ZSYJBdVHdEvtB3cFlQPysAQ== X-Received: by 2002:a17:907:6ea9:b0:abf:52e1:2615 with SMTP id a640c23a62f3a-ac3301db85emr1179198966b.7.1742171987230; Sun, 16 Mar 2025 17:39:47 -0700 (PDT) Received: from [192.168.178.107] (2001-1c06-2302-5600-7555-cca3-bbc4-648b.cable.dynamic.v6.ziggo.nl. [2001:1c06:2302:5600:7555:cca3:bbc4:648b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3146aefadsm562407166b.8.2025.03.16.17.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Mar 2025 17:39:46 -0700 (PDT) From: Bryan O'Donoghue Date: Mon, 17 Mar 2025 00:39:37 +0000 Subject: [PATCH 5/8] media: i2c: ov02e10: Rework MCLK clock get logic to facilitate OF Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250317-b4-media-comitters-next-25-03-13-ov02e10-v1-5-bd924634b889@linaro.org> References: <20250317-b4-media-comitters-next-25-03-13-ov02e10-v1-0-bd924634b889@linaro.org> In-Reply-To: <20250317-b4-media-comitters-next-25-03-13-ov02e10-v1-0-bd924634b889@linaro.org> To: Mauro Carvalho Chehab , Sakari Ailus , Liam Girdwood , Mark Brown Cc: Jingjing Xiong , Hao Yao , Jim Lai , You-Sheng Yang , Alan Stern , Hans de Goede , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.14.2 Move the MCLK validation logic to check_hwcfg() and move check_hwcfg() to after devm_kzalloc() so that we can pass a struct ov02e pointer to check_hwcfg() to begin to enumerate that structure. Signed-off-by: Bryan O'Donoghue --- drivers/media/i2c/ov02e10.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/ov02e10.c b/drivers/media/i2c/ov02e10.c index 0a016cb23cbe98d8af371c6a35db2f1d8c699d68..9ad70671a718ea0aaf80ad3adcc5738ee57a7ff6 100644 --- a/drivers/media/i2c/ov02e10.c +++ b/drivers/media/i2c/ov02e10.c @@ -538,11 +538,6 @@ static int ov02e10_get_pm_resources(struct device *dev) return dev_err_probe(dev, PTR_ERR(ov02e10->reset), "failed to get reset gpio\n"); - ov02e10->img_clk = devm_clk_get_optional(dev, NULL); - if (IS_ERR(ov02e10->img_clk)) - return dev_err_probe(dev, PTR_ERR(ov02e10->img_clk), - "failed to get imaging clock\n"); - for (i = 0; i < ARRAY_SIZE(ov02e10_supply_names); i++) ov02e10->supplies[i].supply = ov02e10_supply_names[i]; @@ -774,7 +769,7 @@ static int ov02e10_identify_module(struct ov02e10 *ov02e10) return 0; } -static int ov02e10_check_hwcfg(struct device *dev) +static int ov02e10_check_hwcfg(struct device *dev, struct ov02e10 *ov02e10) { struct v4l2_fwnode_endpoint bus_cfg = { .bus_type = V4L2_MBUS_CSI2_DPHY @@ -795,10 +790,28 @@ static int ov02e10_check_hwcfg(struct device *dev) if (ret) return dev_err_probe(dev, ret, "parsing endpoint failed\n"); - ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency", - &ext_clk); - if (ret) { - dev_err(dev, "can't get clock frequency\n"); + ov02e10->img_clk = devm_clk_get_optional(dev, NULL); + if (IS_ERR(ov02e10->img_clk)) { + ret = dev_err_probe(dev, PTR_ERR(ov02e10->img_clk), + "failed to get imaging clock\n"); + goto out_err; + } + + if (ov02e10->img_clk) { + ext_clk = clk_get_rate(ov02e10->img_clk); + } else { + ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency", + &ext_clk); + if (ret) { + dev_err(dev, "can't get clock frequency\n"); + goto out_err; + } + } + + if (ext_clk != OV02E10_MCLK) { + dev_err(dev, "external clock %d is not supported\n", + ext_clk); + ret = -EINVAL; goto out_err; } @@ -853,15 +866,15 @@ static int ov02e10_probe(struct i2c_client *client) struct ov02e10 *ov02e; int ret; - /* Check HW config */ - ret = ov02e10_check_hwcfg(&client->dev); - if (ret) - return ret; - ov02e = devm_kzalloc(&client->dev, sizeof(*ov02e), GFP_KERNEL); if (!ov02e) return -ENOMEM; + /* Check HW config */ + ret = ov02e10_check_hwcfg(&client->dev, ov02e); + if (ret) + return ret; + /* Initialize subdev */ ov02e->regmap = devm_cci_regmap_init_i2c(client, 8); if (IS_ERR(ov02e->regmap))