Commit 0bd2cbcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
  of/flattree: forward declare struct device_node in of_fdt.h
  ipmi: explicitly include of_address.h and of_irq.h
  sparc: explicitly cast negative phandle checks to s32
  powerpc/405: Fix missing #{address,size}-cells in i2c node
  powerpc/5200: dts: refactor dts files
  powerpc/5200: dts: Change combatible strings on localbus
  powerpc/5200: dts: remove unused properties
  powerpc/5200: dts: rename nodes to prepare for refactoring dts files
  of/flattree: Update dtc to current mainline.
  of/device: Don't register disabled devices
  powerpc/dts: fix syntax bugs in bluestone.dts
  of: Fixes for OF probing on little endian systems
  of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
  of/flattree: Add of_flat_dt_match() helper function
  of_serial: explicitly include of_irq.h
  of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
  of/flattree: Reorder unflatten_dt_node
  of/flattree: Refactor unflatten_dt_node
  of/flattree: Add non-boottime device tree functions
  of/flattree: Add Kconfig for EARLY_FLATTREE
  ...

Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
parents 57cc7215 a0817487

Documentation/kbuild/makefiles.txt

+15 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,21 @@ When kbuild executes, the following steps are followed (roughly): 
	      resulting in the target file being recompiled for no

	      obvious reason.



    dtc

	Create flattend device tree blob object suitable for linking

	into vmlinux. Device tree blobs linked into vmlinux are placed

	in an init section in the image. Platform code *must* copy the

	blob to non-init memory prior to calling unflatten_device_tree().



	Example:

		#arch/x86/platform/ce4100/Makefile

		clean-files := *dtb.S



		DTC_FLAGS := -p 1024

		obj-y += foo.dtb.o



		$(obj)/%.dtb: $(src)/%.dts

			$(call cmd,dtc)



--- 6.7 Custom kbuild commands

Documentation/powerpc/dts-bindings/eeprom.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
EEPROMs (I2C)



Required properties:



  - compatible : should be "<manufacturer>,<type>"

		 If there is no specific driver for <manufacturer>, a generic

		 driver based on <type> is selected. Possible types are:

		 24c00, 24c01, 24c02, 24c04, 24c08, 24c16, 24c32, 24c64,

		 24c128, 24c256, 24c512, 24c1024, spd



  - reg : the I2C address of the EEPROM



Optional properties:



  - pagesize : the length of the pagesize for writing. Please consult the

               manual of your device, that value varies a lot. A wrong value

	       may result in data loss! If not specified, a safety value of

	       '1' is used which will be very slow.



  - read-only: this parameterless property disables writes to the eeprom



Example:



eeprom@52 {

	compatible = "atmel,24c32";

	reg = <0x52>;

	pagesize = <32>;

};

arch/microblaze/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config MICROBLAZE 
	select HAVE_DMA_API_DEBUG

	select TRACING_SUPPORT

	select OF

	select OF_FLATTREE

	select OF_EARLY_FLATTREE



config SWAP

	def_bool n

arch/microblaze/boot/Makefile

+3 −9
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ targets := linux.bin linux.bin.gz simpleImage.% 


OBJCOPYFLAGS := -O binary



# Where the DTS files live

dtstree         := $(srctree)/$(src)/dts



# Ensure system.dtb exists

$(obj)/linked_dtb.o: $(obj)/system.dtb
@@ -51,14 +48,11 @@ $(obj)/simpleImage.%: vmlinux FORCE 
	$(call if_changed,strip)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'



# Rule to build device tree blobs

DTC = $(objtree)/scripts/dtc/dtc



# Rule to build device tree blobs

quiet_cmd_dtc = DTC     $@

	cmd_dtc = $(DTC) -O dtb -o $(obj)/$*.dtb -b 0 -p 1024 $(dtstree)/$*.dts

DTC_FLAGS := -p 1024



$(obj)/%.dtb: $(dtstree)/%.dts FORCE

	$(call if_changed,dtc)

$(obj)/%.dtb: $(src)/dts/%.dts FORCE

	$(call cmd,dtc)



clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub

arch/microblaze/include/asm/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ extern void kdump_move_device_tree(void); 
/* CPU OF node matching */

struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);



/* Get the MAC address */

extern const void *of_get_mac_address(struct device_node *np);



/**

 * of_irq_map_pci - Resolve the interrupt for a PCI device

 * @pdev:	the device whose interrupt is to be resolved

CRA Git | Maintained and supported by SUSTech CRA and CCSE