From patchwork Tue Oct 20 19:38:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847747 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B55EA14B7 for ; Tue, 20 Oct 2020 19:39:15 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 73F0A22265 for ; Tue, 20 Oct 2020 19:39:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="slyPxE6Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73F0A22265 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NOXr4RQiSzRp98voFt/VzZL1KwLS6gbGIXuhgwdaV4w=; b=slyPxE6ZSn9CbV/qV4nC8k8Ni aJVbgt5xlw+7CIv9cOm0mFw9GPhFDAzZF0txzrelDDGYRgiKAS/af5JaZndoAu4ARkRzdZAD6ice6 fYz6c/07lpcam3Czb0unYtnQpn+Br5UO3iLY3gkrwzeBe0HN9yu27ytIS3LE1IBnLgcbGH5lFVkst bmG8vEoz2RX4oKz8Hq3ArRSxNeeMTutHAgmMapVqgwQM7z+kr/jMtK5mKW4dI2KU24N3gFtv7YtfH WajFwb9esPGNGTNZnBXGpNfLE98zwFIOW/rU7xHarVazbuqEzvaQqCO+iaFowGJibgg5Q5pHjSU/R TC8DoaM+A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTS-0000yN-8b; Tue, 20 Oct 2020 19:39:10 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTP-0000xJ-LF for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:08 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 9DBA31F44DB5 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 1/9] media: staging: dt-bindings: rkisp1: add missing required nodes Date: Tue, 20 Oct 2020 16:38:42 -0300 Message-Id: <20201020193850.1460644-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153907_887425_19AF1DD2 X-CRM114-Status: UNSURE ( 7.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add missing required nodes in json-schema yaml file for Rockchip ISP1 dt-bindings. Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../devicetree/bindings/media/rockchip-isp1.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index af246b71eac6b..a77b6ec500c95 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -94,11 +94,19 @@ properties: remote-endpoint: true + required: + - reg + - "#address-cells" + - "#size-cells" + required: + - "#address-cells" + - "#size-cells" - port@0 required: - compatible + - reg - interrupts - clocks - clock-names From patchwork Tue Oct 20 19:38:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847751 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5A3414B7 for ; Tue, 20 Oct 2020 19:39:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9A5E52225D for ; Tue, 20 Oct 2020 19:39:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O4H4ocyV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A5E52225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TcSTXi3XoP33BjcPe1KC1UONC9ObgNbEc/7lzJV3EqY=; b=O4H4ocyVB9f4j/mxrpAhl1R6g Dg54J3qnvaAs2OheVa45Q14ZRoCNFT5xOY1Bt3Tg2v7Xq7Vjc3KvNscbVX09sYXABbsKWEc6gTI4C 37VMo4x4WFddxRKZOCsq5jolGYM+C+rRka68iK7a3HEtNqOQptUNTb1QkuL5wWGqbpwIXIZzh71ye JeITjyaj3ard9Nk29aEtyDnBZOD2/ZPZS32RsZmeZeT0mOGg2Y9Vg9/7liX7qzKjkRKqxkcfURZfJ n2b8fC3WG1uABb7LtbmFo8JrQGdCXWI2jMeVXeZCk1fjTlnoohvDZz85ytPSQcs1tM12aVsJs/AZ8 U28Zn6Jag==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTe-000143-Po; Tue, 20 Oct 2020 19:39:22 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTU-0000z7-Ex for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:13 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 71A3B1F44DBC From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 2/9] media: staging: dt-bindings: rkisp1: drop i2c unit address Date: Tue, 20 Oct 2020 16:38:43 -0300 Message-Id: <20201020193850.1460644-3-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153912_610207_B64E8517 X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Add missing required items in Rockchip ISP1 dt-bindings example for a complete i2c node. Drop unit address to Fix error: /example-0/parent/i2c@ff160000: node has a unit name, but no reg or ranges property Remove unecessary fields for the example. Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../Documentation/devicetree/bindings/media/rockchip-isp1.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index a77b6ec500c95..4c31cfaee2709 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -168,8 +168,7 @@ examples: }; }; - i2c7: i2c@ff160000 { - clock-frequency = <400000>; + i2c7: i2c { #address-cells = <1>; #size-cells = <0>; From patchwork Tue Oct 20 19:38:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847755 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5106E16C0 for ; Tue, 20 Oct 2020 19:39:30 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 111A622265 for ; Tue, 20 Oct 2020 19:39:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qhKNdQ48" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 111A622265 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kBvLpUEypM9isptfJqhg+gYNJ01U0zFti7ccOhMATvI=; b=qhKNdQ48hoKLh5pP+1dJSAVF/ HO/PvM7mQCZWVuIEnk4J7YFt7a/StA7o+NLYba/3hPEs0KFBABV4Cm/L6R/b7be1qGYba7yVYJiod 80JmabA2O4ghhgbY8CdpbC/Q3KI2eqMHKWGFK6DLJ1TvWE3cbT+IlvVoIK9uZbuMsJL4DGCgnFHfe 8PuEOYjAWacvtuWkMLvpVwA6jVps9oR5S7EcvtGiolpTXAoL3cIYZlq+UwemCwjLvr1EssGAQwlgR 3y2pnyFC0BGKih3B0JUxFdiCXYwQCEKfkCVwAHz5HHXehpNqok2gW1VEz74tGT+o8pm+xkwxYpKV9 qkLfvFD3A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTg-00015F-Ss; Tue, 20 Oct 2020 19:39:24 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTY-00011R-QA for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:17 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id EDA591F44D9D From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 3/9] media: staging: dt-bindings: rkisp1: re-order properties Date: Tue, 20 Oct 2020 16:38:44 -0300 Message-Id: <20201020193850.1460644-4-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153916_973094_72E4D9B9 X-CRM114-Status: UNSURE ( 7.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Organize properties order in dt-bindings to move it out of staging. On top: compatible, reg and interrupts. Then alphabetical order, then properties starting with '#'. Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../bindings/media/rockchip-isp1.yaml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index 4c31cfaee2709..79ebacab83cf3 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -23,19 +23,6 @@ properties: interrupts: maxItems: 1 - iommus: - maxItems: 1 - - power-domains: - maxItems: 1 - - phys: - maxItems: 1 - description: phandle for the PHY port - - phy-names: - const: dphy - clocks: items: - description: ISP clock @@ -52,6 +39,19 @@ properties: - const: hclk_isp - const: hclk_isp_wrap + iommus: + maxItems: 1 + + phys: + maxItems: 1 + description: phandle for the PHY port + + phy-names: + const: dphy + + power-domains: + maxItems: 1 + # See ./video-interfaces.txt for details ports: type: object @@ -110,10 +110,10 @@ required: - interrupts - clocks - clock-names - - power-domains - iommus - phys - phy-names + - power-domains - ports additionalProperties: false @@ -139,19 +139,19 @@ examples: clock-names = "clk_isp", "aclk_isp", "aclk_isp_wrap", "hclk_isp", "hclk_isp_wrap"; - power-domains = <&power RK3399_PD_ISP0>; iommus = <&isp0_mmu>; phys = <&dphy>; phy-names = "dphy"; + power-domains = <&power RK3399_PD_ISP0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; - reg = <0>; mipi_in_wcam: endpoint@0 { reg = <0>; From patchwork Tue Oct 20 19:38:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847757 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B335A17EC for ; Tue, 20 Oct 2020 19:39:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A3A222282 for ; Tue, 20 Oct 2020 19:39:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vppLhh4Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A3A222282 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2cwLcXTLAqnIeAWR8iCZQSuD1PqIIiYevXnr5sRw6vk=; b=vppLhh4ZFbZQxc29CKeS3wxvB /gPE9Ngju/IObhM7tTTf1EGXYF3VhGN9NV6owZJwGIPibkHKoRMio2S9YKp4L/zoIur79nw6p70hq 4by1KGolYJ6Ydyw5Mqm+oB541aI6feom0mw24f3VPL6e7qXYOLIP5OqiJvFH3Y1/x/PoVnUP8e46p bT2xDaEXe7IjPqgv3Zwl8JlipeGEzt71Y4EupMuPx4CaZENwF55rdSRuLPhzX7TMTdESe8fGUaVQA 4wyhAT5eWtWeCoL6Li8mRmUE9hFo+6JJZFIXh7x9Macrq7woMFgFu4/CvUC5U/AUcMRSJWkzXFbQ8 1OokkkDNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTi-000161-Dr; Tue, 20 Oct 2020 19:39:26 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTd-000133-68 for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:22 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 718431F44DB5 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 4/9] media: staging: dt-bindings: rkisp1: drop parent unit address Date: Tue, 20 Oct 2020 16:38:45 -0300 Message-Id: <20201020193850.1460644-5-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153921_372429_AEB388C1 X-CRM114-Status: GOOD ( 10.03 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Fix the following error found with make ARCH=arm64 dt_binding_check: Documentation/devicetree/bindings/media/rockchip-isp1.example.dts:24.27-101.11: Warning (unit_address_vs_reg): /example-0/parent@0: node has a unit name, but no reg or ranges property Reported-by: Johan Jonker Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../Documentation/devicetree/bindings/media/rockchip-isp1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index 79ebacab83cf3..62a6b9c959498 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -125,7 +125,7 @@ examples: #include #include - parent0: parent@0 { + parent0: parent { #address-cells = <2>; #size-cells = <2>; From patchwork Tue Oct 20 19:38:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847759 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 174B114B7 for ; Tue, 20 Oct 2020 19:39:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C82E122265 for ; Tue, 20 Oct 2020 19:39:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1uQD5Q+t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C82E122265 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4l3fBwfvrgqrICQO9Q6oyTL+8R0ymQkYbNaUXad6G3g=; b=1uQD5Q+tBzgkyMQx0cM75CsE4 x9eOij4p0vNKb6OfiEzO2S9W7QJXlBf+jOhJFPs+AP6L8h8cMCH+O9HvkegBbPWnWN8p45dOAK0tu z3VeD9dsFpLja417w6fenYo8rk3YFRlQT9MTSZbMXBpVIzWJNAaethXB3MFIsmvKJYqA6pnwuD3m2 KjF+ABEtR6DfyTdtIGHdfbV05eHHaTeXou3t4k2dAZ/GiMHPJfvDK77PaXPo7OuwgV+VwZgzTPY0/ sEtJdapVvdI4ojW4tGH8Xw2Mi6qBlRZ+gVFGzm3dQFRFSzrQyOeolfJ2wfwEqce63B6O1SLNmFt9z qMk165ZgA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTk-00017W-MZ; Tue, 20 Oct 2020 19:39:28 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTh-00015S-Nm for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:26 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id E77F81F44D9D From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 5/9] media: staging: rkisp1: remove unecessary clocks Date: Tue, 20 Oct 2020 16:38:46 -0300 Message-Id: <20201020193850.1460644-6-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153925_895712_F4C09297 X-CRM114-Status: GOOD ( 11.50 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org aclk_isp_wrap is a child of aclk_isp, and hclk_isp_wrap is a child of hclk_isp, thus we can remove parents from the list. Also, for the isp0, we only need the ISP clock, ACLK and HCLK. In the future we'll need a pixel clock for RK3288 and RK3399, and a JPEG clock for RK3288. So with the goal to cleanup the dt-bindings and remove it from staging, simplify clock names to isp, aclk and hclk. Assigned clocks are meant to refer to the full path in the clock tree, i.e. the leaf in the tree. For instance, in RK3399, the clock responsible for ACLK (ISP AXI CLOCK) is aclk_isp0_wrapper. For reference, this is the isp clock topology on RK3399: xin24m pll_npll npll clk_isp1 clk_isp0 pll_cpll cpll aclk_isp1 aclk_isp1_noc hclk_isp1 aclk_isp1_wrapper hclk_isp1_noc aclk_isp0 hclk_isp1_wrapper aclk_isp0_wrapper aclk_isp0_noc hclk_isp0 hclk_isp0_wrapper hclk_isp0_noc pclkin_isp1_wrapper Signed-off-by: Helen Koike Reviewed-by: Tomasz Figa Reviewed-by: Rob Herring --- Changes in V6: - Define clocks in the top level, and use if/else schema to define how many for each compatible as sugested by Rob Herring on https://patchwork.linuxtv.org/project/linux-media/patch/20200722155533.252844-6-helen.koike@collabora.com/#122626 --- .../bindings/media/rockchip-isp1.yaml | 44 +++++++++++++------ drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++-- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index 62a6b9c959498..2004c054ed1a0 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -24,20 +24,24 @@ properties: maxItems: 1 clocks: + minItems: 3 items: + # isp0 and isp1 - description: ISP clock - - description: ISP AXI clock clock - - description: ISP AXI clock wrapper clock - - description: ISP AHB clock clock - - description: ISP AHB wrapper clock + - description: ISP AXI clock + - description: ISP AHB clock + # only for isp1 + - description: ISP Pixel clock clock-names: + minItems: 3 items: - - const: clk_isp - - const: aclk_isp - - const: aclk_isp_wrap - - const: hclk_isp - - const: hclk_isp_wrap + # isp0 and isp1 + - const: isp + - const: aclk + - const: hclk + # only for isp1 + - const: pclk_isp iommus: maxItems: 1 @@ -116,6 +120,20 @@ required: - power-domains - ports +if: + properties: + compatible: + contains: + const: rockchip,rk3399-cif-isp +then: + properties: + clocks: + minItems: 3 + maxItems: 4 + clock-names: + minItems: 3 + maxItems: 4 + additionalProperties: false examples: @@ -134,11 +152,9 @@ examples: reg = <0x0 0xff910000 0x0 0x4000>; interrupts = ; clocks = <&cru SCLK_ISP0>, - <&cru ACLK_ISP0>, <&cru ACLK_ISP0_WRAPPER>, - <&cru HCLK_ISP0>, <&cru HCLK_ISP0_WRAPPER>; - clock-names = "clk_isp", - "aclk_isp", "aclk_isp_wrap", - "hclk_isp", "hclk_isp_wrap"; + <&cru ACLK_ISP0_WRAPPER>, + <&cru HCLK_ISP0_WRAPPER>; + clock-names = "isp", "aclk", "hclk"; iommus = <&isp0_mmu>; phys = <&dphy>; phy-names = "dphy"; diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index 91584695804bb..90d6543465562 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -405,11 +405,9 @@ static irqreturn_t rkisp1_isr(int irq, void *ctx) } static const char * const rk3399_isp_clks[] = { - "clk_isp", - "aclk_isp", - "hclk_isp", - "aclk_isp_wrap", - "hclk_isp_wrap", + "isp", + "aclk", + "hclk", }; static const struct rkisp1_match_data rk3399_isp_clk_data = { From patchwork Tue Oct 20 19:38:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847769 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB85316C0 for ; Tue, 20 Oct 2020 19:40:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AED842225F for ; Tue, 20 Oct 2020 19:40:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Lc/sKryo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AED842225F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=t6pSgAkSV1CK5oXmcJSrWG4bXsiERlYJPgqoHjynlFM=; b=Lc/sKryo4zdQXU8GADzj7LSUB 1l7X07JoDvi86m+g+PpNcLX3grsKWTUk3u5USbhm4FDzd2RWAqSNmKAtu8EkVQ8KLdSMK3uSOeyze f7irtIJoFWt0XOXUjnRtLoQkgDzlPEQvgs4wiuQTc4aI46WD+gVreJ94jMggFKnkB/W4HTEUKadw2 rit6Cb0uuPIqO9q8UWLkFTnvATo7VzPq0HjyKmVp71pwq4c1rSrRzfFKaX4u4Ir3zR9O7YY7aHPk4 p+xszyB9XLku6juIndU0yB8+wN1eoL22wkHYcFgrVGHsXoIRYHief9AP3W0jSPUdvYCh0rPlyYh/p pHGFYk4Xg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxUC-0001M5-8Y; Tue, 20 Oct 2020 19:39:56 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTm-00018W-9Q for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:31 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 6F4E11F44DB5 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 6/9] dt-bindings: media: rkisp1: move rockchip-isp1 bindings out of staging Date: Tue, 20 Oct 2020 16:38:47 -0300 Message-Id: <20201020193850.1460644-7-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153930_475253_B71754D7 X-CRM114-Status: UNSURE ( 6.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Move rkisp1 bindings to Documentation/devicetree/bindings/media Verified with: make ARCH=arm64 dt_binding_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-isp1.yaml Signed-off-by: Helen Koike Acked-by: Rob Herring Reviewed-by: Tomasz Figa --- .../devicetree/bindings/media/rockchip-isp1.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {drivers/staging/media/rkisp1/Documentation => Documentation}/devicetree/bindings/media/rockchip-isp1.yaml (100%) diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/Documentation/devicetree/bindings/media/rockchip-isp1.yaml similarity index 100% rename from drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml rename to Documentation/devicetree/bindings/media/rockchip-isp1.yaml From patchwork Tue Oct 20 19:38:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847771 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 500BC14B7 for ; Tue, 20 Oct 2020 19:40:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 11BA32225F for ; Tue, 20 Oct 2020 19:40:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2c1F8Q+7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11BA32225F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ShbqF4XveMnO8FDputDPd80AybF9nRJRxLNKualrbDQ=; b=2c1F8Q+74RifCNwrZfRXzIc7S 4IvfrkLzObJragaKa/x1E5M0VQ4Pq/1pahZuHeiIQLYz5LCKiLji8NJqCJiwN3BU+Dn69sevm90yK phlabEwfK7NPMbwp98FOvKjX3JtOqfs2n3XWRNE7M8oKYNHuAId34Y6AQMsQpI3aXtnJs2dKhpCZU W3S2BU2v6BBVservMS0onSk3L74UcSTVODx+B4ZybyWgTiY++tTwaheNZV29GgFReq8KC2f8N3s6k DTSl2mdBpbvbXeE+KAzwcks7dyTEl9QOHFowvKVkoamGpCfYQuxxbe5/ZkukWqOCFFlHcarq4XBN8 wofrcIBRQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxUG-0001Nt-9q; Tue, 20 Oct 2020 19:40:00 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTq-0001BU-Nm for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:37 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id E230A1F44DC3 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 7/9] media: MAINTAINERS: rkisp1: add path to dt-bindings Date: Tue, 20 Oct 2020 16:38:48 -0300 Message-Id: <20201020193850.1460644-8-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153936_063659_033539B6 X-CRM114-Status: UNSURE ( 8.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org The Rockchip ISP bindings was moved out of staging. Update MAINTAINERS file with the new path. Fields sorted according to output of ./scripts/parse-maintainers.pl --input=MAINTAINERS --output=MAINTAINERS --order Signed-off-by: Helen Koike Reviewed-by: Tomasz Figa --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7a12633747c80..df679b3626b9a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14889,8 +14889,10 @@ ROCKCHIP ISP V1 DRIVER M: Helen Koike M: Dafna Hirschfeld L: linux-media@vger.kernel.org +L: linux-rockchip@lists.infradead.org S: Maintained F: Documentation/admin-guide/media/rkisp1.rst +F: Documentation/devicetree/bindings/media/rockchip-isp1.yaml F: Documentation/userspace-api/media/v4l/pixfmt-meta-rkisp1.rst F: drivers/staging/media/rkisp1/ From patchwork Tue Oct 20 19:38:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847773 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D662714B7 for ; Tue, 20 Oct 2020 19:40:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 979C52225D for ; Tue, 20 Oct 2020 19:40:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c/DVTk/H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 979C52225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Edo2eQQbgXJGzDMb93qAAp0ZjqcH/q7oHIV3hPjtlxs=; b=c/DVTk/HtxPsM6S427zTLFAK0 aawoF2bh6Mc4WuaBtSU6RV7JyyStksVJqTMg9+AieJiupIuPW3kFWDSNj788V2qgsFIZKxYHrwjwD iCYoSVjWpYjlseXTSh8f1pMdkCJdwn/SZNWd4AT4Y5ZhhshTpDPmIXPG9cFi7YjaOj6oTMDG84J+F cQ5wV9WRftoO9hlTc3hESOT8I3uPfu0+VHvDeISEQLyrhEKe3BGnIdxjxZAoteYXvdDluCQhJSQu9 imsOfvwpUssa5SgJ2Y7I/j+wRBotUMFgheVxGDN3koKLqGP6lG7F/BTt7PUAb5EsnLTI2Qkbzzs4Q eO5DuNPag==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxUP-0001ST-8d; Tue, 20 Oct 2020 19:40:09 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTv-0001DY-HE for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:42 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 64CF51F44DB5 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 8/9] arm64: dts: rockchip: add isp0 node for rk3399 Date: Tue, 20 Oct 2020 16:38:49 -0300 Message-Id: <20201020193850.1460644-9-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153939_813138_76504A13 X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org From: Shunqian Zheng RK3399 has two ISPs, but only isp0 was tested. Add isp0 node in rk3399 dtsi Verified with: make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/media/rockchip-isp1.yaml Signed-off-by: Shunqian Zheng Signed-off-by: Jacob Chen Signed-off-by: Helen Koike --- Changes in v6: - Add status = "disabled" in the isp0 node --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index ada724b12f014..af5f8e2c5e64d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1723,6 +1723,32 @@ vopb_mmu: iommu@ff903f00 { status = "disabled"; }; + isp0: isp0@ff910000 { + compatible = "rockchip,rk3399-cif-isp"; + reg = <0x0 0xff910000 0x0 0x4000>; + interrupts = ; + clocks = <&cru SCLK_ISP0>, + <&cru ACLK_ISP0_WRAPPER>, + <&cru HCLK_ISP0_WRAPPER>; + clock-names = "isp", "aclk", "hclk"; + iommus = <&isp0_mmu>; + phys = <&mipi_dphy_rx0>; + phy-names = "dphy"; + power-domains = <&power RK3399_PD_ISP0>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + }; + }; + }; + isp0_mmu: iommu@ff914000 { compatible = "rockchip,iommu"; reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>; From patchwork Tue Oct 20 19:38:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 11847775 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8832414B7 for ; Tue, 20 Oct 2020 19:40:22 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B1BD2225D for ; Tue, 20 Oct 2020 19:40:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Z9ldiuqF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B1BD2225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3uZ86X5vdf8XWawou78ULL+2zxZ+G4OQfwl6RU78AaI=; b=Z9ldiuqFWRRTZ31+jWGNVp9m4 pYAvhzSbZSl9CxkWkCNFI0WjkefWb+KktlGJvD0ZvSBAX0NeKDkbuivzsIi/72X5XbNMpdRXe1zh7 n2nay+VN8MitghBCCNLGi747MlOtWczLN+tXhZA3bBhS1Q9Inc+jQqrVPNJqkhig3TUJzLskjieOg 1KQ4I8AVrScG6/cPxXHALwdsBEAxjv6V66cDP80mm2BSVjPj4VkUXQl54bHTv47U0pOvmAHiCWvVi Fbpac8dJPRYaftFwgo3G66eZwmxR8oM2zPv6TAzhjKTYQ8NBH5oe9NY2i6OD+nPvPiTu5cA+lzXvR Up8h6Zm1g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxUS-0001V7-LW; Tue, 20 Oct 2020 19:40:12 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUxTz-0001GV-TJ for linux-rockchip@lists.infradead.org; Tue, 20 Oct 2020 19:39:45 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id 15D721F44DF2 From: Helen Koike To: linux-media@vger.kernel.org Subject: [PATCH v6 9/9] arm64: dts: rockchip: add isp and sensors for Scarlet Date: Tue, 20 Oct 2020 16:38:50 -0300 Message-Id: <20201020193850.1460644-10-helen.koike@collabora.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020193850.1460644-1-helen.koike@collabora.com> References: <20201020193850.1460644-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_153944_074579_927227EE X-CRM114-Status: UNSURE ( 9.56 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org, eddie.cai.linux@gmail.com, dafna.hirschfeld@collabora.com, heiko@sntech.de, robin.murphy@arm.com, linux-kernel@vger.kernel.org, karthik.poduval@gmail.com, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, hverkuil-cisco@xs4all.nl, mark.rutland@arm.com, kernel@collabora.com, zhengsq@rock-chips.com, jbx6244@gmail.com Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org From: Eddie Cai Enable ISP and camera sensor ov2685 and ov5695 for Scarlet Chromebook Verified with: make ARCH=arm64 dtbs_check Signed-off-by: Shunqian Zheng Signed-off-by: Eddie Cai Signed-off-by: Tomasz Figa Signed-off-by: Helen Koike Reviewed-by: Tomasz Figa --- .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi index 60cd1c18cd4e0..beee5fbb34437 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -296,6 +296,52 @@ camera: &i2c7 { /* 24M mclk is shared between world and user cameras */ pinctrl-0 = <&i2c7_xfer &test_clkout1>; + + /* Rear-facing camera */ + wcam: camera@36 { + compatible = "ovti,ov5695"; + reg = <0x36>; + pinctrl-names = "default"; + pinctrl-0 = <&wcam_rst>; + + clocks = <&cru SCLK_TESTCLKOUT1>; + clock-names = "xvclk"; + + avdd-supply = <&pp2800_cam>; + dvdd-supply = <&pp1250_cam>; + dovdd-supply = <&pp1800_s0>; + reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; + + port { + wcam_out: endpoint { + remote-endpoint = <&mipi_in_wcam>; + data-lanes = <1 2>; + }; + }; + }; + + /* Front-facing camera */ + ucam: camera@3c { + compatible = "ovti,ov2685"; + reg = <0x3c>; + pinctrl-names = "default"; + pinctrl-0 = <&ucam_rst>; + + clocks = <&cru SCLK_TESTCLKOUT1>; + clock-names = "xvclk"; + + avdd-supply = <&pp2800_cam>; + dovdd-supply = <&pp1800_s0>; + dvdd-supply = <&pp1800_s0>; + reset-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + + port { + ucam_out: endpoint { + remote-endpoint = <&mipi_in_ucam>; + data-lanes = <1>; + }; + }; + }; }; &cdn_dp { @@ -353,10 +399,38 @@ &io_domains { gpio1830-supply = <&pp1800_s0>; /* APIO4_VDD; 4c 4d */ }; +&isp0 { + status = "okay"; + + ports { + port@0 { + mipi_in_wcam: endpoint@0 { + reg = <0>; + remote-endpoint = <&wcam_out>; + data-lanes = <1 2>; + }; + + mipi_in_ucam: endpoint@1 { + reg = <1>; + remote-endpoint = <&ucam_out>; + data-lanes = <1>; + }; + }; + }; +}; + +&isp0_mmu { + status = "okay"; +}; + &max98357a { sdmode-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; }; +&mipi_dphy_rx0 { + status = "okay"; +}; + &mipi_dsi { status = "okay"; clock-master;