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

Commit 174e7796 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ux500: get rid of <mach/[hardware|db8500-regs].h> 



This removes <mach/hardware.h> and <mach/db8500-regs.h>
from the Ux500, merging them into the local include
"db8500-regs.h" in mach-ux500. There is some impact
outside the ux500 machine, but most of it is dealt with
in earlier patches.

Contains portions of a clean-up patch from Arnd Bergmann.

Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarMike Turquette <mturquette@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e5a1f682

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

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/platform_data/dma-ste-dma40.h>



#include <mach/devices.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <linux/platform_data/asoc-ux500-msp.h>

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

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 


#include <asm/mach-types.h>



#include <mach/hardware.h>



#include "pins-db8500.h"

#include "board-mop500.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 


#include <asm/mach-types.h>

#include <mach/devices.h>

#include <mach/hardware.h>



#include "db8500-regs.h"

#include "devices-db8500.h"

#include "board-mop500.h"

#include "ste-dma40-db8500.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/init.h>

#include <linux/i2c.h>



#include <mach/hardware.h>

#include "board-mop500.h"

#include "id.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>

#include <mach/irqs.h>

#include <linux/platform_data/crypto-ux500.h>



#include "ste-dma40-db8500.h"

#include "db8500-regs.h"

#include "devices-db8500.h"

#include "board-mop500.h"

#include "board-mop500-regulators.h"