[v2,2/2,media] rcar_vin: Remove obsolete platform data support
Commit Message
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), Renesas R-Car SoCs are only supported in
generic DT-only ARM multi-platform builds. The driver doesn't need to
use platform data anymore, hence remove platform data configuration.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Commit 3d7608e4c169af03 is now in arm-soc/for-next.
v2:
- New.
---
drivers/media/platform/soc_camera/rcar_vin.c | 75 +++++++++++-----------------
include/linux/platform_data/camera-rcar.h | 25 ----------
2 files changed, 29 insertions(+), 71 deletions(-)
delete mode 100644 include/linux/platform_data/camera-rcar.h
Comments
Hi Geert,
[auto build test ERROR on v4.3-rc4 -- if it's inappropriate base, please ignore]
config: arm-bockw_defconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
>> arch/arm/mach-shmobile/board-bockw.c:24:45: fatal error: linux/platform_data/camera-rcar.h: No such file or directory
#include <linux/platform_data/camera-rcar.h>
^
compilation terminated.
vim +24 arch/arm/mach-shmobile/board-bockw.c
53e42c29 Kuninori Morimoto 2013-03-21 8 * This program is free software; you can redistribute it and/or modify
53e42c29 Kuninori Morimoto 2013-03-21 9 * it under the terms of the GNU General Public License as published by
53e42c29 Kuninori Morimoto 2013-03-21 10 * the Free Software Foundation; version 2 of the License.
53e42c29 Kuninori Morimoto 2013-03-21 11 *
53e42c29 Kuninori Morimoto 2013-03-21 12 * This program is distributed in the hope that it will be useful,
53e42c29 Kuninori Morimoto 2013-03-21 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
53e42c29 Kuninori Morimoto 2013-03-21 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
53e42c29 Kuninori Morimoto 2013-03-21 15 * GNU General Public License for more details.
53e42c29 Kuninori Morimoto 2013-03-21 16 */
53e42c29 Kuninori Morimoto 2013-03-21 17
ca7bb309 Kuninori Morimoto 2013-04-17 18 #include <linux/mfd/tmio.h>
ca7bb309 Kuninori Morimoto 2013-04-17 19 #include <linux/mmc/host.h>
fc551908 Kuninori Morimoto 2013-07-26 20 #include <linux/mmc/sh_mobile_sdhi.h>
a66c9744 Kuninori Morimoto 2013-07-26 21 #include <linux/mmc/sh_mmcif.h>
c06a164c Kuninori Morimoto 2013-06-11 22 #include <linux/mtd/partitions.h>
111ea179 Kuninori Morimoto 2013-04-12 23 #include <linux/pinctrl/machine.h>
02d39132 Kuninori Morimoto 2013-12-05 @24 #include <linux/platform_data/camera-rcar.h>
044e2121 Kuninori Morimoto 2013-07-26 25 #include <linux/platform_data/usb-rcar-phy.h>
53e42c29 Kuninori Morimoto 2013-03-21 26 #include <linux/platform_device.h>
741440e8 Kuninori Morimoto 2013-04-09 27 #include <linux/regulator/fixed.h>
741440e8 Kuninori Morimoto 2013-04-09 28 #include <linux/regulator/machine.h>
27d5f27e Kuninori Morimoto 2013-04-01 29 #include <linux/smsc911x.h>
c06a164c Kuninori Morimoto 2013-06-11 30 #include <linux/spi/spi.h>
c06a164c Kuninori Morimoto 2013-06-11 31 #include <linux/spi/flash.h>
81a0d906 Kuninori Morimoto 2013-08-04 32 #include <linux/usb/renesas_usbhs.h>
:::::: The code at line 24 was first introduced by commit
:::::: 02d39132e75410633c637be006b9b772a6116da3 ARM: shmobile: r8a7778: camera-rcar header cleanup
:::::: TO: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
:::::: CC: Simon Horman <horms+renesas@verge.net.au>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Wed, Oct 7, 2015 at 8:32 PM, kbuild test robot <lkp@intel.com> wrote:
> [auto build test ERROR on v4.3-rc4 -- if it's inappropriate base, please ignore]
>
> config: arm-bockw_defconfig (attached as .config)
> reproduce:
> wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # save the attached .config to linux build tree
> make.cross ARCH=arm
>
> All errors (new ones prefixed by >>):
>
>>> arch/arm/mach-shmobile/board-bockw.c:24:45: fatal error: linux/platform_data/camera-rcar.h: No such file or directory
> #include <linux/platform_data/camera-rcar.h>
> ^
Please ignore. Legacy (non-DT) bockw support has been removed in
arm-soc/for-next.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
@@ -21,7 +21,6 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/platform_data/camera-rcar.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h>
@@ -138,6 +137,11 @@
#define TIMEOUT_MS 100
+#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0)
+#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
+#define RCAR_VIN_BT601 (1 << 2)
+#define RCAR_VIN_BT656 (1 << 3)
+
enum chip_id {
RCAR_GEN2,
RCAR_H1,
@@ -1845,63 +1849,43 @@ static const struct of_device_id rcar_vin_of_table[] = {
MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
#endif
-static struct platform_device_id rcar_vin_id_table[] = {
- { "r8a7779-vin", RCAR_H1 },
- { "r8a7778-vin", RCAR_M1 },
- { "uPD35004-vin", RCAR_E1 },
- {},
-};
-MODULE_DEVICE_TABLE(platform, rcar_vin_id_table);
-
static int rcar_vin_probe(struct platform_device *pdev)
{
const struct of_device_id *match = NULL;
struct rcar_vin_priv *priv;
+ struct v4l2_of_endpoint ep;
+ struct device_node *np;
struct resource *mem;
- struct rcar_vin_platform_data *pdata;
unsigned int pdata_flags;
int irq, ret;
- if (pdev->dev.of_node) {
- struct v4l2_of_endpoint ep;
- struct device_node *np;
+ match = of_match_device(of_match_ptr(rcar_vin_of_table), &pdev->dev);
- match = of_match_device(of_match_ptr(rcar_vin_of_table),
- &pdev->dev);
-
- np = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
- if (!np) {
- dev_err(&pdev->dev, "could not find endpoint\n");
- return -EINVAL;
- }
+ np = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
+ if (!np) {
+ dev_err(&pdev->dev, "could not find endpoint\n");
+ return -EINVAL;
+ }
- ret = v4l2_of_parse_endpoint(np, &ep);
- if (ret) {
- dev_err(&pdev->dev, "could not parse endpoint\n");
- return ret;
- }
+ ret = v4l2_of_parse_endpoint(np, &ep);
+ if (ret) {
+ dev_err(&pdev->dev, "could not parse endpoint\n");
+ return ret;
+ }
- if (ep.bus_type == V4L2_MBUS_BT656)
- pdata_flags = RCAR_VIN_BT656;
- else {
- pdata_flags = 0;
- if (ep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
- pdata_flags |= RCAR_VIN_HSYNC_ACTIVE_LOW;
- if (ep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
- pdata_flags |= RCAR_VIN_VSYNC_ACTIVE_LOW;
- }
+ if (ep.bus_type == V4L2_MBUS_BT656)
+ pdata_flags = RCAR_VIN_BT656;
+ else {
+ pdata_flags = 0;
+ if (ep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
+ pdata_flags |= RCAR_VIN_HSYNC_ACTIVE_LOW;
+ if (ep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
+ pdata_flags |= RCAR_VIN_VSYNC_ACTIVE_LOW;
+ }
- of_node_put(np);
+ of_node_put(np);
- dev_dbg(&pdev->dev, "pdata_flags = %08x\n", pdata_flags);
- } else {
- pdata = pdev->dev.platform_data;
- if (!pdata || !pdata->flags) {
- dev_err(&pdev->dev, "platform data not set\n");
- return -EINVAL;
- }
- pdata_flags = pdata->flags;
- }
+ dev_dbg(&pdev->dev, "pdata_flags = %08x\n", pdata_flags);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (mem == NULL)
@@ -1984,7 +1968,6 @@ static struct platform_driver rcar_vin_driver = {
.name = DRV_NAME,
.of_match_table = of_match_ptr(rcar_vin_of_table),
},
- .id_table = rcar_vin_id_table,
};
module_platform_driver(rcar_vin_driver);
deleted file mode 100644
@@ -1,25 +0,0 @@
-/*
- * Platform data for Renesas R-Car VIN soc-camera driver
- *
- * Copyright (C) 2011-2013 Renesas Solutions Corp.
- * Copyright (C) 2013 Cogent Embedded, Inc., <source@cogentembedded.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef __CAMERA_RCAR_H_
-#define __CAMERA_RCAR_H_
-
-#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0)
-#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
-#define RCAR_VIN_BT601 (1 << 2)
-#define RCAR_VIN_BT656 (1 << 3)
-
-struct rcar_vin_platform_data {
- unsigned int flags;
-};
-
-#endif /* __CAMERA_RCAR_H_ */