From patchwork Fri Apr 25 15:17:33 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: 884570 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.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 A7F4327B4E6 for ; Fri, 25 Apr 2025 15:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745594261; cv=none; b=n46pvMlvr+/vMr4jK2jNOLwEbb553/jQo//dAh6kztclddltvipQGCZlMya6IGvrLofVdfkQtjv8B62gL62NgI4NpoDu9Fbgek0mgA+/PngX7TCUNxoZPqRNfbnUfFI5WP3meu3C3JUHCt2LSpZxmSnuo8dxDy5ZZ24akQ4TCLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745594261; c=relaxed/simple; bh=wcxEeIG/nILR9pbCjMso9yZS3cwzR9yIu9oGH3Xl5mg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HcI8/d3GnCopyfMSKAyBlxPz2ZudDLPOump1GDx3LMlO+SzTtbiXGQZnyUpMcHv5MVT63LWO1d0JgYDtCwNCstQzZa2AQaBu0xZl99loVSieSq6RDsvlqX02TJPysXDehz6EyStZ5fadS1DREzAEuvKNwmaM+3XnbM3ag+zjP9U= 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=JiLx/ck1; arc=none smtp.client-ip=209.85.221.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="JiLx/ck1" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso2576932f8f.0 for ; Fri, 25 Apr 2025 08:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745594257; x=1746199057; 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=HAQCWAaBVBZ9L8/5seSjJb98H17XEO01YnL9fUDtsAc=; b=JiLx/ck1tzAEVxJoK4ZtSFAfYXBk0AyE0gKqyyJvTf76OIlJEFql8wbd5+KG5qlgpd Zr6BBgsfTvzfwfg50feK2EsxWNxKORoNbPhoTW37yIhn5zxsIUQTZQDo5okQxmf/MSLg RRssJ0lVbKYofiWTjJxSdjQF1inY2MNk9ybFRl5DE/XVMaBgkHMkpcreD+hBb+6IWH+4 jAnwNqRkd6hIZsxbCnOYPlplq6f4aSfXOUFBY6wL0tQCW5aHpp2m81hhptdKV8eH38gj NLqV/Ce1Yaf1NWDpCJMJ0V94bB0a4G/uPpC9zPK/qb4CPcZROK40r+V5HFIv9LyJIpPZ 0T5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745594257; x=1746199057; 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=HAQCWAaBVBZ9L8/5seSjJb98H17XEO01YnL9fUDtsAc=; b=vegwd5kjvfkJtv8E5pyljDCzIVz+NI48daua0oI2ilu256cRizrDOB9gl8oes+pTlc 7qu40JNDAY3I4WsCQ1+deMKeb/9YTb3EoFrD/mZMN1u6Di6dpwYTgzGo6lDTwD7yMY9w GXrLKX4ovzy81tAgfh5A81hz+lmYq8y1vzAfRj9STlVDUW0V4XRJWLyeWVCPXTNqOLFu EwuKxOuLWeR1aCe3lHtG4SgT6fBk9xUfxpQHaLEsKwpN0S97ju9/ZicFTmh+Yj6AP/55 u03xBJtB90xUbHrT5FMWZ2klqH9REz14negT1ugExgOk5PcKOzvI4MDnz2ZJbDCBYTDT tKBw== X-Forwarded-Encrypted: i=1; AJvYcCVvzks26Vtpo1ADE23/XOrUyWADz03qiDJsf82i+x+Z86+ZZECwvbRkkSJ5yvUGMAVR/vBaSuGW4of//uip@vger.kernel.org X-Gm-Message-State: AOJu0YwDw1MaP5QH9eRCH2yTvs+GNC5Zp+R0uWrt+BIhutMvIVAVYPfl UmF6PekP3FYZ6cScJ4BCuo7kWloMW/Z/YUexPQcdNAYvoFz2DaUAz/2tLBQMyr8= X-Gm-Gg: ASbGncuBrpPzeyshgutbJf62WfIfTbmIvuB1GAjJFFWt2tsJrJbR+0rdBLgpp9HPVtu lVAY7m8GoJnWz1ihnSSnFf3D+hkqlUc3lt4kdBlNCUW79oLZUmGliKuxZRelyilAVQEFpAPGNVB qSegvnBFLLyhZtv3etm0skqateLd18qb1hOspGRpCTCPEygz53cfJjjkkDdFkAG9+xKmNQ6poIY dZs/dXKsyZy1fmZ9PXblqTqjVPRAXWN4ee2z9VOG/uvneZJV4lVkEYMzBeJ6mfCL7bCBWJ2RHtJ D9Zed6Eu8yjZiQm93TavN8LdKAt57izJ7TE6zGQZwm0KsdaQEpmo8jPhetpeSjPfQLsvV0D1phi t1rdJYw== X-Google-Smtp-Source: AGHT+IHPnUJZKu1uWSc7Yc7UKfpd8ifRHajKhLkpvor4eEcE4Bfo34C+hxP3Ocv6ugZpsKzWHcoOtQ== X-Received: by 2002:a05:6000:1ac5:b0:390:f0ff:2c11 with SMTP id ffacd0b85a97d-3a074e146c6mr2005656f8f.2.1745594256896; Fri, 25 Apr 2025 08:17:36 -0700 (PDT) Received: from [192.168.0.34] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ccf44csm2684738f8f.60.2025.04.25.08.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 08:17:36 -0700 (PDT) From: Bryan O'Donoghue Date: Fri, 25 Apr 2025 16:17:33 +0100 Subject: [PATCH v2 1/2] dt-bindings: media: qcom,x1e80100-camss: Fixup csiphy supply names Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-1-8c12450b2934@linaro.org> References: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-0-8c12450b2934@linaro.org> In-Reply-To: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-0-8c12450b2934@linaro.org> To: Robert Foss , Todor Tomov , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: dmitry.baryshkov@oss.qualcomm.com, loic.poulain@oss.qualcomm.com, vladimir.zapolskiy@linaro.org, krzk@kernel.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3102; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=wcxEeIG/nILR9pbCjMso9yZS3cwzR9yIu9oGH3Xl5mg=; b=owEBbQKS/ZANAwAIASJxO7Ohjcg6AcsmYgBoC6eOVgILuVdiW/rdoXVAPa8Hid0qCNNOb4rf+ 1EI7p1ll32JAjMEAAEIAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaAunjgAKCRAicTuzoY3I OinCEAC22rg67uCiMIQHrV8hUxpc7DcmXiQNrFo637kHhmvfllAYEYnf6g+OuEWiSOWMOUB/PQs SvJQKuzX950QQPkQOPOOCiA1QZvUnSz94suaiV5ZvSK7vI2/1GV54Zm+7fjDo6f2vnnCUrutuD2 Fnhj+/aDuV8k8cZ26YTzOgziLzt9FuS848s5mGJbO+rG0LsMHtJIYg+ylY8eVeplVSBetUiVNC0 y/ywjwMZSvGTRci2S9FqXpP7WlRJX92Agbun0OsEsQ+y3gJmIdK2QaLXcG1S/4hGRiyuUhOgMtj aEsBWtHqY61PN6BXlBM3aNgZcRvYs3kjcvefNj6YOaV58u6MUdRZIyXR9VgY+sK6UzIv5r4qACc SKAVcUEP2pA2TsT7pi/cj2tZ8iyyyZmtbKP8cMCQ4Nm8+ve6fgRgrMO20rRLdrYDmR9HC0L2VTF Hy20I9ahNKbD5UysFuRkfOWju6VwJwPzgxe28tVuZyGVOzCMOd5tFbQHiR94no1paJT4vqWX8fE XCmGrrpNhudwRWtLtTrhCRm2Qomc9zu0Ndmx6adeamn8UDisPE0hTerHhTxeSx2S5PyCnmcNdVe bLt87HwR5yYDYpclg/yZOXAE/rky4Ff+DYbxLcMacOQkAJeLEv8UHlXvU2DwmikwLKC4g4xd0Nm Oe1u2wN9R8wy+/Q== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A Declare a CSIPHY regulator pair 0p8 and 1p2 for each CSIPHY. Name the inputs based on the voltage so as to have a consistent naming of these rails across SoCs and PCBs. There are no upstream users of this yaml definition yet so this change is safe to make. Signed-off-by: Bryan O'Donoghue --- .../bindings/media/qcom,x1e80100-camss.yaml | 52 +++++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml b/Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml index 113565cf2a991a8dcbc20889090e177e8bcadaac..dc7c1a9394c3b547f5e0885bf501ed42dfbeba88 100644 --- a/Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml +++ b/Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml @@ -118,14 +118,6 @@ properties: - const: ife1 - const: top - vdd-csiphy-0p8-supply: - description: - Phandle to a 0.8V regulator supply to a PHY. - - vdd-csiphy-1p2-supply: - description: - Phandle to 1.8V regulator supply to a PHY. - ports: $ref: /schemas/graph.yaml#/properties/ports @@ -157,6 +149,30 @@ properties: - clock-lanes - data-lanes + vdd-csiphy0-0p8-supply: + description: Phandle to a 0.8V regulator supply to csiphy0. + + vdd-csiphy0-1p2-supply: + description: Phandle to a 1.2V regulator supply to csiphy0. + + vdd-csiphy1-0p8-supply: + description: Phandle to a 0.8V regulator supply to csiphy1. + + vdd-csiphy1-1p2-supply: + description: Phandle to a 1.2V regulator supply to csiphy1. + + vdd-csiphy2-0p8-supply: + description: Phandle to a 0.8V regulator supply to csiphy2. + + vdd-csiphy2-1p2-supply: + description: Phandle to a 1.2V regulator supply to csiphy2. + + vdd-csiphy4-0p8-supply: + description: Phandle to a 0.8V regulator supply to csiphy4. + + vdd-csiphy4-1p2-supply: + description: Phandle to a 1.2V regulator supply to csiphy4. + required: - compatible - reg @@ -170,10 +186,22 @@ required: - iommus - power-domains - power-domain-names - - vdd-csiphy-0p8-supply - - vdd-csiphy-1p2-supply - ports +anyOf: + - required: + - vdd-csiphy0-0p8-supply + - vdd-csiphy0-1p2-supply + - required: + - vdd-csiphy1-0p8-supply + - vdd-csiphy1-1p2-supply + - required: + - vdd-csiphy2-0p8-supply + - vdd-csiphy2-1p2-supply + - required: + - vdd-csiphy4-0p8-supply + - vdd-csiphy4-1p2-supply + additionalProperties: false examples: @@ -347,8 +375,8 @@ examples: "ife1", "top"; - vdd-csiphy-0p8-supply = <&csiphy_0p8_supply>; - vdd-csiphy-1p2-supply = <&csiphy_1p2_supply>; + vdd-csiphy0-0p8-supply = <&csiphy_0p8_supply>; + vdd-csiphy0-1p2-supply = <&csiphy_1p2_supply>; ports { #address-cells = <1>; From patchwork Fri Apr 25 15:17:34 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: 884569 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 C4CBC27FD46 for ; Fri, 25 Apr 2025 15:17:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745594263; cv=none; b=Z+FWCQmTQrcHwTAS9gP8kSJr8P5xwYJXHwu/koaFduYnBC8czgGNcR7Scqaz5l8PW1awwGcpa7LAAI84jUjlfdG8M1T6Y52+GufCDWR1MVZFwCrKLfLPmv+XcXIkS5DDJX8KKs+3pCxtM6Zbk//bIgZlFWUNLYKXuUeaC9xiMeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745594263; c=relaxed/simple; bh=RCuNB1mWMaNtm6vRmUVv+04+d3pPrJBXIRhX6cDQxkA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qh7vSV9C1G5K+dZEg5Q8oel2ay5WeORuFL3Ce1zfY4EE3Ytlj6AsJ+e7xU5F0GsA58adSysc8OBOt6S4RJwy/ZBChPHETZU7BZoG93gJaTX9eRCcFh41RMucX0j0PbTSZOpLSUanQk3SjaDyc2f/uvTr5a/pgtxDIAmJP0ThNhU= 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=C0cJk+u6; arc=none smtp.client-ip=209.85.221.47 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="C0cJk+u6" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-39ac9aea656so2814154f8f.3 for ; Fri, 25 Apr 2025 08:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745594258; x=1746199058; 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=6kN1pqjjlFC9p10HbXmb8Vy14EP3/K2zpEgAzkFrOXk=; b=C0cJk+u6wKgZlij7qW2k+jqesGAdJtTGKxvwSiqbDhvY93GL8JNmV6pdlEPX6EX6mo C/bsI6+kuASnlE4yHnqmT+MhOeWRvBiuxTMY3uJydLoLYYOt1vNxd4Ehc5gYHD6dug1+ S6gTsb2YCPANbeNqDWPUt3dSVQqEJTMkZQ9mXU6PQXA+Xl0VYtOgyA5d6vy8B0P7YJvM YMsgDomY5rDybilnF1hXi0WyQSJ48kmS2+ryMtZC7jK8FYpbdlsdJzugB7YCunZ+xwxl oxcKGnWLFEWlibiTf2gWCDYIRQyzbEujglgKCCy9v0pkvsM4iMUcLy4hmnZSwp5TjIbs y6CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745594258; x=1746199058; 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=6kN1pqjjlFC9p10HbXmb8Vy14EP3/K2zpEgAzkFrOXk=; b=BiVJxlU/1kWz01PiEbp1UAFhrXZ2GPpcX0BDFUZghyCcZmTye9030NDYxL7uzFXnWN ydxmC5ibRmgjLwHZMvzxKxR1+IOGA53tqRETgSwfsPZbbnbdHxw4Vj4kNGlgNrmBCR6c ZA8C4hy9ZiX5igRZFSVVeosG7uYtLwuQmv9FHwYwTrYwOBnXvoDWKvdtbEAi/2uJ8RtJ 1Wvsl6M3GZ34TMC9alTTrsI9t4D1yzF+zI4wLysMWtpQ1hQuXVS+XwE04KX2m5aYtSpm +bZUgPYZ2mi4kSjI1Vtz8EeS7SAYWAZg/xF5N/ctZ14ORTcCuTnNo5auRIvn2HYNX742 jCAw== X-Forwarded-Encrypted: i=1; AJvYcCVFJFzYGrtXlRbFmuj0PM8Dd2e7TKoNFcpCPvJsyAan/hIBYJ/St5WkJ8+zS4EeVy8yR3Db6jnJC/KROSXq@vger.kernel.org X-Gm-Message-State: AOJu0YxKe3CT+QPM91OHYnKyBTwyP5wUFEJpgMrVII9wcYIB4N3tdSuy zAzGcNd2wv7G13JBtUB8i5nYNC0Xh1o3G5D9kSXj/gL7CHTNUIUSZ/xFJ1F+k2c= X-Gm-Gg: ASbGncvyV1FYlOc8hRDQL35cS3QCDkMpDJ4kbuJgawDWloGfiJwVx6rHjgs6E1KTuB3 PdhI/jIKN6qRq1uG9Sra6SQCPejft7Yxx9uM7mVjd9+0IRXnquPmT3GtCvx7Avd4TvgsEAQ07rL nGz3Fc3hM6wekcmdGCnPPshwIKjkpa2zuGgCMYIAaylsMWjcDkdcm9rJZPstD4F8Vscg7aGPymp TZkDfvMBQczjrjA0x3rKEq7qWOulNEMwNf5sGzDdNnrLCr/VVTOiiV+BsEonk1JvF7xzzabwvH7 Kzl1aIbdDR0ynqZWLVN8/YCVeHvgT7w4/DbQMINZ1PnkwELudBi/T974OIMq67cRvnXDLBpQNZo M7jP+AX99yWCcHqM6 X-Google-Smtp-Source: AGHT+IGN+RHDl7/BuFfdgLAHL0b7Am5qHQ0n0MgkovWjVE1OQ+agiU9w6gC8KIXtJWW6FmzpaJuGpA== X-Received: by 2002:a05:6000:2512:b0:39c:12ce:6a0 with SMTP id ffacd0b85a97d-3a074e2f343mr2335229f8f.21.1745594258028; Fri, 25 Apr 2025 08:17:38 -0700 (PDT) Received: from [192.168.0.34] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ccf44csm2684738f8f.60.2025.04.25.08.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 08:17:37 -0700 (PDT) From: Bryan O'Donoghue Date: Fri, 25 Apr 2025 16:17:34 +0100 Subject: [PATCH v2 2/2] media: qcom: camss: x1e80100: Fixup x1e csiphy supply names Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-2-8c12450b2934@linaro.org> References: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-0-8c12450b2934@linaro.org> In-Reply-To: <20250425-b4-media-committers-25-04-25-camss-supplies-v2-0-8c12450b2934@linaro.org> To: Robert Foss , Todor Tomov , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: dmitry.baryshkov@oss.qualcomm.com, loic.poulain@oss.qualcomm.com, vladimir.zapolskiy@linaro.org, krzk@kernel.org, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2290; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=RCuNB1mWMaNtm6vRmUVv+04+d3pPrJBXIRhX6cDQxkA=; b=owEBbQKS/ZANAwAIASJxO7Ohjcg6AcsmYgBoC6eOwOXeH0lYKHhF+lTvDG4t6nhCl0QYy0oAV bCggMDBR7uJAjMEAAEIAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaAunjgAKCRAicTuzoY3I Ou6vD/41SGFd4ePXcaWOmJgrpYHmL7CV7qsQ7IfQ+COvqTsQebM5Tm+69Ap+HXB10W9MN+yaRGm 1dy7DhXLNgTdtB2/+fPSBoTsAjz9wSjOrAu1DnU72xd2JguWgChlZrJ4Z16A+HEccH2u1XDCWKx L/E3mXiB0g/1P8QaIZhaMPDwmanNeE7QFc0BK+dLqgVrYj5HTugxVe7Un/3r4i4fsDyVrSdh2VH +my/nfECy2zpMu4re9/RSdm9KrShlx3qxUyywJ+vuFWkNyBuxLnqW5r3ixkA55aifYhGHwtjhs1 xBNvLK0F0OGFoiq/XyM5bCLBR5bHY6sGmr2t500AgYTGWC33x5CiY1FALzeaf20BbKULoM0oDu7 6yQknBXDZmE4HrM2YYbJ+e9NMRi/Qx5TfKyxGRT23pxi7QsbFb88aXLRNnfrrCTbBrVhvwXLDRE /4elajNQTirYrnKzq6G1SLLRjc7zP9UF/pAuyeJoaWit/36F6Pr/oISYkaTbNFGz1V/0S0kLl2d 0unOPHUA/SPwjNzH38bdTuQ/vImBF61Y3t4SUUw/dAU6KGBepTXclneovlPcZ4NGpGIkApnZvRE dnyB6oa85SQnAqg4jO33CVk4lUc4h8WC9FVIpiIQ0/VtnhKfHsE8SGVhB2dHJVXYmiH/8sMzIVY /iaBLFjLPMxZ7MQ== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A Amend the names of the csiphy supplies to be specific to each CSIPHY thus allowing for the case where PHYs have individual or shared rails. Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/camss/camss.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 06f42875702f02f9d8d83d06ddaa972eacb593f8..d63bc7dc951690132e07ee0fb8df7cef9b66927d 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -2486,8 +2486,8 @@ static const struct resources_icc icc_res_sm8550[] = { static const struct camss_subdev_resources csiphy_res_x1e80100[] = { /* CSIPHY0 */ { - .regulators = { "vdd-csiphy-0p8-supply", - "vdd-csiphy-1p2-supply" }, + .regulators = { "vdd-csiphy0-0p8", + "vdd-csiphy0-1p2" }, .clock = { "csiphy0", "csiphy0_timer" }, .clock_rate = { { 300000000, 400000000, 480000000 }, { 266666667, 400000000 } }, @@ -2501,8 +2501,8 @@ static const struct camss_subdev_resources csiphy_res_x1e80100[] = { }, /* CSIPHY1 */ { - .regulators = { "vdd-csiphy-0p8-supply", - "vdd-csiphy-1p2-supply" }, + .regulators = { "vdd-csiphy1-0p8", + "vdd-csiphy1-1p2" }, .clock = { "csiphy1", "csiphy1_timer" }, .clock_rate = { { 300000000, 400000000, 480000000 }, { 266666667, 400000000 } }, @@ -2516,8 +2516,8 @@ static const struct camss_subdev_resources csiphy_res_x1e80100[] = { }, /* CSIPHY2 */ { - .regulators = { "vdd-csiphy-0p8-supply", - "vdd-csiphy-1p2-supply" }, + .regulators = { "vdd-csiphy2-0p8", + "vdd-csiphy2-1p2" }, .clock = { "csiphy2", "csiphy2_timer" }, .clock_rate = { { 300000000, 400000000, 480000000 }, { 266666667, 400000000 } }, @@ -2531,8 +2531,8 @@ static const struct camss_subdev_resources csiphy_res_x1e80100[] = { }, /* CSIPHY4 */ { - .regulators = { "vdd-csiphy-0p8-supply", - "vdd-csiphy-1p2-supply" }, + .regulators = { "vdd-csiphy4-0p8", + "vdd-csiphy4-1p2" }, .clock = { "csiphy4", "csiphy4_timer" }, .clock_rate = { { 300000000, 400000000, 480000000 }, { 266666667, 400000000 } },