From patchwork Thu Oct 3 15:48:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11172787 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 10B5A76 for ; Thu, 3 Oct 2019 15:48:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E08D021848 for ; Thu, 3 Oct 2019 15:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570117730; bh=EE5Bkv2KoKRIFlmamCmZbMdsVL5JyAd3sPSGmn2juVw=; h=From:To:Cc:Subject:Date:List-ID:From; b=RiKCEe29Rt8xm1bJkIQZEkI0/mdzMOMTKElYgoWtX3rqfF0rquAr8b0tdI94E2kFk IBXyXKz5OLIWC1O94e7hDuoOiyKaeCNLq14f6dgJPtR20Afr6fAr09BLlEHSBApUVz GcJ9TMI1sS9ulfFfM7phBs4a947vISg6PPqoeYP8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729414AbfJCPss (ORCPT ); Thu, 3 Oct 2019 11:48:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:59866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbfJCPss (ORCPT ); Thu, 3 Oct 2019 11:48:48 -0400 Received: from localhost (lfbn-1-10718-76.w90-89.abo.wanadoo.fr [90.89.68.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3254F20700; Thu, 3 Oct 2019 15:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570117727; bh=EE5Bkv2KoKRIFlmamCmZbMdsVL5JyAd3sPSGmn2juVw=; h=From:To:Cc:Subject:Date:From; b=2D6q22KuDwlYJSH/zY34xSvhG1V8aH5Pp5Vv15e0d4oVlTmox4zctkuwpyOIJ2gmp Ds65RRu4HgPfQgYb37LQYbBOdkDyIP9lbkH6DB94aYna5/+J+q9K9UTM6jm3Ir5xdu leTV3pra1o7uzm6dOrYhYnZ4CPEI0yExBAyx8XZ4= From: Maxime Ripard To: Mark Rutland , Rob Herring , Frank Rowand , sakari.ailus@linux.intel.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 1/2] dt-bindings: media: sun4i-csi: Drop the module clock Date: Thu, 3 Oct 2019 17:48:41 +0200 Message-Id: <20191003154842.248763-1-mripard@kernel.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org It turns out that what was thought to be the module clock was actually the clock meant to be used by the sensor, and isn't playing any role with the CSI controller itself. Let's drop that clock from our binding. Fixes: c5e8f4ccd775 ("media: dt-bindings: media: Add Allwinner A10 CSI binding") Reported-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- .../devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml index 5dd1cf490cd9..d3e423fcb6c2 100644 --- a/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml +++ b/Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml @@ -27,14 +27,12 @@ properties: clocks: items: - description: The CSI interface clock - - description: The CSI module clock - description: The CSI ISP clock - description: The CSI DRAM clock clock-names: items: - const: bus - - const: mod - const: isp - const: ram @@ -89,9 +87,8 @@ examples: compatible = "allwinner,sun7i-a20-csi0"; reg = <0x01c09000 0x1000>; interrupts = ; - clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>, - <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; - clock-names = "bus", "mod", "isp", "ram"; + clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; + clock-names = "bus", "isp", "ram"; resets = <&ccu RST_CSI0>; port { From patchwork Thu Oct 3 15:48:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 11172789 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 6ABC113B1 for ; Thu, 3 Oct 2019 15:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37052222C7 for ; Thu, 3 Oct 2019 15:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570117733; bh=F5+Id2+i4uSkOnDF22aTVmR46OVB1/MDlfPr46K2ROk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XOq4yCgZY24oE2aC3rVzFldjyp4JbkudlfQXEuaSrdI+IkEY840cntK5j6CPhFVwG 4wjFpn0sAs1Jiw6DuImE7zu4G3C61u0JetkTh62govCcIk8/7Zq/xnAffmgCzQy7O+ 6JsaU1riB9JU7NSyWZI/f9vEJj5IPffgPxMHaog8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729528AbfJCPsw (ORCPT ); Thu, 3 Oct 2019 11:48:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:59970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbfJCPsw (ORCPT ); Thu, 3 Oct 2019 11:48:52 -0400 Received: from localhost (lfbn-1-10718-76.w90-89.abo.wanadoo.fr [90.89.68.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 491F920700; Thu, 3 Oct 2019 15:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570117731; bh=F5+Id2+i4uSkOnDF22aTVmR46OVB1/MDlfPr46K2ROk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eJmp3yq38oxw9CiZZkmwvg/ssf1SpaEMEirw53bQ8mbE3FmHpz6b9JFgOIWtXquUG H1HbPagLs3aV5GbnWnj9Xxpl5vBdgUSoqCCQXZjjU4glX1xVWWhw3XE5+6Me8JmLv8 PmUbPR63eYgFpR+vQyjYAEuu1Rq21fVB5l2wlbjM= From: Maxime Ripard To: Mark Rutland , Rob Herring , Frank Rowand , sakari.ailus@linux.intel.com, mchehab@kernel.org Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 2/2] ARM: dts: sun7i: Drop the module clock from the device tree Date: Thu, 3 Oct 2019 17:48:42 +0200 Message-Id: <20191003154842.248763-2-mripard@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154842.248763-1-mripard@kernel.org> References: <20191003154842.248763-1-mripard@kernel.org> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org What we thought would be the module clock is actually the clock meant to be used by the sensors, and play no role in the CSI controller. Now that the binding has been updated to reflect that, let's update the device tree too. Fixes: d2b9c6444301 ("ARM: dts: sun7i: Add CSI0 controller") Reported-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- arch/arm/boot/dts/sun7i-a20.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 874231be04e4..8aebefd6accf 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -380,9 +380,8 @@ compatible = "allwinner,sun7i-a20-csi0"; reg = <0x01c09000 0x1000>; interrupts = ; - clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>, - <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; - clock-names = "bus", "mod", "isp", "ram"; + clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; + clock-names = "bus", "isp", "ram"; resets = <&ccu RST_CSI0>; status = "disabled"; };