1. 12 Sep, 2016 1 commit
    • Hans Verkuil's avatar
      [media] pxa_camera: merge soc_mediabus.c into pxa_camera.c · 34b27b13
      Hans Verkuil authored
      Linking soc_mediabus into this driver causes multiple definition linker warnings
      if soc_camera is also enabled:
      
         drivers/media/platform/soc_camera/built-in.o:(___ksymtab+soc_mbus_image_size+0x0): multiple definition of `__ksymtab_soc_mbus_image_size'
         drivers/media/platform/soc_camera/soc_mediabus.o:(___ksymtab+soc_mbus_image_size+0x0): first defined here
      >> drivers/media/platform/soc_camera/built-in.o:(___ksymtab+soc_mbus_samples_per_pixel+0x0): multiple definition of `__ksymtab_soc_mbus_samples_per_pixel'
         drivers/media/platform/soc_camera/soc_mediabus.o:(___ksymtab+soc_mbus_samples_per_pixel+0x0): first defined here
         drivers/media/platform/soc_camera/built-in.o: In function `soc_mbus_config_compatible':
         (.text+0x3840): multiple definition of `soc_mbus_config_compatible'
         drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x134): first defined here
      
      Since we really don't want to have to use any of the soc-camera code this patch
      copies the relevant code and data structures from soc_mediabus and renames it to pxa_mbus_*.
      
      The large table of formats has been culled a bit, removing formats that are not supported
      by this driver.
      Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
      Cc: Robert Jarzmik <robert.jarzmik@free.fr>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
      34b27b13
  2. 09 Sep, 2016 39 commits