From patchwork Fri Sep 22 15:11:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 13395926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A253E6FE48 for ; Fri, 22 Sep 2023 15:12:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232312AbjIVPMX (ORCPT ); Fri, 22 Sep 2023 11:12:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232148AbjIVPMX (ORCPT ); Fri, 22 Sep 2023 11:12:23 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [85.215.255.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B436A3; Fri, 22 Sep 2023 08:12:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695395534; cv=none; d=strato.com; s=strato-dkim-0002; b=daL6vx1jNXgT1bVNAJGmpIJqX/9LOTf/AeJIqtzTAVKw2Gn+SXKZL3Nydu8Fsrsgb+ 0TUB2ktyUy9rBvLEfZwGaEIzNUSzmq1MmvyVtKEmEHpmotEtY99j73nU0/mtZelIw5hF sw1ToRMG/mGw0FcpDF+66WmWeneplW+ilXJ3ezd77CvDIQiRtT19dTaUQ1RS0aEuLCu2 yKrMBhJSXVyhCnCEPmwaP61BQlvnhlKnqfj8XzI/0nynIPWa5sJP0iYNlqZguTG2/BbC cUzV3BsvSn4x81zmxcz9l/3olafgPSppkkpU6vEm0nnjZxNKeVYDrR6EjaNDMmizqqGc QzBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1695395534; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=n3ubanmp4NVB+vtzJSH5QAzXo0dNiKXJkLgh4A8QnPk=; b=nbqNPMnPKDg29Qgbw1NOmvQH9rDl2FscXKfdiaWK1f0eI5M4MCgpslb8WGm+dcytaj th1fBwi+8C7JFIWf1WcvU10eGZBZxHIBMy3YUj+xHTgKQ9MDKGaaC4lIH7mwyJmOpoda kBAfqgHPgdBQk+/Egp0uVMXmwDeWjb3IHCACLANCbu83JJScEdOizNFgzG+zibFAmZG5 SZFil678nycOqwTgTkVBS5Y95kYOgfZ3Ohzv4d7YOcHDTSt3DRF+Sku6dWvpAYQzpD1y TQysJy28C+wgYcGe2DIL1CWECVNH4Kh591/KkT0zEPtCanJB7unl74tCc8C4GQAcp8+i KX8g== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1695395534; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=n3ubanmp4NVB+vtzJSH5QAzXo0dNiKXJkLgh4A8QnPk=; b=iHDQCOqr4Fzhh64LaOPEnMzFcTtpCzGYXc8QB1uURsLh7sqp9RxLPaKZ8lMN4/MINL 03naxxZalQTfc9OJB8t9/0OcDv9dDRY6tlZ0eXkUnKlQOhdwPgg2SQ7kQ7y+D/jUtgL4 pBFCcV+8VawbjhwEqLjRbO2JeguZVKF4mdPiOR8Oayu8Ewclm13hayccuIkcYx7AVj0i q2CQJW+gqTESLeBXUcDHgF4RFZo6WuM3yYoAIU1+Y7qoguLMyALYS4ZTqq9PNys21s7i S07/1gIbPRTp/rZ7WsWnmpkoaUbBUvNOpnPe33vp0ZZB14CCgt7U8Lqynb8l3a9nb7bi vZjw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1695395534; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=n3ubanmp4NVB+vtzJSH5QAzXo0dNiKXJkLgh4A8QnPk=; b=yWuMLYzI+nQ1MilvmbaO0lUyrI/GDDoqDKEnpjyL6mS+PsaHhyq9VnA9AI7Tf1A4c1 AJUjMUPRfR5HYFDWe1Dw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOL59w==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.8.2 DYNA|AUTH) with ESMTPSA id R04c57z8MFCEUd6 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 22 Sep 2023 17:12:14 +0200 (CEST) From: Stephan Gerhold Date: Fri, 22 Sep 2023 17:11:56 +0200 Subject: [PATCH 1/2] arm64: dts: qcom: apq8016-sbc-d3-camera: Use more generic node names MIME-Version: 1.0 Message-Id: <20230922-apq8016-sbc-camera-dtso-v1-1-ce9451895ca1@gerhold.net> References: <20230922-apq8016-sbc-camera-dtso-v1-0-ce9451895ca1@gerhold.net> In-Reply-To: <20230922-apq8016-sbc-camera-dtso-v1-0-ce9451895ca1@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add "regulator" to the node names of the fixed regulators, and drop the "_rear" part of the camera node name since it is not part of the class of the device (which is simply "camera"). Signed-off-by: Stephan Gerhold Reviewed-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts index c08b4be5cc7e..f9cbf8c1d689 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts @@ -9,7 +9,7 @@ #include "apq8016-sbc.dts" / { - camera_vdddo_1v8: camera-vdddo-1v8 { + camera_vdddo_1v8: regulator-camera-vdddo { compatible = "regulator-fixed"; regulator-name = "camera_vdddo"; regulator-min-microvolt = <1800000>; @@ -17,7 +17,7 @@ camera_vdddo_1v8: camera-vdddo-1v8 { regulator-always-on; }; - camera_vdda_2v8: camera-vdda-2v8 { + camera_vdda_2v8: regulator-camera-vdda { compatible = "regulator-fixed"; regulator-name = "camera_vdda"; regulator-min-microvolt = <2800000>; @@ -25,7 +25,7 @@ camera_vdda_2v8: camera-vdda-2v8 { regulator-always-on; }; - camera_vddd_1v5: camera-vddd-1v5 { + camera_vddd_1v5: regulator-camera-vddd { compatible = "regulator-fixed"; regulator-name = "camera_vddd"; regulator-min-microvolt = <1500000>; @@ -53,7 +53,7 @@ &cci { }; &cci_i2c0 { - camera_rear@3b { + camera@3b { compatible = "ovti,ov5640"; reg = <0x3b>; From patchwork Fri Sep 22 15:11:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 13395928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7072E6FE48 for ; Fri, 22 Sep 2023 15:12:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232465AbjIVPM0 (ORCPT ); Fri, 22 Sep 2023 11:12:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232401AbjIVPMY (ORCPT ); Fri, 22 Sep 2023 11:12:24 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7C2100; Fri, 22 Sep 2023 08:12:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695395535; cv=none; d=strato.com; s=strato-dkim-0002; b=hWeDzpkxWLkdNuHYY8IrBC7CF0ZtWuXUBDbORkM2wDWbEFJaBdqsAE8pE6A3QS0Puc s8loRn0BA/BkzCCJuti1FMJAUV0jsh6i2xrXcbJbbIC7dMz3IufcVSSlRdUcxkU5qNeF t709PKt7reNcegyBf5d+ZhM4EeVpMCBYC7bIxhpJ6s3z3lnP+Wm/wELGsW57KRwmnk4X /erz4v2O6CckO0MI+8gYhZ9Kpg/bSOTFHWX9MQ4xvvijcKUamX5/YVYyTcaqg1Gnhnli f99Hfc0ZQCb77uCSY/W3v2eANJ022lb4jhS6MlEbzTvbO6peahPSUlEBVXVKJKjKsk8p I5BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1695395535; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6GNziuA5bPGmA8agGZsLkyePalgcQb3kwfHxsfFp+NM=; b=bWmlR1LnEB3A7Ufa1BacvZ5Z8FaGOsuheXyMqE4BME2EgmEy9+xZ7UNUvhwiMTv7JK 3q1Wgjh9Hc87mMX9zTid6sHFPbwbzZZr6W31e83lhsjb35k4z2WFtahpycgKgb9RA5gh S/DXW8378W+6L6lTrwBkt1l3hbGoeb/xWm7YuaRIHTOmr6s06z/wHbaHmzHSIQM7AX22 4fSE+QAv0y9cye9B1bmygUbIIRu+hcdEvYED2lLX/TnGqQ5R/D9sse3Gg2newvpZfJcy a1RAZslbCd9Q/YsSYLQ9CmUxJhIZwU66IngL/m5WrGwPiGwBxRfBixg22U4v30vjGyTQ d0og== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1695395535; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6GNziuA5bPGmA8agGZsLkyePalgcQb3kwfHxsfFp+NM=; b=D8U2yPhbXLcsCv5P+96WTdXXCeLBZYqAXfZMZQa15fDKkH/0gtaJSeD6mVzWuMsdIn I9x3e5h7o45TXatHNNagwvpmUlXX/pYQR1gcJN1ylz62OIsTngnC82cNOJHksVGsWBWL 38Q+FK1DtZqnaksVdrssU6RFr3GkppiY8ZhXf/bV/yk2g4XiHNr+3hz0zKIJA+tMAfuV vBfMb0c9HdDU7UiHFVu/4gkYq6FKtRZS1Cj+dthodl0d4w7eYzxzYHJ274kA9brRb+J7 K7UDD8sLgyN940ktNuSth9puvX0reBSUk+sugOIcEZMH+Qkyt42QFCWXWLD5dSL7gRPN Juvw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1695395535; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=6GNziuA5bPGmA8agGZsLkyePalgcQb3kwfHxsfFp+NM=; b=gR2vEI/uw9AfNPGMqJWkk3P3iZCNZrqtXdK5G8TfqG2V8UJTwDv5IoD2ZLn9KBrve7 OGrwsztD+S7+7xRPGDCg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn9VOL59w==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.8.2 DYNA|AUTH) with ESMTPSA id R04c57z8MFCEUd7 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 22 Sep 2023 17:12:14 +0200 (CEST) From: Stephan Gerhold Date: Fri, 22 Sep 2023 17:11:57 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: apq8016-sbc-d3-camera: Convert to DT overlay MIME-Version: 1.0 Message-Id: <20230922-apq8016-sbc-camera-dtso-v1-2-ce9451895ca1@gerhold.net> References: <20230922-apq8016-sbc-camera-dtso-v1-0-ce9451895ca1@gerhold.net> In-Reply-To: <20230922-apq8016-sbc-camera-dtso-v1-0-ce9451895ca1@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Follow the example of the recently added apq8016-sbc-usb-host.dtso and convert apq8016-sbc-d3-camera-mezzanine.dts to a DT overlay that can be applied on top of the apq8016-sbc.dtb. This makes it more clear that this is not a special type of DB410c but just an addon board that can be added on top. Functionally there should not be any difference since apq8016-sbc-d3-camera-mezzanine.dtb is still generated as before (but now by applying the overlay on top of apq8016-sbc.dtb). Since dtc does not know that there are default #address/size-cells in msm8916.dtsi, repeat those in the overlay to avoid dtc warnings because it expects the wrong amount of address/size-cells. It would be nice to have a generic overlay for the D3 camera mezzanine (that can be applied to all 96Boards) but that's much more complicated than providing a board-specific DT overlay as intermediate step. Cc: Bryan O'Donoghue Signed-off-by: Stephan Gerhold --- NOTE: I haven't tried booting this (since I don't have the camera mezzanine) but I compared the resulting apq8016-sbc-d3-camera-mezzanine.dtb which seems to be equivalent to the old one (aside from phandle numbering and ordering). It wouldn't hurt if someone could try booting this to be sure. :-) --- arch/arm64/boot/dts/qcom/Makefile | 5 +++-- ...ra-mezzanine.dts => apq8016-sbc-d3-camera-mezzanine.dtso} | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index d6cb840b7050..641d770662a1 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -1,10 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb -apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo +apq8016-sbc-d3-camera-mezzanine-dtbs := apq8016-sbc.dtb apq8016-sbc-d3-camera-mezzanine.dtbo +apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso similarity index 89% rename from arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts rename to arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso index f9cbf8c1d689..d739ece6b44f 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dtso @@ -5,10 +5,12 @@ */ /dts-v1/; +/plugin/; -#include "apq8016-sbc.dts" +#include +#include -/ { +&{/} { camera_vdddo_1v8: regulator-camera-vdddo { compatible = "regulator-fixed"; regulator-name = "camera_vdddo"; @@ -38,6 +40,9 @@ &camss { status = "okay"; ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { reg = <0>; csiphy0_ep: endpoint { @@ -53,6 +58,9 @@ &cci { }; &cci_i2c0 { + #address-cells = <1>; + #size-cells = <0>; + camera@3b { compatible = "ovti,ov5640"; reg = <0x3b>;