Commit 03c0c29a 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: (63 commits)
  of/platform: Register of_platform_drivers with an "of:" prefix
  of/address: Clean up function declarations
  of/spi: call of_register_spi_devices() from spi core code
  of: Provide default of_node_to_nid() implementation.
  of/device: Make of_device_make_bus_id() usable by other code.
  of/irq: Fix endian issues in parsing interrupt specifiers
  of: Fix phandle endian issues
  of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
  of: remove of_default_bus_ids
  of: make of_find_device_by_node generic
  microblaze: remove references to of_device and to_of_device
  sparc: remove references to of_device and to_of_device
  powerpc: remove references to of_device and to_of_device
  of/device: Replace of_device with platform_device in includes and core code
  of/device: Protect against binding of_platform_drivers to non-OF devices
  of: remove asm/of_device.h
  of: remove asm/of_platform.h
  of/platform: remove all of_bus_type and of_platform_bus_type references
  of: Merge of_platform_bus_type with platform_bus_type
  drivercore/of: Add OF style matching to platform bus
  ...

Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.
parents c60c6a96 7fb8f881

arch/microblaze/Kconfig

+2 −15
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config MICROBLAZE 
	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select TRACING_SUPPORT

	select OF

	select OF_FLATTREE



config SWAP

	def_bool n
@@ -76,9 +78,6 @@ config LOCKDEP_SUPPORT 
config HAVE_LATENCYTOP_SUPPORT

	def_bool y



config DTC

	def_bool y



source "init/Kconfig"



source "kernel/Kconfig.freezer"
@@ -125,18 +124,6 @@ config CMDLINE_FORCE 
	  Set this to have arguments from the default kernel command string

	  override those passed by the boot loader.



config OF

	def_bool y

	select OF_FLATTREE



config PROC_DEVICETREE

	bool "Support for device tree in /proc"

	depends on PROC_FS

	help

	  This option adds a device-tree directory under /proc which contains

	  an image of the device tree that the kernel copies from Open

	  Firmware or other boot firmware. If unsure, say Y here.



endmenu



menu "Advanced setup"

arch/microblaze/include/asm/irq.h

+0 −24
Original line number Diff line number Diff line
@@ -27,17 +27,6 @@ extern unsigned int nr_irq; 
struct pt_regs;

extern void do_IRQ(struct pt_regs *regs);



/**

 * irq_of_parse_and_map - Parse and Map an interrupt into linux virq space

 * @device: Device node of the device whose interrupt is to be mapped

 * @index: Index of the interrupt to map

 *

 * This function is a wrapper that chains of_irq_map_one() and

 * irq_create_of_mapping() to make things easier to callers

 */

struct device_node;

extern unsigned int irq_of_parse_and_map(struct device_node *dev, int index);



/** FIXME - not implement

 * irq_dispose_mapping - Unmap an interrupt

 * @virq: linux virq number of the interrupt to unmap
@@ -62,17 +51,4 @@ struct irq_host; 
extern unsigned int irq_create_mapping(struct irq_host *host,

					irq_hw_number_t hwirq);



/**

 * irq_create_of_mapping - Map a hardware interrupt into linux virq space

 * @controller: Device node of the interrupt controller

 * @inspec: Interrupt specifier from the device-tree

 * @intsize: Size of the interrupt specifier from the device-tree

 *

 * This function is identical to irq_create_mapping except that it takes

 * as input informations straight from the device-tree (typically the results

 * of the of_irq_map_*() functions.

 */

extern unsigned int irq_create_of_mapping(struct device_node *controller,

					u32 *intspec, unsigned int intsize);



#endif /* _ASM_MICROBLAZE_IRQ_H */

arch/microblaze/include/asm/of_device.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu>

 *

 * based on PowerPC of_device.h

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_OF_DEVICE_H

#define _ASM_MICROBLAZE_OF_DEVICE_H

#ifdef __KERNEL__



#include <linux/device.h>

#include <linux/of.h>



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and

 * probed using OF properties.

 */

struct of_device {

	struct device		dev; /* Generic device interface */

	struct pdev_archdata	archdata;

};



extern ssize_t of_device_get_modalias(struct of_device *ofdev,

					char *str, ssize_t len);



extern struct of_device *of_device_alloc(struct device_node *np,

					 const char *bus_id,

					 struct device *parent);



extern int of_device_uevent(struct device *dev,

			    struct kobj_uevent_env *env);



extern void of_device_make_bus_id(struct of_device *dev);



/* This is just here during the transition */

#include <linux/of_device.h>



#endif /* __KERNEL__ */

#endif /* _ASM_MICROBLAZE_OF_DEVICE_H */

arch/microblaze/include/asm/of_platform.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			<benh@kernel.crashing.org>

 *

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

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifndef _ASM_MICROBLAZE_OF_PLATFORM_H

#define _ASM_MICROBLAZE_OF_PLATFORM_H



/* This is just here during the transition */

#include <linux/of_platform.h>



/*

 * The list of OF IDs below is used for matching bus types in the

 * system whose devices are to be exposed as of_platform_devices.

 *

 * This is the default list valid for most platforms. This file provides

 * functions who can take an explicit list if necessary though

 *

 * The search is always performed recursively looking for children of

 * the provided device_node and recursively if such a children matches

 * a bus type in the list

 */



static const struct of_device_id of_default_bus_ids[] = {

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .type = "plb5", },

	{ .type = "plb4", },

	{ .type = "opb", },

	{ .type = "simple", },

	{},

};



/* Platform devices and busses creation */

extern struct of_device *of_platform_device_create(struct device_node *np,

						const char *bus_id,

						struct device *parent);

/* pseudo "matches" value to not do deep probe */

#define OF_NO_DEEP_PROBE ((struct of_device_id *)-1)



extern int of_platform_bus_probe(struct device_node *root,

				const struct of_device_id *matches,

				struct device *parent);



extern struct of_device *of_find_device_by_phandle(phandle ph);



extern void of_instantiate_rtc(void);



#endif /* _ASM_MICROBLAZE_OF_PLATFORM_H */

arch/microblaze/include/asm/page.h

+0 −7
Original line number Diff line number Diff line
@@ -47,13 +47,6 @@ 
#define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))

#define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))



/* align addr on a size boundary - adjust address up/down if needed */

#define _ALIGN_UP(addr, size)	(((addr)+((size)-1))&(~((size)-1)))

#define _ALIGN_DOWN(addr, size)	((addr)&(~((size)-1)))



/* align addr on a size boundary - adjust address up if needed */

#define _ALIGN(addr, size)	_ALIGN_UP(addr, size)



#ifndef CONFIG_MMU

/*

 * PAGE_OFFSET -- the first address of the first page of memory. When not

CRA Git | Maintained and supported by SUSTech CRA and CCSE