From patchwork Fri Mar 14 23:35:55 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: 14017599 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 4035F1F2BB8 for ; Fri, 14 Mar 2025 23:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741995363; cv=none; b=dqh5WQ/2QBCJwZzL0+2oPu7zhOUz/YesB677JqwdAhBUhVgz+yAbqUHcX8iC6QFE9eR6Zq7geWAGGs3j1NwbOUd97jI4dLXmcUuWi8oxDPHe2nJLhaTpEuQk0RA7cTfX6I1YCvs5qUef+IeiV/hUFxZxak60Je8pQzWHZ4vIh6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741995363; c=relaxed/simple; bh=zqZuL7y2zz8Z5aLjOZmpn3nFoIVpo+K0JqZU4el81sg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DpkUwEOdegj9aVhuUGXHIc1TFsOfMmR+q3a/9fzGEinyrwB4olqFDHJwL2xO0s08p4g+4CKr6rYMil4ONRfY9n7Of0SeLy9ouJUfNusn5a/8iQDl1EkKJqzXBynEuC//r+X2GlWfmonGlBYYKJ/PzdjVrPl6j2vGHUZqCMrbuPg= 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=Q11i4A+n; arc=none smtp.client-ip=209.85.218.51 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="Q11i4A+n" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-aaeec07b705so414605666b.2 for ; Fri, 14 Mar 2025 16:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741995359; x=1742600159; 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=zh5mSsP+CPUK/p+5IIg657ozBms22Tvquc5MSQ7N3gU=; b=Q11i4A+nxwterXfB7UPlGFlQt3nIEYbrTCIDAtAyDeF3XV6rNaTU+dgQZIA2aTjyg6 8a4n68rRwuZIiu3qwutz0XFw6v4WiNoQZXAnUJfybmkLG4mU6xmBQnoPOYjIkMnt66bn eNVXkx+CHp+YpwLWamUXQ+2+87BeGGkSyyquzHwvGeHPESeHJsYXmeWKjmZ9Y+spZe9L 5Irf4Efsy73KsmRdirJ68HGwZ6NQQhbAvfbllMDMl0RQopgKSV1X8Z5XzW/hNRHzGAOZ SYrlzTBoQKFEDTHxz0iXIzjl1fRE92To1GGotX2obKWY1XYZPKJ+zS16cbFGcX4PchQP dfkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741995359; x=1742600159; 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=zh5mSsP+CPUK/p+5IIg657ozBms22Tvquc5MSQ7N3gU=; b=jS525YQp1HY3v9eitvEQYVFmyDQlblrqPFoJ+M4Q6tev8EUjIzna16UFLZAB7GWoJV EjXDKy+7wLXo0vaomJIVmW3MHJrEkm8gopRPg2r8WZc8ojW2IfXxS2qFpNRsZlvDyNiN A8fvM+O8LAnLbF6UjH4v+tr0etbvIVY3X0aH+Bj4dUZ7jR5luCn7HnF3av3JejvLNJXv ZjMtWKZOi+7bO2S2BTPdUW7XZ7J65HgMgHiAYEveM/qO83WFGSuWMkqimCsNM/me72e0 sJL4YOmaSl9JnpKgA9XoBUaNs0M4i1VcIIiT7vN73Q0eN0o09eUUDXjgIijmzyGCrxh8 CPaA== X-Gm-Message-State: AOJu0Yy9wGHzsPfLieXe/4F/N6PY5eioZAEeLl5MJ4CPrwf26VtaQJHw giZxrtkw6+ZyloDrHH0WeGSLFND43NrVFrxOpt6ih5wp5LCglo8hskL32VU0MFU= X-Gm-Gg: ASbGncv3MybkJBW5f8qPrXt66xNywAAJz4e8HEG1+w4FCiO2Lfr+Ar+HkR9mYN/a/yG RBkLGc/0NLchjLkKJRUI5KL1ZBBOifxLvUM8OAu6hklcScOXO87PGImTUPlIiJ5i6mqfW9u6BvE TXRQ19irJu0UF9nWuY8X8I8nnYQZqJiHJ9zhaZBsQ9hEITgIrvEL7YCZbwY7P3VmknVXNTYnW9b Xi48SlyE7G67y0H/4AdYx6qCWtTFwMnxf85QtaoiQ2MNldozrFgl21vKsFSZOtRlG9s3ovDnC/U M+wr5tQzJj8Meo/WEPDobXhBlG9NI2fZzq1Yy7gG4hpWy9RaXb5ABQXS47BbgI0+y9m4bREjlKL u1/Qmo7gIDVfEKuUffWZHyYPU+jucy09l3T5dD/MXviOdp3Qd/M2Zo5AmgNjdfWmMEvN0 X-Google-Smtp-Source: AGHT+IG6nhastrg8lGmw+aj1tV6koccwxzYEiAixZksntYlUmcCP3TXBqPSKmVTdhJD6wI4rRFOwkQ== X-Received: by 2002:a17:907:72cd:b0:ac2:6837:6248 with SMTP id a640c23a62f3a-ac3301e8dacmr338954166b.30.1741995359435; Fri, 14 Mar 2025 16:35:59 -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-ac3146aeadbsm284246966b.29.2025.03.14.16.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 16:35:59 -0700 (PDT) From: Bryan O'Donoghue Date: Fri, 14 Mar 2025 23:35:55 +0000 Subject: [PATCH v2 2/7] media: qcom: camss: Use the CSIPHY id property to find clock names Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250314-b4-media-comitters-next-25-03-13-x1e80100-camss-driver-v2-2-d163d66fcc0d@linaro.org> References: <20250314-b4-media-comitters-next-25-03-13-x1e80100-camss-driver-v2-0-d163d66fcc0d@linaro.org> In-Reply-To: <20250314-b4-media-comitters-next-25-03-13-x1e80100-camss-driver-v2-0-d163d66fcc0d@linaro.org> To: Robert Foss , Todor Tomov , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Vladimir Zapolskiy X-Mailer: b4 0.14.2 Use the CSIPHY id property to find clock names instead of relying on generating the clock names based on the control-loop index. x1e80100 has CSIPHY0, CSIPHY1, CSIPHY2 and CSIPHY4 so simple index naming won't work whereas and 'id' property allows any ordering and any stepping between the CSIPHY names. Reviewed-by: Vladimir Zapolskiy Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss-csiphy.c | 28 +++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index c053616558a73c4a285a576c671aca47d05290f8..c622efcc92ff3781d7fc3ace0253c2d64c91e847 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -586,7 +586,7 @@ int msm_csiphy_subdev_init(struct camss *camss, { struct device *dev = camss->dev; struct platform_device *pdev = to_platform_device(dev); - int i, j, k; + int i, j; int ret; csiphy->camss = camss; @@ -680,23 +680,21 @@ int msm_csiphy_subdev_init(struct camss *camss, for (j = 0; j < clock->nfreqs; j++) clock->freq[j] = res->clock_rate[i][j]; - for (k = 0; k < camss->res->csiphy_num; k++) { - csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, - "csiphy%d_timer", k); - if (csiphy->rate_set[i]) - break; - - if (camss->res->version == CAMSS_660) { - csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, - "csi%d_phy", k); - if (csiphy->rate_set[i]) - break; - } + csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, + "csiphy%d_timer", + csiphy->id); + if (csiphy->rate_set[i]) + continue; - csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, "csiphy%d", k); + if (camss->res->version == CAMSS_660) { + csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, + "csi%d_phy", + csiphy->id); if (csiphy->rate_set[i]) - break; + continue; } + + csiphy->rate_set[i] = csiphy_match_clock_name(clock->name, "csiphy%d", csiphy->id); } /* CSIPHY supplies */