From patchwork Fri Apr 25 12:01:51 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: 884885 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 CA38723F40F for ; Fri, 25 Apr 2025 12:01:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745582519; cv=none; b=fJB5VXG77FrYfZYBBChwOJpINup62XGmGeOwkTkw+MJNHo1oYnV60+SZ9TE3T4NaVvkP6VqRrEzIaQIschD7ZagQn1QFloPxtlByz7JvuFJ0nEuAmprMGqvIAKNrIELfQKAf/49JaFA+AY+PKb07aoK895qljVSzQlhL+AeIQpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745582519; c=relaxed/simple; bh=/d6x59FsbXyfCoK8acmz8NJpqeM3LKYXyt+zeXsdhDs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N5R5KXgehFd7j0kL/cOITifA2A9H6/pdoU175tf+zilHq7fK/8On9fWKygHNLQXblBWpt1o48LUaYxnR0DIEN8V6KLWCtMvbegUpOo1b6t8hjkdn5tNIQLz9LT6nqh6L/QuQwyqrI+i4IP60AGne0gJIMMfop3nj/ZG4QIcuBFg= 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=h/eR5EQw; arc=none smtp.client-ip=209.85.128.46 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="h/eR5EQw" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso19841335e9.2 for ; Fri, 25 Apr 2025 05:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745582516; x=1746187316; 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=NhE+Dyz1wOpvAJk2uuIrq2Trm7OKDV78hrVHrvsSei4=; b=h/eR5EQwrBpKHBbG2jYmiZkRDhXc4l2sQRuVH/nUccqHaN3OAotX7YOVqQZISnM6qh 4nmy7B4Vlm8Z3BWTaABz7vstGhiPqYn6QE3QkfzVtTE3TSvCTSjDwA+Ldn39y7hUOcA+ QgdqEkF5V4IIEdKRjPhe95iYvL4ubTEaXLdEOwm7KXb/byQIoF9JxKZI1Hq+X1WAe+CC zDX+mcWFwpRVSbalqUpKy6nShBGnOgt2+25+Hl+4IQ1PWVNhgxg0uFldRxqTMZoVBr6P sBZWsacjf7ijsk7QQ7KycghY4REvqD1NmpTUJSvflbh1CBBhb7jGBvb0gvSPXb2wgRD3 djxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745582516; x=1746187316; 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=NhE+Dyz1wOpvAJk2uuIrq2Trm7OKDV78hrVHrvsSei4=; b=kMi48C6EuOQBNp+4hGANiSNrxrZ5XX8fsxEXvr2fH5R6+QlDCo1wjr6f2ztzKGIOL4 Fj1QKYaO4oXbyGrQThWs0HVFTUIaL/xA/CGD56G1mPVdLh1R2sm7fsqiKrqPZB1S3BMT sFmQV59B4p4SP6FVTDBQYyL6QbIh2Kr2DhsoP5WyhGFwXl5iPXJJQEVh9YQUorcBm0Gi KVJOdBYozPxudyeurJixNIQOuMEsOxNlsy4ElCu+yYwxdamktc1uTit7Y1D0UDWrtn6N a4y0RXoiDFlkMXi/Oc1LNU0Lnl/MjpXiMOniae9CJnXQXLxiL+d3/wvCoFzXBJC6J2k+ JHZg== X-Forwarded-Encrypted: i=1; AJvYcCXat5zxMDkx4Zlwpbzj/7zYiF5p3y99jfr1fGNLklfh20mwKD7cTsxB4FYPlwxcN6gDQ4jSnJX5S5NTtXZf@vger.kernel.org X-Gm-Message-State: AOJu0YwF1WNXl8grfrRDWmCqno2y5rsa1cItLLk79gm9f4t4LO82igMd o49M6y3Vsm1PPhgSrwxGxXQJfaxzlIFjniLlpBJDHbButUym91/skPbQ2wvS0bc= X-Gm-Gg: ASbGncsSa6n/ApNE1pEJQSoNxmunrBLFHCry+CeipwIGVRD0rDy8yE+9rTLUNtaXlTL sTbaur4nQrK1D6ef9+8VY8woKg69MvLHmabHqPH467zaTLp2gmAekGfVwvv1yep1i9y/OuFpMMS fU0Dw53fWuCg6PH/miuPeR0NqFuyCcrOIfIYz40LZ3322toMjexWbv5i2yDvcIWuptqK9/hPX6U DYLG2NnZJuUZC2XCBlMLGVdTDo9j9g/hRfxtHs9QOXqHyk0eZrR01g5N2/f/S8OfSlkFQyAwfZf 8dhD+jdbcGYMc1sJHhjvGxl3E77HlJJUSP1vqCX1T+Rjly8TYdAeDPoVpa0MMdidfvX7FH6z78f Ue3fZsg== X-Google-Smtp-Source: AGHT+IFHLlJzP5BL3V6sFN04q8JXr4Eh6yXMm48K9yC7I70ivFzicvWZ/rGjCxcg+f8noEGCsOnkoA== X-Received: by 2002:a05:600c:1d20:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-440a65e420bmr20732465e9.10.1745582515548; Fri, 25 Apr 2025 05:01:55 -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 5b1f17b1804b1-440a530f6e6sm22648985e9.17.2025.04.25.05.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 05:01:55 -0700 (PDT) From: Bryan O'Donoghue Date: Fri, 25 Apr 2025 13:01:51 +0100 Subject: [PATCH 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-v1-1-2a3dd3a47a6a@linaro.org> References: <20250425-b4-media-committers-25-04-25-camss-supplies-v1-0-2a3dd3a47a6a@linaro.org> In-Reply-To: <20250425-b4-media-committers-25-04-25-camss-supplies-v1-0-2a3dd3a47a6a@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=/d6x59FsbXyfCoK8acmz8NJpqeM3LKYXyt+zeXsdhDs=; b=owEBbQKS/ZANAwAIASJxO7Ohjcg6AcsmYgBoC3mxgLk+ZrgfFS0o1d0z07eCsMd581/ipTLzk Zm4jsolLV2JAjMEAAEIAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaAt5sQAKCRAicTuzoY3I OswSEACBlHM2WhbARrwSwsLpzQiZfXgr/AMoIeiRZDfTZsdA3omq2r923t2zOQ+b1eAxDA9dF04 XxLbX7JA7z/c9lRAn8lbFmsk73j6ifowg541sprVtVfEU8g8oRlnUIrz+wyDiVWTYtOs+71Jtxf URvQv3wHJv3PJQRmv380xH/bwWmmhqBY8xQiSpah2w1bvnzRo341HomJqWH3F4M0XUD6TQu4P5m vnC4r2Tq0aGS9pQ2CiRAhswl52qLfNhyG0OZ+0qvJ46/S9gXgsoNdtef5XhuJIWxH8FYRKPGJwp K5DibzQXKKeCBSRvpinQG6+MOxEEgkauFHLBw49Tx8DfY6lNIa4hMRaKU75Fy/XfGwlPbASfzLs bfdMAn7YCK/EmPoLC4WrgkudzzlhW9fWUbKp5ttjWDxF35h5OQG2QUr9YmYuWqlvrQlwC9MYl77 WFK8gS+cTfODfdYxZDVH5LiK/9s/SCC8t0Cl3x1HeMCcXGJDaO6U+FG2CA9EFrMFSNjl1ERDTr4 oAcGHd3QTY8AIhKwWC70V1b2+gP02OhVEvxhsqxt4p8Wkj5Xkqtisgi2h8stgGbZRudukhw0gmN rUEhHtkhYhb8GvSJC3q4WKxdCd1VlN8S26Ul/Nv/79ZKdI6eRXIjm0WGYyFFxVNrDLKVqgpyctf EspYC7I650RQLhw== 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..c1cc6b275cb2c630e262279f722ce4657cba096f 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 12:01:52 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: 884584 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 783A124C067 for ; Fri, 25 Apr 2025 12:01:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745582521; cv=none; b=q3KRuFaHj4KXqrF11DJD7b9i301pTEBgHsO3VsgTJvi0Q2Y1uH+8jNp2A8GwBQsV8ogGES9iirye69SBkGcTvI2ymgJLgC0UUwslS6LmtryXXIm804WSE9d3oCeHrz27jq/bHNeAjx0Msm95EslASGKRaF1Zjidrq2q4Jv19ffo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745582521; c=relaxed/simple; bh=RCuNB1mWMaNtm6vRmUVv+04+d3pPrJBXIRhX6cDQxkA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=brbVl+fLIrYYVh8tz5RwOjS6cOjrfjPvnszXsEEqpuomWWU8DwwpRqQO9WFHraLM1vzK/2vy1KAzAH5iNcTQ4qybq7yIEZswrGXpD8nXXasYDe+eaweHDt9K+4Y89fP9I0kIbegKkE0u5vuRa6tMCGImHKD8pedPDrC9OK2fRsY= 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=FI04fkFF; arc=none smtp.client-ip=209.85.221.52 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="FI04fkFF" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-39149bccb69so1921645f8f.2 for ; Fri, 25 Apr 2025 05:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745582518; x=1746187318; 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=FI04fkFFOUHuVlEGk+5eBkIvYHIjif6gNTFUpDDHoivFEPkfujz3Ki4ZuuzwS6bF3K A7GrrxB8BH4y9UtGgoUVMr8Xm5kOkB/mWrdqr2meDGouov7tDuzmIuN8JinUhyIfMbZl a8YjVSo1xOzoxuVkK2GWLyvxAD7sacfDek1bV2ZjnE1KJ5o9D1N/rqrI+15EkR6NuTzd 0xLoMzqaWl747dCS1hlTeURndG7DPk2em8bb7I0dhBJxAdnf9qiLYHP+nWO2tzMd2XpS h3ErBuu1vmPNWrIlXuuvLY0QyGWILwEAFukUzUCQyJFhk3kw4YJSJ2XKl1Sic7njsh8b /SnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745582518; x=1746187318; 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=NU7ww4ZGqp425NDn8yscT7RDfrO9jJKRE8Pnb17gNelziLE8T9lmt4Ub2rqU3+SAfa DJjP98s2Ss4Q2XjLMRTB4Ph6siUEzE1DF7ncoH68w3Hi+fPzdY2HXVUCAGVBikcFO059 rgWWSc7aLdj/btDs28CsV8PuGqYKXeIL3ofQQAuhvrFXH1JS3uO98Gy4HNOdPIR6qDfj 30aj4hzDl3hMZ7LDBRnHDYsCebPugQ2Fuv56QgrpWiu/5GE1nFUyC4HnEFWYlSiIxHe0 06FNQTDXvJ+QPLt7QRJJ21Ls5/cNODJMGsOncylu6Ewqqd7fygLoY6r91jOmScucrRve ONvg== X-Forwarded-Encrypted: i=1; AJvYcCV1iY//iZWnaNbndsHvwiUJei0G7BkJcmBRbSGsyEd6yUIcjlINWcE/b1hIy1ERlWWHpHhylMRne0cKGZ3a@vger.kernel.org X-Gm-Message-State: AOJu0YxhcH2NcmryKf2GWz+XD3N/ET+fQyDNVS9yeudEL3Q8BA+Hgfex idcojliF8eItkop3Ug/i1XTHDWPC9ES/Sr76glrvqeO6TJItbdpls0f9XbMvzAQ= X-Gm-Gg: ASbGnct4q8/EwA3H0HYWXUbfID8mV/im05aPzWvCldGyXi2jtNB/JBXIRVk55fnffb3 wxxsB7HPwxjbw8E2ug7EkF2/vN8xzl652cbAVeEa0bkG5vq+JiHeO85T76ZQ4H77nT2Mxz3h/dB 7iS1yvWALLKVVFo0S5EX20mh3Ek9zOAGVX+Hr2sDrmpyvxsHY9130Yfc0tfbyBFdUfM2KVX/ceP DR8jCb1ql53aSyumm7u4e00WLTnSRRQCUpkL+JPLPAMUtLdBLhytBMLqZQWWQZKm8GRpV+1OLDY 6tVo7ghnxKFPgTuqJqkubsPumZlC0JaO1sIKOM5hsV4nCEKYktBGey1rL/WRnu8AGwLgvp0x9sr rGSOo9g== X-Google-Smtp-Source: AGHT+IEdiDe5dS/VsCnzDJjmA5qf9ZUMHuvRq5adCp+43Hm7VVJe8IjsSuwxQTyvh1eQCKMHb8d1qQ== X-Received: by 2002:a05:6000:430d:b0:39f:31f4:f2b9 with SMTP id ffacd0b85a97d-3a074e3814cmr1312135f8f.32.1745582517469; Fri, 25 Apr 2025 05:01:57 -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 5b1f17b1804b1-440a530f6e6sm22648985e9.17.2025.04.25.05.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 05:01:56 -0700 (PDT) From: Bryan O'Donoghue Date: Fri, 25 Apr 2025 13:01:52 +0100 Subject: [PATCH 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-v1-2-2a3dd3a47a6a@linaro.org> References: <20250425-b4-media-committers-25-04-25-camss-supplies-v1-0-2a3dd3a47a6a@linaro.org> In-Reply-To: <20250425-b4-media-committers-25-04-25-camss-supplies-v1-0-2a3dd3a47a6a@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/ZANAwAIASJxO7Ohjcg6AcsmYgBoC3mxVVqy3KNvxdEXoSmdKy+go9+MVrTbrnXkM 2rCz/S9q8OJAjMEAAEIAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaAt5sQAKCRAicTuzoY3I OiKKD/4/0F0gvyfapk5PUy1qefu8GI6imCIRGSsDe3rGpwEN21GXM4TeuSMaIoQ0ANQPnkhzkCW SvA6dInH7uonXaN4OwrWqWt7Z0v9uV3vd0bKJfIW2jSORkyaBsV/XxhbItttTjo8ZFtuJG/2bL2 Z2/dWtp3I0PSxhg2SP2zoRSVmZ7DxRY1uOSolZ41AI88pOaYY6bmpvlqFr9fP/Zi5+1psa6o3KX szgMUQsJ3p7cp4mAoisbS1dO1NypoI8XBssqxXwmMIHXWhnML9tr+TAcQPidKiIwrYTp0qkgt3R lXiRJyjWsqS+ov/btEWZIsrB5DEz+4r1JQKQe6MXx9UT6+V4/HTJEaX+/VGGWhvCpCrKbSb/R3V t0LjGU0WvbuLdkP+DdRwMztRZ9PkjlvIdE5MPiXh8WHkdFlO+vIeS8sFHSHw06/jHobvappIvC4 qPymTFMM4CFR4PwkSqljycu2BXJxHYStassHEDcpQi8WFbiYeS+TvQ8IcDFeSRjMxGfbKrQAVJK z9Wv6sbtQy2udHNRRQbrI0u6TtFDTO1vSHtrK5XdII+nzOCOtxO5SgNJWA1+FxyBefyB+nsIO9/ NkPlfF1f0vItr3Z43kKAThW0OfC3NR/jJKsMpSaf7aFB6coeQhoRNnU4T5XOAssopi8x5epM570 McWPSbtI+/cs6jA== 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 } },