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

Commit 54ecf4f0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: w90x900: move platform_data definitions 



Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.

This moves such data out of the w90x900 include directories

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 19d33101

arch/arm/mach-w90x900/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
#include <asm/mach-types.h>



#include <mach/regs-serial.h>

#include <mach/nuc900_spi.h>

#include <linux/platform_data/spi-nuc900.h>

#include <mach/map.h>

#include <mach/fb.h>

#include <linux/platform_data/video-nuc900fb.h>

#include <mach/regs-ldm.h>

#include <mach/w90p910_keypad.h>

#include <linux/platform_data/keypad-w90p910.h>



#include "cpu.h"

arch/arm/mach-w90x900/mach-nuc950evb.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach-types.h>

#include <mach/map.h>

#include <mach/fb.h>

#include <linux/platform_data/video-nuc900fb.h>



#include "nuc950.h"

drivers/i2c/busses/i2c-nuc900.c

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



#include <mach/mfp.h>

#include <mach/i2c.h>

#include <linux/platform_data/i2c-nuc900.h>



/* nuc900 i2c registers offset */

drivers/input/keyboard/w90p910_keypad.c

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

#include <linux/slab.h>



#include <mach/w90p910_keypad.h>

#include <linux/platform_data/keypad-w90p910.h>



/* Keypad Interface Control Registers */

#define KPI_CONF		0x00

drivers/spi/spi-nuc900.c

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

#include <linux/spi/spi_bitbang.h>



#include <mach/nuc900_spi.h>

#include <linux/platform_data/spi-nuc900.h>



/* usi registers offset */

#define USI_CNT		0x00