lkml.org 
[lkml]   [2010]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 24/30] viafb: Add a driver for the video capture engine
    Hi Jonathan,

    Seems a bit confusing to me to have viafb-camera/ show up under the
    PCI device when built with !CONFIG_FB_VIA_CAMERA.

    On Wed, 28 April 2010 Jonathan Corbet <corbet@lwn.net> wrote:
    > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
    > index 22c1662..a969f76 100644
    > --- a/drivers/video/Kconfig
    > +++ b/drivers/video/Kconfig
    > @@ -1516,12 +1516,21 @@ config FB_VIA
    > This is the frame buffer device driver for Graphics chips of VIA
    > UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
    > CN700/VN800,CX700/VX700,P4M890) and Chrome9 Family (K8M890,CN896
    > - /P4M900,VX800)
    > + /P4M900,VX800,VX855)
    > Say Y if you have a VIA UniChrome graphics board.
    >
    > To compile this driver as a module, choose M here: the
    > module will be called viafb.
    >
    > +config FB_VIA_CAMERA
    > + tristate "VIAFB camera controller support"
    > + depends on FB_VIA
    > + select VIDEOBUF_DMA_SG
    > + help
    > + Driver support for the integrated camera controller in VIA
    > + Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems
    > + with ov7670 sensors.
    > +
    > config FB_NEOMAGIC
    > tristate "NeoMagic display support"
    > depends on FB && PCI
    > diff --git a/drivers/video/via/Makefile b/drivers/video/via/Makefile
    > index 2751cb2..05401b6 100644
    > --- a/drivers/video/via/Makefile
    > +++ b/drivers/video/via/Makefile
    > @@ -3,6 +3,7 @@
    > #
    >
    > obj-$(CONFIG_FB_VIA) += viafb.o
    > +obj-$(CONFIG_FB_VIA_CAMERA) += via-camera.o
    >
    > viafb-y :=viafbdev.o hw.o via_i2c.o dvi.o lcd.o ioctl.o accel.o \
    > via_utility.o vt1636.o global.o tblDPASetting.o viamode.o tbl1636.o \

    <snip>

    > diff --git a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c
    > index 83a8d34..58256d0 100644
    > --- a/drivers/video/via/via-core.c
    > +++ b/drivers/video/via/via-core.c
    > @@ -493,7 +493,10 @@ static struct viafb_subdev_info {
    > },
    > {
    > .name = "viafb-i2c",
    > - }
    > + },
    > + {
    > + .name = "viafb-camera",
    > + },
    > };
    > #define N_SUBDEVS ARRAY_SIZE(viafb_subdevs)
    >

    I think the extra 'viafb-camera' entry should be wrapped into a

    #if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)

    or probably better be dynamically added when camera module is loaded
    and/or detects/probes the camera sub-device.

    Thanks,
    Bruno


    \
     
     \ /
      Last update: 2010-04-30 19:39    [W:0.025 / U:147.312 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site