From patchwork Fri Feb 8 14:52:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10803237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C887513B5 for ; Fri, 8 Feb 2019 14:53:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7DE32E6E1 for ; Fri, 8 Feb 2019 14:53:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB7AE2E6EA; Fri, 8 Feb 2019 14:53:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B2152E6E8 for ; Fri, 8 Feb 2019 14:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727797AbfBHOxC (ORCPT ); Fri, 8 Feb 2019 09:53:02 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:42536 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726813AbfBHOxC (ORCPT ); Fri, 8 Feb 2019 09:53:02 -0500 Received: by mail-pl1-f194.google.com with SMTP id s1so1783907plp.9 for ; Fri, 08 Feb 2019 06:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=soC6E4l0050itrBl5bDRGiK/SYtRT65nFYPm5R+cUJE=; b=S7qTkT4Zlh3ru/VE90IUrIHIkZiQJHU8dGsCizQn2XQZ3HvcptIaWhISYj5AncZLza u1/zWzi42IPyVZhiJICnFm6DJ52tk56DBlcFkhHpumX61Gzdm6q48MtoXTcLA3xeEey/ nC7ULveJkPb313D3dlNIV+GPSqVYrfLz4I3vTBHTJwRcF356dpLf8ZUSf0P2VYu9pGIo edrPhpF/zluaNyzTLTNUW38zdxjzI8msrAY7Qi7GTF+Osx8JOat3/3SHMOcPAAiIgMpF FwqTPpsGbr6uNY/91g9hCS7v4HLiyrOfukWASXOHuejEdziM2R2KRIQ2Jgg0XvzoNGPs MLMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=soC6E4l0050itrBl5bDRGiK/SYtRT65nFYPm5R+cUJE=; b=BV88Wo7fY6wRf7sBo7rGgoFbtpNev6RhLRVU2OehwSVbcQZLajsq35e46ISUfcNd7G 687+qxb1QVNUilyowJ2L9D6tfn0VU0EHkBNJH8ipcY+bvWf8fR40WmwYc31EQEhrcrws rhv/EgGegC2qopTLhW9QHq8M62ukIzUG0S3tsT9s50ycytRS65lNzGLR4k1JH1Mw8tF+ +PWUZ1n94taaQ+IZrT+WPv9PkX9v8EYuDxN+8aQb9fB47kG8b2KTKpUUjoMSDByR09AK 083lH4Z6KIEp5lhKxHvbIhxsPHWtbp6BZTUDlERV28Qu1sa6+W8lx2aqhc1l610039G5 ybug== X-Gm-Message-State: AHQUAuYnCXR/5YR3eybhGjI/0W5PvosBHwUZwW1uwX2LUBOce/AOJZEz kAe3WXQeR96X1kZ/BHbrARbtQrrheIk= X-Google-Smtp-Source: AHgI3IYHgoqGegW8k8bnqmFC4CwKoh8/y61T2rpqWSMdyKyo2CNz5ro0JL3kJx86K4qVOUUQ+tp2HA== X-Received: by 2002:a17:902:f091:: with SMTP id go17mr23460556plb.235.1549637581777; Fri, 08 Feb 2019 06:53:01 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:9dad:5819:2ad0:da6f]) by smtp.gmail.com with ESMTPSA id s79sm3425216pgs.50.2019.02.08.06.53.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 06:53:01 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 1/4] media: ov2640: add VIDEO_V4L2_SUBDEV_API dependency Date: Fri, 8 Feb 2019 23:52:42 +0900 Message-Id: <1549637565-32096-2-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> References: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver currently supports MC and V4L2 sub-device uAPI, so add related dependency and remove unneeded ifdefs. Just adding VIDEO_V4L2_SUBDEV_API dependency is enough, because VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER. Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/ov2640.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index be8166d..12d7e52 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -652,7 +652,7 @@ config VIDEO_IMX355 config VIDEO_OV2640 tristate "OmniVision OV2640 sensor support" - depends on VIDEO_V4L2 && I2C + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT help This is a Video4Linux2 sensor driver for the OmniVision diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c index 83031cf..22782e62 100644 --- a/drivers/media/i2c/ov2640.c +++ b/drivers/media/i2c/ov2640.c @@ -298,9 +298,7 @@ struct ov2640_win_size { struct ov2640_priv { struct v4l2_subdev subdev; -#if defined(CONFIG_MEDIA_CONTROLLER) struct media_pad pad; -#endif struct v4l2_ctrl_handler hdl; u32 cfmt_code; struct clk *clk; @@ -927,13 +925,9 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd, return -EINVAL; if (format->which == V4L2_SUBDEV_FORMAT_TRY) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API mf = v4l2_subdev_get_try_format(sd, cfg, 0); format->format = *mf; return 0; -#else - return -ENOTTY; -#endif } mf->width = priv->win->width; @@ -1010,7 +1004,6 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd, static int ov2640_init_cfg(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API struct v4l2_mbus_framefmt *try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0); const struct ov2640_win_size *win = @@ -1024,7 +1017,7 @@ static int ov2640_init_cfg(struct v4l2_subdev *sd, try_fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; try_fmt->quantization = V4L2_QUANTIZATION_DEFAULT; try_fmt->xfer_func = V4L2_XFER_FUNC_DEFAULT; -#endif + return 0; } @@ -1245,13 +1238,12 @@ static int ov2640_probe(struct i2c_client *client, ret = priv->hdl.error; goto err_hdl; } -#if defined(CONFIG_MEDIA_CONTROLLER) + priv->pad.flags = MEDIA_PAD_FL_SOURCE; priv->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR; ret = media_entity_pads_init(&priv->subdev.entity, 1, &priv->pad); if (ret < 0) goto err_hdl; -#endif ret = ov2640_video_probe(client); if (ret < 0) From patchwork Fri Feb 8 14:52:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10803239 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5FF71575 for ; Fri, 8 Feb 2019 14:53:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B573F2E6E1 for ; Fri, 8 Feb 2019 14:53:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A98B62E6EA; Fri, 8 Feb 2019 14:53:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9CCC2E6E1 for ; Fri, 8 Feb 2019 14:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727814AbfBHOxF (ORCPT ); Fri, 8 Feb 2019 09:53:05 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38983 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727479AbfBHOxF (ORCPT ); Fri, 8 Feb 2019 09:53:05 -0500 Received: by mail-pg1-f193.google.com with SMTP id r11so1676023pgp.6 for ; Fri, 08 Feb 2019 06:53:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y23HW3DG8+piGfD7AMC056053ljBU2/Aa3AAn1dICDc=; b=NRTwqlgFmnM0WA7Gm8QIgxTWaBXIeKqQIY7ZmqTAJU8N7tByulbNj/+M3mNfPI7iWD zB6q+4aPRMkF7ZHCr1VQHl29gq3sFnaUw0hsNwzXcOupAYcPzXHua7VWyQMNBuvm+gMb ysb0q0ubFdpa/MfqiDUSty3B09UgaefeYe/9knioagGvklJpWHANySdzhn5xcVjnaUEu 6eCZ7jOHuF2VmTNC1lP3KfQwxsK8h6+c1WQwwgU2YxPF7QsvP2ekstKWf0wnZ/Q0OCfn Rz4kUMnNZSzSf+qucLdYWURpp+I9ypMfoxFOO4DAG0D9KUA6O0RgxKQSk59OpTa3PA5M ru8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y23HW3DG8+piGfD7AMC056053ljBU2/Aa3AAn1dICDc=; b=umcw6pI4NUOoi8lU1+dzAzizBgwIh/FWgWOT9gJHGMopQW2KGF6PJ/UYzg6qp+rTh9 MPj2wBsDpWFU41KTciVXFzf0hWgHK+sTNJngjw1FVmi6A1kneNIdTxtGXb4S4EDY53ar w25B3aO23ITRiRQFtLgf3Zbd9Jk2n4KbbJx+bO6s/yTi/F53agxf9SMhIIg1gsgksMWe Jo1XUxWCyK9qr/OhXLqwt2S8UxeyJCIvO5J+9S+1TmthtZ+/4TzYgNkenteLac226F2z ERBXKu96SYvH6p0c0Yu62z8utGxm7LGRpl5c0XjRhm1JAbDxTJ8sfeKMuEOxGg+F6hB5 KdTQ== X-Gm-Message-State: AHQUAuZyvlM7xMWfzAmSdGKvLbsjVToTTzC92J/Z6xl+Yc2uuSW7E7/P q3zhJ+U+JkGb23B8dMxV5/WLT04Yvu8= X-Google-Smtp-Source: AHgI3IYJkUFsm5zziUnIhJBNyH1eZ1XDgtkzzijEDrJ99Hmj6iVFV0I7bsJHjdOPxGRdawSTnARU/w== X-Received: by 2002:a63:4566:: with SMTP id u38mr20585106pgk.4.1549637584215; Fri, 08 Feb 2019 06:53:04 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:9dad:5819:2ad0:da6f]) by smtp.gmail.com with ESMTPSA id s79sm3425216pgs.50.2019.02.08.06.53.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 06:53:03 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Enrico Scholz , Michael Grzeschik , Marco Felsch , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 2/4] media: mt9m111: add VIDEO_V4L2_SUBDEV_API dependency Date: Fri, 8 Feb 2019 23:52:43 +0900 Message-Id: <1549637565-32096-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> References: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver currently supports MC and V4L2 sub-device uAPI, so add related dependency and remove unneeded ifdefs. Just adding VIDEO_V4L2_SUBDEV_API dependency is enough, because VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER. Suggested-by: Marco Felsch Cc: Enrico Scholz Cc: Michael Grzeschik Cc: Marco Felsch Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/mt9m111.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 12d7e52..71c7433 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -876,7 +876,7 @@ config VIDEO_MT9M032 config VIDEO_MT9M111 tristate "mt9m111, mt9m112 and mt9m131 support" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API select V4L2_FWNODE help This driver supports MT9M111, MT9M112 and MT9M131 cameras from diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c index 5168bb5..55e2f46 100644 --- a/drivers/media/i2c/mt9m111.c +++ b/drivers/media/i2c/mt9m111.c @@ -246,9 +246,7 @@ struct mt9m111 { bool is_streaming; /* user point of view - 0: falling 1: rising edge */ unsigned int pclk_sample:1; -#ifdef CONFIG_MEDIA_CONTROLLER struct media_pad pad; -#endif }; static const struct mt9m111_mode_info mt9m111_mode_data[MT9M111_NUM_MODES] = { @@ -529,13 +527,9 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd, return -EINVAL; if (format->which == V4L2_SUBDEV_FORMAT_TRY) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API mf = v4l2_subdev_get_try_format(sd, cfg, format->pad); format->format = *mf; return 0; -#else - return -ENOTTY; -#endif } mf->width = mt9m111->width; @@ -1109,7 +1103,6 @@ static int mt9m111_s_stream(struct v4l2_subdev *sd, int enable) static int mt9m111_init_cfg(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API struct v4l2_mbus_framefmt *format = v4l2_subdev_get_try_format(sd, cfg, 0); @@ -1121,7 +1114,7 @@ static int mt9m111_init_cfg(struct v4l2_subdev *sd, format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; format->quantization = V4L2_QUANTIZATION_DEFAULT; format->xfer_func = V4L2_XFER_FUNC_DEFAULT; -#endif + return 0; } @@ -1293,13 +1286,11 @@ static int mt9m111_probe(struct i2c_client *client, goto out_clkput; } -#ifdef CONFIG_MEDIA_CONTROLLER mt9m111->pad.flags = MEDIA_PAD_FL_SOURCE; mt9m111->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR; ret = media_entity_pads_init(&mt9m111->subdev.entity, 1, &mt9m111->pad); if (ret < 0) goto out_hdlfree; -#endif mt9m111->current_mode = &mt9m111_mode_data[MT9M111_MODE_SXGA_15FPS]; mt9m111->frame_interval.numerator = 1; @@ -1328,10 +1319,8 @@ static int mt9m111_probe(struct i2c_client *client, return 0; out_entityclean: -#ifdef CONFIG_MEDIA_CONTROLLER media_entity_cleanup(&mt9m111->subdev.entity); out_hdlfree: -#endif v4l2_ctrl_handler_free(&mt9m111->hdl); out_clkput: v4l2_clk_put(mt9m111->clk); From patchwork Fri Feb 8 14:52:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10803241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D2BE1575 for ; Fri, 8 Feb 2019 14:53:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DA0A2E6E1 for ; Fri, 8 Feb 2019 14:53:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81EDA2E6EA; Fri, 8 Feb 2019 14:53:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29F0F2E6E1 for ; Fri, 8 Feb 2019 14:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727880AbfBHOxH (ORCPT ); Fri, 8 Feb 2019 09:53:07 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42277 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727843AbfBHOxH (ORCPT ); Fri, 8 Feb 2019 09:53:07 -0500 Received: by mail-pg1-f195.google.com with SMTP id d72so1668567pga.9 for ; Fri, 08 Feb 2019 06:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/S7xeBAaTJUtky1AToQ6NgqeQkJGdgz6lYT//XDxgf0=; b=ufRRKngeZ5mfglrH9Ye72o6My8gonAxiiactzSxEqPWKL8Qd9AoBhKkXUfCKDymXUA BdyRVcmaIdHHJYINee8NxLxgu2jEYjA9ojkoVbOz/Pq/awDsNWsPMeG79fjaIbvel2t4 ba1GfAw9UUmpHf5jY8x3LfZ/sEYoP01Py5FPOl2ydKDjGEM3xBMFCmbpo/Uw96Uil/9y MYsOfx0JBupJZJqoLL2yaieDq/thrPkmsSTonG7JAbhkLYTuMg0Nr+6v3LdiFgARMGj4 JUcAZZYZbUh4ozCOt/fb8KG2Bsl5uZ7w9YHB5PTkILSdjQKrkxtQupwVBAYDqUJvDPbz HZZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/S7xeBAaTJUtky1AToQ6NgqeQkJGdgz6lYT//XDxgf0=; b=g9M9gCudzBpk4aIyizWoC+7/71ZWsC3bMngw7F7tu6TXtkYZOcMTJLdeLKDzf37J6Y O+qm+juig4GOxt58mZy1d7qQu3cb4Q1ic0cPSApL6sNRDv67TtjJgaVF5NRhd17lR2/4 /1B7NlI0GqwIUqTk+9D25vcGT5kF0frfv6PLfW0uU4d3GUYa+6J+1h7N6f0Fl5cLtbRy VDNZDdb+PSJ7HS+9dMgm5hU5Ln8MZD7CPmwXnBBOU53OvKDaKPHNeyIVEnI5gi0rm/FB hH7Ee32re4CiUzKB12BuXvDL33DOtBGXMgNHqNvLZx6MfPMw1+OGlFFQwvEfS0Qaq9/y N7WQ== X-Gm-Message-State: AHQUAubPnwMob6tcHpZCk7vA0sO4GUrU/y24LBEj5gnEK065oLGZv6U1 NNZkYEPegQ41SmGnLAqaAIhvoxx3FCo= X-Google-Smtp-Source: AHgI3IYqcVuy84X1HFsNkCQllkZlc1zyQ1lX/jsB4lizN0bwIT5XA2JmabkufpAOE9zE8nsKFySvvA== X-Received: by 2002:a63:fd07:: with SMTP id d7mr5404686pgh.163.1549637586049; Fri, 08 Feb 2019 06:53:06 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:9dad:5819:2ad0:da6f]) by smtp.gmail.com with ESMTPSA id s79sm3425216pgs.50.2019.02.08.06.53.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 06:53:05 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 3/4] media: i2c: add missing MEDIA_CAMERA_SUPPORT Date: Fri, 8 Feb 2019 23:52:44 +0900 Message-Id: <1549637565-32096-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> References: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The camera sensor drivers should depend on MEDIA_CAMERA_SUPPORT so that we don't see unnecessary menu options. Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/Kconfig | 4 ++++ drivers/media/i2c/et8ek8/Kconfig | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 71c7433..73eeb17 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -823,6 +823,7 @@ config VIDEO_OV7740 config VIDEO_OV9650 tristate "OmniVision OV9650/OV9652 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT select REGMAP_SCCB ---help--- This is a V4L2 sensor driver for the Omnivision @@ -877,6 +878,7 @@ config VIDEO_MT9M032 config VIDEO_MT9M111 tristate "mt9m111, mt9m112 and mt9m131 support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT select V4L2_FWNODE help This driver supports MT9M111, MT9M112 and MT9M131 cameras from @@ -986,6 +988,7 @@ config VIDEO_S5K6A3 config VIDEO_S5K4ECGX tristate "Samsung S5K4ECGX sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT select CRC32 ---help--- This is a V4L2 sensor driver for Samsung S5K4ECGX 5M @@ -994,6 +997,7 @@ config VIDEO_S5K4ECGX config VIDEO_S5K5BAF tristate "Samsung S5K5BAF sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT select V4L2_FWNODE ---help--- This is a V4L2 sensor driver for Samsung S5K5BAF 2M diff --git a/drivers/media/i2c/et8ek8/Kconfig b/drivers/media/i2c/et8ek8/Kconfig index 9fe409e..14b6732 100644 --- a/drivers/media/i2c/et8ek8/Kconfig +++ b/drivers/media/i2c/et8ek8/Kconfig @@ -1,6 +1,7 @@ config VIDEO_ET8EK8 tristate "ET8EK8 camera sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on MEDIA_CAMERA_SUPPORT select V4L2_FWNODE ---help--- This is a driver for the Toshiba ET8EK8 5 MP camera sensor. From patchwork Fri Feb 8 14:52:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10803243 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BFF613B5 for ; Fri, 8 Feb 2019 14:53:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CEDB2E6E1 for ; Fri, 8 Feb 2019 14:53:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2135B2E6EA; Fri, 8 Feb 2019 14:53:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF00B2E6E1 for ; Fri, 8 Feb 2019 14:53:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727922AbfBHOxJ (ORCPT ); Fri, 8 Feb 2019 09:53:09 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:32840 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727843AbfBHOxJ (ORCPT ); Fri, 8 Feb 2019 09:53:09 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so1786105pfb.0 for ; Fri, 08 Feb 2019 06:53:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+vQIvwaVLnJA1QF80FFX3nvXI4vUF8xq+erNRgM0s98=; b=jpabZfitwpGja84KxoqN/Jp5ylLllTRYu7OI8LncGmFPyHSoruKc7Ptk58UC42Ct12 htfu4ZNNOjstrCLCpbQeMWf0iZgoOhODadq9agkQknQa+/kOXqE3nJmy/0Q4Er2hZ/hs rYtKTlcKq/WAk7AflF71LFUXJI+JDcGrl7+U+AKyDIbmptEmpQJX+San1/R2kukfasPT 2GFdpL93f3bKCmlt58eHTzVxSYcHC/FMV1CgbkqwSctR/002LKlz7xaGPcM80Lsu9J2T Z6017b249JL1npW0mY6523YCZcbkFTGHlIUV8Qfcucy94SUtTtUy+rUMr8gmNB3YVwIg W+mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+vQIvwaVLnJA1QF80FFX3nvXI4vUF8xq+erNRgM0s98=; b=QqP/W+4UMbCctII20aLGpSXKhu8H8I9/HCRzUI4Hdn1PPDGyDtqd4HF2wnwbdC2u+V 1/SCEF2hNwfJrUqkAT4ENb0yVIsYT+IYmmHVAUG9wdTVSmhCnOhAdYpmT2otO6anrhiW oQUXNq0R7fZpXjJA88NaoacFGhC20TXZDA01ZswBk0pnHlWv0oP1Yieax0UQOMo/xO4m w/1kflfj4pcee6GaF2rFFDHpPmvq0d0qebEQogMsbAHTH3hRApQpFaYF4HX66y3irz6Y VSG/v85Qt7o8NE+E4PToFutHv7PagUqwq7wMfYpc0g3U1tyXTO5o3ynLFJYAksqn+U38 69ZQ== X-Gm-Message-State: AHQUAubC9KmqQlEf7A92iTa84C1gMuTe3r2egjbIEW4t/oLFy6B5iX1a UTnMjgNv0fSERHuUlTuGs9cYm8NmhR4= X-Google-Smtp-Source: AHgI3IZDHqbN6PzAnyLFn/23P90xFiOMT29uxqcpuUFXjEDO8sOxfKr3iAatTmfRVRJyNUTm/oI1Yw== X-Received: by 2002:a62:26c7:: with SMTP id m190mr22951932pfm.79.1549637587965; Fri, 08 Feb 2019 06:53:07 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:9dad:5819:2ad0:da6f]) by smtp.gmail.com with ESMTPSA id s79sm3425216pgs.50.2019.02.08.06.53.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Feb 2019 06:53:07 -0800 (PST) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH 4/4] media: i2c: remove redundant MEDIA_CONTROLLER dependency Date: Fri, 8 Feb 2019 23:52:45 +0900 Message-Id: <1549637565-32096-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> References: <1549637565-32096-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP VIDEO_V4L2_SUBDEV_API depends on MEDIA_CONTROLLER, so depending on both two is redundant. Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- drivers/media/i2c/Kconfig | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 73eeb17..32f7011 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -329,8 +329,7 @@ config VIDEO_AD5820 config VIDEO_AK7375 tristate "AK7375 lens voice coil support" - depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER - depends on VIDEO_V4L2_SUBDEV_API + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API help This is a driver for the AK7375 camera lens voice coil. AK7375 is a 12 bit DAC with 120mA output current sink @@ -339,8 +338,7 @@ config VIDEO_AK7375 config VIDEO_DW9714 tristate "DW9714 lens voice coil support" - depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER - depends on VIDEO_V4L2_SUBDEV_API + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ---help--- This is a driver for the DW9714 camera lens voice coil. DW9714 is a 10 bit DAC with 120mA output current sink @@ -349,8 +347,7 @@ config VIDEO_DW9714 config VIDEO_DW9807_VCM tristate "DW9807 lens voice coil support" - depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER - depends on VIDEO_V4L2_SUBDEV_API + depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ---help--- This is a driver for the DW9807 camera lens voice coil. DW9807 is a 10 bit DAC with 100mA output current sink @@ -747,7 +744,6 @@ config VIDEO_OV5670 tristate "OmniVision OV5670 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT - depends on MEDIA_CONTROLLER select V4L2_FWNODE ---help--- This is a Video4Linux2 sensor driver for the OmniVision