diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2011-06-11 17:46:44 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 20:53:00 (GMT) |
| commit | 2164b5af1dd42ebb7b5aa6bbcf9d9c3c067db246 (patch) | |
| tree | a1bf041212c79fe6be251afacdedb5e2eda5534e /drivers/media/video/marvell-ccic/cafe-driver.c | |
| parent | abfa3df36c01a32b081fb448750181af76eb9d55 (diff) | |
| download | linux-2164b5af1dd42ebb7b5aa6bbcf9d9c3c067db246.tar.xz | |
[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>
Diffstat (limited to 'drivers/media/video/marvell-ccic/cafe-driver.c')
| -rw-r--r-- | drivers/media/video/marvell-ccic/cafe-driver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/marvell-ccic/cafe-driver.c b/drivers/media/video/marvell-ccic/cafe-driver.c index 3f38f2a..08edf95 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); |