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
Showing
- Documentation/devicetree/bindings/mfd/palmas.txt 49 additions, 0 deletionsDocumentation/devicetree/bindings/mfd/palmas.txt
- Documentation/devicetree/bindings/regulator/palmas-pmic.txt 72 additions, 0 deletionsDocumentation/devicetree/bindings/regulator/palmas-pmic.txt
- arch/arm/boot/dts/omap3-devkit8000.dts 15 additions, 14 deletionsarch/arm/boot/dts/omap3-devkit8000.dts
- arch/powerpc/include/asm/ibmebus.h 2 additions, 2 deletionsarch/powerpc/include/asm/ibmebus.h
- arch/powerpc/kernel/ibmebus.c 10 additions, 12 deletionsarch/powerpc/kernel/ibmebus.c
- drivers/base/platform.c 0 additions, 3 deletionsdrivers/base/platform.c
- drivers/infiniband/hw/ehca/ehca_main.c 2 additions, 3 deletionsdrivers/infiniband/hw/ehca/ehca_main.c
- drivers/net/ethernet/ibm/ehea/ehea_main.c 3 additions, 5 deletionsdrivers/net/ethernet/ibm/ehea/ehea_main.c
- drivers/of/Kconfig 0 additions, 3 deletionsdrivers/of/Kconfig
- drivers/of/Makefile 1 addition, 2 deletionsdrivers/of/Makefile
- drivers/of/address.c 6 additions, 2 deletionsdrivers/of/address.c
- drivers/of/base.c 6 additions, 6 deletionsdrivers/of/base.c
- drivers/usb/chipidea/Makefile 1 addition, 1 deletiondrivers/usb/chipidea/Makefile
- include/linux/of_device.h 3 additions, 3 deletionsinclude/linux/of_device.h
- include/linux/of_platform.h 3 additions, 32 deletionsinclude/linux/of_platform.h
- include/linux/platform_device.h 3 additions, 0 deletionsinclude/linux/platform_device.h
Loading
Please register or sign in to comment