From patchwork Thu Apr 2 19:45:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 62774 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jK5jg-003gGj-6b; Thu, 02 Apr 2020 19:42:44 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729123AbgDBTpW (ORCPT + 1 other); Thu, 2 Apr 2020 15:45:22 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46372 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBTpW (ORCPT ); Thu, 2 Apr 2020 15:45:22 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id BF10F290B60 From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Hans Verkuil , Helen Koike , Robin Murphy , Ezequiel Garcia Subject: [PATCH v2 1/3] rkisp1: Get rid of unused variable warning Date: Thu, 2 Apr 2020 16:45:02 -0300 Message-Id: <20200402194504.5331-2-ezequiel@collabora.com> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <20200402194504.5331-1-ezequiel@collabora.com> References: <20200402194504.5331-1-ezequiel@collabora.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org If CONFIG_OF is not selected, the compiler will complain: drivers/staging/media/rkisp1/rkisp1-dev.c: In function ‘rkisp1_probe’: drivers/staging/media/rkisp1/rkisp1-dev.c:457:22: warning: unused variable ‘node’ [-Wunused-variable] 457 | struct device_node *node = pdev->dev.of_node; Rework the code slightly and make the compiler happy. Suggested-by: Robin Murphy Signed-off-by: Ezequiel Garcia Acked-by: Helen Koike --- drivers/staging/media/rkisp1/rkisp1-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index b1b3c058e957..3f6285709352 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -454,16 +454,17 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1) static int rkisp1_probe(struct platform_device *pdev) { - struct device_node *node = pdev->dev.of_node; const struct rkisp1_match_data *clk_data; - const struct of_device_id *match; struct device *dev = &pdev->dev; struct rkisp1_device *rkisp1; struct v4l2_device *v4l2_dev; unsigned int i; int ret, irq; - match = of_match_node(rkisp1_of_match, node); + clk_data = of_device_get_match_data(&pdev->dev); + if (!clk_data) + return -ENODEV; + rkisp1 = devm_kzalloc(dev, sizeof(*rkisp1), GFP_KERNEL); if (!rkisp1) return -ENOMEM; @@ -487,7 +488,6 @@ static int rkisp1_probe(struct platform_device *pdev) } rkisp1->irq = irq; - clk_data = match->data; for (i = 0; i < clk_data->size; i++) rkisp1->clks[i].id = clk_data->clks[i]; From patchwork Thu Apr 2 19:45:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 62775 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jK5jk-003gH4-KM; Thu, 02 Apr 2020 19:42:48 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388995AbgDBTp0 (ORCPT + 1 other); Thu, 2 Apr 2020 15:45:26 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46380 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBTp0 (ORCPT ); Thu, 2 Apr 2020 15:45:26 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id AA618295BF1 From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Hans Verkuil , Helen Koike , Robin Murphy , Ezequiel Garcia Subject: [PATCH v2 2/3] phy-rockchip-dphy-rx0: Drop unneeded CONFIG_OF dependency Date: Thu, 2 Apr 2020 16:45:03 -0300 Message-Id: <20200402194504.5331-3-ezequiel@collabora.com> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <20200402194504.5331-1-ezequiel@collabora.com> References: <20200402194504.5331-1-ezequiel@collabora.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The driver is perfectly capable of being built without CONFIG_OF. Remove this dependency, which is useful for compile-only tests. Signed-off-by: Ezequiel Garcia Acked-by: Helen Koike --- drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig index bd0147624de1..fb74df829371 100644 --- a/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig +++ b/drivers/staging/media/phy-rockchip-dphy-rx0/Kconfig @@ -2,7 +2,7 @@ config PHY_ROCKCHIP_DPHY_RX0 tristate "Rockchip MIPI Synopsys DPHY RX0 driver" - depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF + depends on ARCH_ROCKCHIP || COMPILE_TEST select GENERIC_PHY_MIPI_DPHY select GENERIC_PHY help From patchwork Thu Apr 2 19:45:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 62776 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1jK5jo-003gHK-Hf; Thu, 02 Apr 2020 19:42:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389112AbgDBTpa (ORCPT + 1 other); Thu, 2 Apr 2020 15:45:30 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46388 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBTpa (ORCPT ); Thu, 2 Apr 2020 15:45:30 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id B971128A9AD From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Hans Verkuil , Helen Koike , Robin Murphy , Ezequiel Garcia Subject: [PATCH v2 3/3] rkisp1: Fix wrong PHY config dependency Date: Thu, 2 Apr 2020 16:45:04 -0300 Message-Id: <20200402194504.5331-4-ezequiel@collabora.com> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <20200402194504.5331-1-ezequiel@collabora.com> References: <20200402194504.5331-1-ezequiel@collabora.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Instead of depending on the Rockchip PHY driver the ISP driver should really depend on CONFIG_GENERIC_PHY_MIPI_DPHY, given all it needs is the phy_mipi_dphy_get_default_config() symbol. Fix it. Signed-off-by: Ezequiel Garcia Acked-by: Helen Koike --- drivers/staging/media/rkisp1/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkisp1/Kconfig b/drivers/staging/media/rkisp1/Kconfig index b859a493caba..e3ba6826fbb0 100644 --- a/drivers/staging/media/rkisp1/Kconfig +++ b/drivers/staging/media/rkisp1/Kconfig @@ -7,7 +7,7 @@ config VIDEO_ROCKCHIP_ISP1 select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_VMALLOC select V4L2_FWNODE - select PHY_ROCKCHIP_DPHY_RX0 + select GENERIC_PHY_MIPI_DPHY default n help Enable this to support the Image Signal Processing (ISP) module