• Olof Johansson's avatar
    Merge tag 'omap-for-v3.10/dss-signed' of... · cd4cb1a7
    Olof Johansson authored
    Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/cleanup
    
    From Tony Lindgren:
    Display related clean-up from Tomi Valkeinen.
    
    These were separated from the DSS driver changes to leave out
    a dependency between the driver and arch/arm related code.
    
    * tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
      arm: dss-common: don't use reset_gpio from omap4_panda_dvi_device
      arm: omap boards: Remove unnecessary platform_enable/disable callbacks for VENC devices
      arm: omap: dss-common: use picodlp panel's gpio handling
      arm: omap: board-omap3pandora: use tpo panel's gpio handling
      arm: omap: board-zoom: use NEC panel's gpio handling
      arm: omap: board-rx-51: use acx565akm panel's gpio handling
      arm: omap: board-sdp3430: use sharp panel's gpio handling
      arm: omap: board-omap3evm: use sharp panel's gpio handling
      arm: omap: board-overo: use lb035q02 dpi panel's gpio handling
      arm: omap: board-ldp: use generic dpi panel's gpio handling
      arm: omap: board-am3517: use generic dpi panel's gpio handling
      arm: omap: board-cm-t35: use generic dpi panel's gpio handling
      arm: omap: board-devkit8000: use generic dpi panel's gpio handling
      arm: omap: board-2430: use generic dpi panel's gpio handling
      ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
      OMAPDSS: add fields to panels' platform data
      OMAPDSS: panels: keep platform data of all panels in a single header
    
    Conflicts:
    	arch/arm/mach-omap2/board-2430sdp.c
    	arch/arm/mach-omap2/board-zoom-display.c
    cd4cb1a7
board-2430sdp.c 6.07 KB