ARM: MX3: lilly1131: move MC13783 device registration
Subsystems (2)
PATCH 1/1 ARM: MX3: lilly1131: move MC13783 device registration
Register the MC13783 device in the module code.
Signed-off-by Daniel Mack <[email protected]>
--- arch/arm/mach-mx3/mx31lilly-db.c | 19 ------------------- arch/arm/mach-mx3/mx31lilly.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 19 deletions(-)
arch/arm/mach-mx3/mx31lilly-db.c +0 -19
@@ -29,8 +29,6 @@#include <linux/init.h> #include <linux/gpio.h> #include <linux/platform_device.h> -#include <linux/spi/spi.h> -#include <linux/mfd/mc13783.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -214,22 +212,6 @@ static void __init mx31lilly_init_fb(void)gpio_direction_output (LCD_VCC_EN_GPIO ,1 ); } -/* SPI */ - -static struct mc13783_platform_data mc13783_pdata__initdata = { - .flags =MC13783_USE_RTC |MC13783_USE_TOUCHSCREEN , -}; - -static struct spi_board_info lilly_spi_devs[]__initdata = { - { - .modalias ="mc13783" , - .max_speed_hz =1000000 , - .bus_num =1 , - .chip_select =0 , - .platform_data = &mc13783_pdata, - }, -}; -void __init mx31lilly_db_init (void ) { mxc_iomux_setup_multiple_pins(lilly_db_board_pins,
@@ -240,6 +222,5 @@ void __init mx31lilly_db_init(void)mxc_register_device (&mxc_uart_device2, &uart_pdata);mxc_register_device (&mxcsdhc_device0, &mmc_pdata);mx31lilly_init_fb (); -spi_register_board_info (lilly_spi_devs,ARRAY_SIZE (lilly_spi_devs)); }
arch/arm/mach-mx3/mx31lilly.c +17 -0
@@ -35,6 +35,8 @@#include <linux/gpio.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> +#include <linux/spi/spi.h> +#include <linux/mfd/mc13783.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -248,6 +250,8 @@ static struct platform_device *devices[] __initdata = { &physmap_flash_device, }; +/* SPI */ +static int spi_internal_chipselect[] = {MXC_SPI_CS (0 ),MXC_SPI_CS (1 ),
@@ -264,6 +268,18 @@ static struct spi_imx_master spi1_pdata = { .num_chipselect = ARRAY_SIZE(spi_internal_chipselect), }; +static struct mc13783_platform_data mc13783_pdata__initdata = { + .flags =MC13783_USE_RTC |MC13783_USE_TOUCHSCREEN , +}; + +static struct spi_board_info mc13783_dev__initdata = { + .modalias ="mc13783" , + .max_speed_hz =1000000 , + .bus_num =1 , + .chip_select =0 , + .platform_data = &mc13783_pdata, +}; +static int mx31lilly_baseboard;core_param (mx31lilly_baseboard, mx31lilly_baseboard, int,0444 );
@@ -301,6 +317,7 @@ static void __init mx31lilly_board_init(void)mxc_register_device (&mxc_spi_device0, &spi0_pdata);mxc_register_device (&mxc_spi_device1, &spi1_pdata); +spi_register_board_info (&mc13783_dev,1 );platform_add_devices (devices,ARRAY_SIZE (devices));
Signature · 1 line
1.6.5.2
PATCH 1/1 ARM: MX3: lilly1131: move MC13783 device registration
Quoted 3 lines · Daniel Mack
Register the MC13783 device in the module code.
Signed-off-by Daniel Mack <[email protected]>
Added to mxc-master.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 1/1 ARM: MX3: lilly1131: move MC13783 device registration
Hi Sascha,
Quoted 6 lines · Sascha Hauer
Quoted 3 lines · Daniel Mack
Register the MC13783 device in the module code.
Signed-off-by Daniel Mack <[email protected]>Added to mxc-master.
Thanks! Did you pick the LiteKit patches, too?
Daniel
PATCH 1/1 ARM: MX3: lilly1131: move MC13783 device registration
Quoted 11 lines · Daniel Mack
Hi Sascha,
Quoted 6 lines · Sascha Hauer
Quoted 3 lines · Daniel Mack
Register the MC13783 device in the module code.
Signed-off-by Daniel Mack <[email protected]>Added to mxc-master.
Thanks! Did you pick the LiteKit patches, too?
Yes
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |