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

Commit d8678b58 authored by Grant Likely's avatar Grant Likely
Browse files

of: add common header for flattened device tree representation 



Add a common header file for working with the flattened device tree
data structure and merge the shared data tags used by Microblaze and
PowerPC

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarStephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 61e955db

arch/microblaze/include/asm/prom.h

+1 −11
Original line number Diff line number Diff line
@@ -17,20 +17,10 @@ 
#ifndef _ASM_MICROBLAZE_PROM_H

#define _ASM_MICROBLAZE_PROM_H

#ifdef __KERNEL__



/* Definitions used by the flattened device tree */

#define OF_DT_HEADER		0xd00dfeed /* marker */

#define OF_DT_BEGIN_NODE	0x1 /* Start of node, full name */

#define OF_DT_END_NODE		0x2 /* End node */

#define OF_DT_PROP		0x3 /* Property: name off, size, content */

#define OF_DT_NOP		0x4 /* nop */

#define OF_DT_END		0x9



#define OF_DT_VERSION		0x10



#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <linux/of_fdt.h>

#include <linux/proc_fs.h>

#include <linux/platform_device.h>

#include <asm/irq.h>

arch/microblaze/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/linkage.h>

#include <asm/thread_info.h>

#include <asm/page.h>

#include <asm/prom.h>		/* for OF_DT_HEADER */

#include <linux/of_fdt.h>		/* for OF_DT_HEADER */



#ifdef CONFIG_MMU

#include <asm/setup.h> /* COMMAND_LINE_SIZE */

arch/powerpc/include/asm/prom.h

+1 −11
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */

#include <linux/types.h>

#include <linux/of_fdt.h>

#include <linux/proc_fs.h>

#include <linux/platform_device.h>

#include <asm/irq.h>
@@ -29,17 +30,6 @@ 
#define of_prop_cmp(s1, s2)		strcmp((s1), (s2))

#define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))



/* Definitions used by the flattened device tree */

#define OF_DT_HEADER		0xd00dfeed	/* marker */

#define OF_DT_BEGIN_NODE	0x1		/* Start of node, full name */

#define OF_DT_END_NODE		0x2		/* End node */

#define OF_DT_PROP		0x3		/* Property: name off, size,

						 * content */

#define OF_DT_NOP		0x4		/* nop */

#define OF_DT_END		0x9



#define OF_DT_VERSION		0x10



/*

 * This is what gets passed to the kernel by prom_init or kexec

 *

include/linux/of_fdt.h

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

 * Definitions for working with the Flattened Device Tree data format

 *

 * Copyright 2009 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

 * version 2 as published by the Free Software Foundation.

 */



#ifndef _LINUX_OF_FDT_H

#define _LINUX_OF_FDT_H



/* Definitions used by the flattened device tree */

#define OF_DT_HEADER		0xd00dfeed	/* marker */

#define OF_DT_BEGIN_NODE	0x1		/* Start of node, full name */

#define OF_DT_END_NODE		0x2		/* End node */

#define OF_DT_PROP		0x3		/* Property: name off, size,

						 * content */

#define OF_DT_NOP		0x4		/* nop */

#define OF_DT_END		0x9



#define OF_DT_VERSION		0x10



#endif /* _LINUX_OF_FDT_H */