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

Commit 51f00a47 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:
  mtd/m25p80: add support to parse the partitions by OF node
  of/irq: of_irq.c needs to include linux/irq.h
  of/mips: Cleanup some include directives/files.
  of/mips: Add device tree support to MIPS
  of/flattree: Eliminate need to provide early_init_dt_scan_chosen_arch
  of/device: Rework to use common platform_device_alloc() for allocating devices
  of/xsysace: Fix OF probing on little-endian systems
  of: use __be32 types for big-endian device tree data
  of/irq: remove references to NO_IRQ in drivers/of/platform.c
  of/promtree: add package-to-path support to pdt
  of/promtree: add of_pdt namespace to pdt code
  of/promtree: no longer call prom_ functions directly; use an ops structure
  of/promtree: make drivers/of/pdt.c no longer sparc-only
  sparc: break out some PROM device-tree building code out into drivers/of
  of/sparc: convert various prom_* functions to use phandle
  sparc: stop exporting openprom.h header
  powerpc, of_serial: Endianness issues setting up the serial ports
  of: MTD: Fix OF probing on little-endian systems
  of: GPIO: Fix OF probing on little-endian systems
parents a7f505c6 97ff46cb

arch/microblaze/kernel/prom.c

+0 −5
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ 
#include <asm/sections.h>

#include <asm/pci-bridge.h>



void __init early_init_dt_scan_chosen_arch(unsigned long node)

{

	/* No Microblaze specific code here */

}



void __init early_init_dt_add_memory_arch(u64 base, u64 size)

{

	memblock_add(base, size);

arch/mips/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -2128,6 +2128,13 @@ config SECCOMP 


	  If unsure, say Y. Only embedded should say N here.



config USE_OF

	bool "Flattened Device Tree support"

	select OF

	select OF_FLATTREE

	help

	  Include support for flattened device tree machine descriptions.



endmenu



config LOCKDEP_SUPPORT

arch/mips/include/asm/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ 


#include <irq.h>



static inline void irq_dispose_mapping(unsigned int virq)

{

	return;

}



#ifdef CONFIG_I8259

static inline int irq_canonicalize(int irq)

{

arch/mips/include/asm/prom.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 *  arch/mips/include/asm/prom.h

 *

 *  Copyright (C) 2010 Cisco Systems Inc. <dediao@cisco.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

#ifndef __ASM_MIPS_PROM_H

#define __ASM_MIPS_PROM_H



#ifdef CONFIG_OF

#include <asm/bootinfo.h>



/* which is compatible with the flattened device tree (FDT) */

#define cmd_line arcs_cmdline



extern int early_init_dt_scan_memory_arch(unsigned long node,

	const char *uname, int depth, void *data);



extern int reserve_mem_mach(unsigned long addr, unsigned long size);

extern void free_mem_mach(unsigned long addr, unsigned long size);



extern void device_tree_init(void);

#else /* CONFIG_OF */

static inline void device_tree_init(void) { }

#endif /* CONFIG_OF */



#endif /* _ASM_MIPS_PROM_H */

arch/mips/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 
obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o



obj-$(CONFIG_OF)		+= prom.o



CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)



obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)	+= 8250-platform.o