From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Jul 2013 22:51:45 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=74b9272bbedf45cb01a048217830d64d59aaa73b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

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
---

74b9272bbedf45cb01a048217830d64d59aaa73b
diff --cc drivers/usb/chipidea/Makefile
index 3bbbcba03815,4113febdb432..6cf5f68dedd8
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@@ -13,9 -13,9 +13,9 @@@ obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_m
  
  # PCI doesn't provide stubs, need to check
  ifneq ($(CONFIG_PCI),)
 -	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_pci.o
 +	obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_pci.o
  endif
  
- ifneq ($(CONFIG_OF_DEVICE),)
+ ifneq ($(CONFIG_OF),)
 -	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx.o
 +	obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_imx.o usbmisc_imx.o
  endif
diff --cc include/linux/platform_device.h
index cd46ee58b9dc,3413897474e1..ce8e4ffd78c7
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@@ -180,13 -180,10 +180,16 @@@ struct platform_driver 
  	const struct platform_device_id *id_table;
  };
  
+ #define to_platform_driver(drv)	(container_of((drv), struct platform_driver, \
+ 				 driver))
+ 
 -extern int platform_driver_register(struct platform_driver *);
 +/*
 + * use a macro to avoid include chaining to get THIS_MODULE
 + */
 +#define platform_driver_register(drv) \
 +	__platform_driver_register(drv, THIS_MODULE)
 +extern int __platform_driver_register(struct platform_driver *,
 +					struct module *);
  extern void platform_driver_unregister(struct platform_driver *);
  
  /* non-hotpluggable platform devices may use this so that probe() and