[media] marvell-cam: Pass sensor parameters from the platform

Depending on the controller, the ov7670 sensor may be told to work with a
different clock speed or to use the SMBUS protocol.  Remove the wired-in
code and pass that information from the platform layer.  The Cafe driver
now just assumes it's running on an OLPC XO 1; I do not believe it has ever
run anywhere else.

Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 10 insertions, 20 deletions

diff --git a/drivers/media/video/marvell-ccic/cafe-driver.c b/drivers/media/video/marvell-ccic/cafe-driver.c
index 3f38f2a0643f..08edf950dabf 100644
--- a/drivers/media/video/marvell-ccic/cafe-driver.c
+++ b/drivers/media/video/marvell-ccic/cafe-driver.c
@@ -404,6 +404,12 @@ static int cafe_pci_probe(struct pci_dev *pdev,
         mcam->plat_power_down = cafe_ctlr_power_down;
         mcam->dev = &pdev->dev;
         /*
+         * Set the clock speed for the XO 1; I don't believe this
+         * driver has ever run anywhere else.
+         */
+        mcam->clock_speed = 45;
+        mcam->use_smbus = 1;
+        /*
          * Get set up on the PCI bus.
          */
         ret = pci_enable_device(pdev);
diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c
index 18fce9e69f38..0d6023435557 100644
--- a/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/drivers/media/video/marvell-ccic/mcam-core.c
@@ -7,7 +7,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
-#include <linux/dmi.h>
 #include <linux/mm.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
@@ -1536,22 +1535,7 @@ int mccic_irq(struct mcam_camera *cam, unsigned int irqs)
  * Registration and such.
  */
 
-/* FIXME this is really platform stuff */
-static const struct dmi_system_id olpc_xo1_dmi[] = {
-        {
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "OLPC"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "XO"),
-                        DMI_MATCH(DMI_PRODUCT_VERSION, "1"),
-                },
-        },
-        { }
-};
-
 static struct ov7670_config sensor_cfg = {
-        /* This controller only does SMBUS */
-        .use_smbus = true,
-
         /*
          * Exclude QCIF mode, because it only captures a tiny portion
          * of the sensor FOV
@@ -1590,13 +1574,11 @@ int mccic_register(struct mcam_camera *cam)
 
         mcam_ctlr_init(cam);
 
-        /* Apply XO-1 clock speed */
-        if (dmi_check_system(olpc_xo1_dmi))
-                sensor_cfg.clock_speed = 45;
-
         /*
          * Try to find the sensor.
          */
+        sensor_cfg.clock_speed = cam->clock_speed;
+        sensor_cfg.use_smbus = cam->use_smbus;
         cam->sensor_addr = ov7670_info.addr;
         cam->sensor = v4l2_i2c_new_subdev_board(&cam->v4l2_dev,
                         &cam->i2c_adapter, &ov7670_info, NULL);
diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h
index 0b55b8e6bb7e..21485e7ec8f2 100644
--- a/drivers/media/video/marvell-ccic/mcam-core.h
+++ b/drivers/media/video/marvell-ccic/mcam-core.h
@@ -42,6 +42,8 @@ struct mcam_camera {
         spinlock_t dev_lock;
         struct device *dev; /* For messages, dma alloc */
         unsigned int chip_id;
+        short int clock_speed;  /* Sensor clock speed, default 30 */
+        short int use_smbus;    /* SMBUS or straight I2c? */
 
         /*
          * Callbacks from the core to the platform code.