Skip to content
  • Linus Torvalds's avatar
    Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 74b9272b
    Linus Torvalds authored
    Pull device tree updates from Grant Likely:
     "This branch contains the following changes:
       - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF
       - Remove #ifdef from linux/of_platform.h to increase compiler syntax
         coverage
       - Bug fix for address decoding on Bimini and js2x powerpc platforms.
       - miscellaneous binding changes
    
      One note on the above.  The binding changes going in from all kinds of
      different trees has gotten rather out of hand.  I picked up some
      during this cycle, but even going though my tree isn't a great fit.
    
      Ian Campbell has prototyped splitting the bindings and .dtb files into
      a separate repository.  The plan is to migrate to using that sometime
      in the next few kernel releases which should get rid of a lot of the
      churn on binding docs and .dts files"
    
    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
      of: Fix address decoding on Bimini and js2x machines
      of: remove CONFIG_OF_DEVICE
      usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE
      of: remove of_platform_driver
      ibmebus: convert of_platform_driver to platform_driver
      driver core: move to_platform_driver to platform_device.h
      mfd: DT bindings for the palmas family MFD
      ARM: dts: omap3-devkit8000: fix NAND memory binding
      of/base: fix typos
      of: remove #ifdef from linux/of_platform.h
    74b9272b