linux.git/arch/x86/kernel/devicetree.c, branch v3.14

Merge remote-tracking branch 'grant/devicetree/next' into for-next

2013-11-07T16:34:46+00:00

of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.

2013-10-24T10:50:36+00:00

Several architectures open code effectively the same code block for
finding and mapping PCI irqs. This patch consolidates it down to a
single function.

Signed-off-by: Grant Likely 
Acked-by: Michal Simek 
Cc: Russell King 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt

of/irq: simplify args to irq_create_of_mapping

2013-10-24T10:42:57+00:00

All the callers of irq_create_of_mapping() pass the contents of a struct
of_phandle_args structure to the function. Since all the callers already
have an of_phandle_args pointer, why not pass it directly to
irq_create_of_mapping()?

Signed-off-by: Grant Likely 
Acked-by: Michal Simek 
Acked-by: Tony Lindgren 
Cc: Thomas Gleixner 
Cc: Russell King 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt

of/irq: Replace of_irq with of_phandle_args

2013-10-24T10:42:51+00:00

struct of_irq and struct of_phandle_args are exactly the same structure.
This patch makes the kernel use of_phandle_args everywhere. This in
itself isn't a big deal, but it makes some follow-on patches simpler.

Signed-off-by: Grant Likely 
Acked-by: Michal Simek 
Acked-by: Tony Lindgren 
Cc: Russell King 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt

of/irq: Rename of_irq_map_* functions to of_irq_parse_*

2013-10-24T10:40:59+00:00

The OF irq handling code has been overloading the term 'map' to refer to
both parsing the data in the device tree and mapping it to the internal
linux irq system. This is probably because the device tree does have the
concept of an 'interrupt-map' function for translating interrupt
references from one node to another, but 'map' is still confusing when
the primary purpose of some of the functions are to parse the DT data.

This patch renames all the of_irq_map_* functions to of_irq_parse_*
which makes it clear that there is a difference between the parsing
phase and the mapping phase. Kernel code can make use of just the
parsing or just the mapping support as needed by the subsystem.

The patch was generated mechanically with a handful of sed commands.

Signed-off-by: Grant Likely 
Acked-by: Michal Simek 
Acked-by: Tony Lindgren 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt

of: implement pci_address_to_pio as weak function

2013-10-10T01:04:06+00:00

Implement pci_address_to_pio as weak function to remove the dependency on
asm/prom.h. This is in preparation to make prom.h optional.

Signed-off-by: Rob Herring 
Acked-by: Grant Likely 
Cc: Michal Simek 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: x86@kernel.org
Cc: Grant Likely

x86: add necessary includes for prom.h

2013-10-10T01:04:06+00:00

Once prom.h is no longer implicitly included, we need to include setup.h
to get COMMAND_LINE_SIZE.

Signed-off-by: Rob Herring 
Acked-by: Grant Likely 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: x86@kernel.org

of: remove early_init_dt_setup_initrd_arch

2013-10-09T16:39:01+00:00

All arches do essentially the same thing now for
early_init_dt_setup_initrd_arch, so it can now be removed.

Signed-off-by: Rob Herring 
Acked-by: Vineet Gupta 
Cc: Russell King 
Cc: Mark Salter 
Cc: Aurelien Jacquiot 
Cc: James Hogan 
Cc: Michal Simek 
Cc: Ralf Baechle 
Cc: Jonas Bonn 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: x86@kernel.org
Cc: Chris Zankel 
Cc: Max Filippov 
Acked-by: Grant Likely

x86: use unflatten_and_copy_device_tree

2013-10-09T16:38:05+00:00

Use the common unflatten_and_copy_device_tree to copy the built-in FDT
out of init section.

Signed-off-by: Rob Herring 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: x86@kernel.org

of: Specify initrd location using 64-bit

2013-07-24T10:10:01+00:00

On some PAE architectures, the entire range of physical memory could reside
outside the 32-bit limit.  These systems need the ability to specify the
initrd location using 64-bit numbers.

This patch globally modifies the early_init_dt_setup_initrd_arch() function to
use 64-bit numbers instead of the current unsigned long.

There has been quite a bit of debate about whether to use u64 or phys_addr_t.
It was concluded to stick to u64 to be consistent with rest of the device
tree code. As summarized by Geert, "The address to load the initrd is decided
by the bootloader/user and set at that point later in time. The dtb should not
be tied to the kernel you are booting"

More details on the discussion can be found here:
https://lkml.org/lkml/2013/6/20/690
https://lkml.org/lkml/2012/9/13/544

Signed-off-by: Santosh Shilimkar 
Acked-by: Rob Herring 
Acked-by: Vineet Gupta 
Acked-by: Jean-Christophe PLAGNIOL-VILLARD 
Signed-off-by: Grant Likely