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

Commit 0b79f277 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-no-idh' of... 

Merge tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup

From Linus Walleij:
Removal of the <mach/id.h> include from ux500
- First an ACKed MFD patch deleting the only consumer
  of these cpu_is* functions outside of mach-ux500
- Introduce a new local cpu_is_u8580() in this patch
  set to avoid clashing with other patch sets.
- Finally de-globalize <mach/id.h>.

* tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: de-globalize <mach/id.h>
  ARM: ux500: Introduce cpu_is_u8580()
  mfd: prcmu: delete pin control helpers

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1576a31c 7a4f2609

arch/arm/mach-ux500/board-mop500-uib.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <mach/hardware.h>

#include "board-mop500.h"

#include "id.h"



enum mop500_uib {

	STUIB,

arch/arm/mach-ux500/cache-l2x0.c

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
#include <asm/cacheflush.h>

#include <asm/hardware/cache-l2x0.h>

#include <mach/hardware.h>

#include <mach/id.h>



#include "id.h"



static void __iomem *l2x0_base;

arch/arm/mach-ux500/cpu-db8500.c

+2 −0
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ 


#include "devices-db8500.h"

#include "ste-dma40-db8500.h"



#include "board-mop500.h"

#include "id.h"



/* minimum static i/o mapping required to boot U8500 platforms */

static struct map_desc u8500_uart_io_desc[] __initdata = {

arch/arm/mach-ux500/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <mach/devices.h>



#include "board-mop500.h"

#include "id.h"



void __iomem *_PRCMU_BASE;

arch/arm/mach-ux500/id.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <mach/hardware.h>

#include <mach/setup.h>



#include "id.h"



struct dbx500_asic_id dbx500_id;



static unsigned int ux500_read_asicid(phys_addr_t addr)