Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8974cb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull core device tree changes for Linux v3.4 from Grant Likely:
 "This branch contains a minor documentation addition, a utility
  function for parsing string properties needed by some of the new ARM
  platforms, disables dynamic DT code that isn't used anywhere but on a
  few PPC machines, and exports DT node compatible data to userspace via
  UEVENT properties.  Nothing earth shattering here."

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  of: Only compile OF_DYNAMIC on PowerPC pseries and iseries
  arm/dts: OMAP3: Add omap3evm and am335xevm support
  drivercore: Output common devicetree information in uevent
  of: Add of_property_match_string() to find index into a string list
parents c207f3a4 0f22dd39

Documentation/devicetree/bindings/arm/omap/omap.txt

+6 −0
Original line number Diff line number Diff line
@@ -41,3 +41,9 @@ Boards: 


- OMAP4 PandaBoard : Low cost community board

  compatible = "ti,omap4-panda", "ti,omap4430"



- OMAP3 EVM : Software Developement Board for OMAP35x, AM/DM37x

  compatible = "ti,omap3-evm", "ti,omap3"



- AM335X EVM : Software Developement Board for AM335x

  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"

arch/arm/boot/dts/testcases/tests-phandle.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
				phandle-list-bad-phandle = <12345678 0 0>;

				phandle-list-bad-args = <&provider2 1 0>,

							<&provider3 0>;

				empty-property;

				unterminated-string = [40 41 42 43];

			};

		};

	};

arch/powerpc/kernel/ibmebus.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static struct dev_pm_ops ibmebus_bus_dev_pm_ops = { 


struct bus_type ibmebus_bus_type = {

	.name      = "ibmebus",

	.uevent    = of_device_uevent,

	.uevent    = of_device_uevent_modalias,

	.bus_attrs = ibmebus_bus_attrs,

	.match     = ibmebus_bus_bus_match,

	.probe     = ibmebus_bus_device_probe,

arch/powerpc/platforms/8xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config MPC86XADS 
config MPC885ADS

	bool "MPC885ADS"

	select CPM1

	select OF_DYNAMIC

	help

	  Freescale Semiconductor MPC885 Application Development System (ADS).

	  Also known as DUET.

arch/powerpc/platforms/iseries/Kconfig

+1 −0
Original line number Diff line number Diff line 
config PPC_ISERIES

	bool "IBM Legacy iSeries"

	depends on PPC64 && PPC_BOOK3S

	select OF_DYNAMIC

	select PPC_SMP_MUXED_IPI

	select PPC_INDIRECT_PIO

	select PPC_INDIRECT_MMIO