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

Commit 3960ef32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/cross-platform' of... 

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: Consolidate the clkdev header files
  ARM: set vga memory base at run-time
  ARM: convert PCI defines to variables
  ARM: pci: make pcibios_assign_all_busses use pci_has_flag
  ARM: remove unnecessary mach/hardware.h includes
  pci: move microblaze and powerpc pci flag functions into asm-generic
  powerpc: rename ppc_pci_*_flags to pci_*_flags

Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h
parents 62c9072b c8f85523

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ config ARCH_INTEGRATOR 
	select ARM_AMBA

	select ARCH_HAS_CPUFREQ

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select PLAT_VERSATILE
@@ -253,6 +254,7 @@ config ARCH_REALVIEW 
	bool "ARM Ltd. RealView family"

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -268,6 +270,7 @@ config ARCH_VERSATILE 
	select ARM_AMBA

	select ARM_VIC

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select ICST

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -284,6 +287,7 @@ config ARCH_VEXPRESS 
	select ARM_AMBA

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_PATA_PLATFORM
@@ -646,6 +650,7 @@ config ARCH_SHMOBILE 
	bool "Renesas SH-Mobile / R-Mobile"

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_CLOCKEVENTS

	select NO_IOPORT

	select SPARSE_IRQ
@@ -825,6 +830,7 @@ config ARCH_U300 
	select ARM_VIC

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select GENERIC_GPIO

	help

	  Support for ST-Ericsson U300 series mobile platforms.

arch/arm/include/asm/clkdev.h

+5 −0
Original line number Diff line number Diff line
@@ -14,7 +14,12 @@ 


#include <linux/slab.h>



#ifdef CONFIG_HAVE_MACH_CLKDEV

#include <mach/clkdev.h>

#else

#define __clk_get(clk)	({ 1; })

#define __clk_put(clk)	do { } while (0)

#endif



static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size)

{

arch/arm/include/asm/pci.h

+11 −1
Original line number Diff line number Diff line
@@ -3,9 +3,19 @@ 


#ifdef __KERNEL__

#include <asm-generic/pci-dma-compat.h>

#include <asm-generic/pci-bridge.h>



#include <asm/mach/pci.h> /* for pci_sys_data */

#include <mach/hardware.h> /* for PCIBIOS_MIN_* */



extern unsigned long pcibios_min_io;

#define PCIBIOS_MIN_IO pcibios_min_io

extern unsigned long pcibios_min_mem;

#define PCIBIOS_MIN_MEM pcibios_min_mem



static inline int pcibios_assign_all_busses(void)

{

	return pci_has_flag(PCI_REASSIGN_ALL_RSRC);

}



#ifdef CONFIG_PCI_DOMAINS

static inline int pci_domain_nr(struct pci_bus *bus)

arch/arm/include/asm/vga.h

+3 −2
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
#define ASMARM_VGA_H



#include <linux/io.h>

#include <mach/hardware.h>



#define VGA_MAP_MEM(x,s)	(PCIMEM_BASE + (x))

extern unsigned long vga_base;



#define VGA_MAP_MEM(x,s)	(vga_base + (x))



#define vga_readb(x)	(*((volatile unsigned char *)x))

#define vga_writeb(x,y)	(*((volatile unsigned char *)y) = (x))

arch/arm/lib/ecard.S

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
 */

#include <linux/linkage.h>

#include <asm/assembler.h>

#include <mach/hardware.h>



#define CPSR2SPSR(rt) \

		mrs	rt, cpsr; \