diff options
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db5500.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-ux500/include/mach/devices.h | 2 |
5 files changed, 37 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index d3b016d92c6..a0efc82eb34 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -951,6 +951,7 @@ static struct platform_device *mop500_platform_devs[] __initdata = { &u8500_mcde_device, #endif &u8500_b2r2_device, + &u8500_b2r2_blt_device, &u8500_thsens_device, #ifdef CONFIG_LEDS_PWM &ux500_leds_device, @@ -1192,6 +1193,7 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &u8500_mcde_device, #endif &u8500_b2r2_device, + &u8500_b2r2_blt_device, }; static void fixup_ab8505_gpio(void) diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index 8429363531d..c3bae368bd7 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -587,6 +587,7 @@ static struct platform_device *u5500_platform_devices[] __initdata = { #endif &ux500_hwmem_device, &u5500_b2r2_device, + &u5500_b2r2_blt_device, &u5500_mloader_device, #ifdef CONFIG_U5500_MMIO &u5500_mmio_device, diff --git a/arch/arm/mach-ux500/devices-db5500.c b/arch/arm/mach-ux500/devices-db5500.c index 73300e06281..ec7c6378d0e 100644 --- a/arch/arm/mach-ux500/devices-db5500.c +++ b/arch/arm/mach-ux500/devices-db5500.c @@ -233,6 +233,20 @@ struct platform_device u5500_mcde_device = { }; #endif +struct platform_device u5500_b2r2_blt_device = { + .name = "b2r2_blt", + .id = 0, + .dev = { + .init_name = "b2r2_blt_init", + .coherent_dma_mask = ~0, + }, +}; + +static struct b2r2_platform_data b2r2_platform_data = { + .regulator_id = "vsupply", + .clock_id = "b2r2", +}; + static struct resource b2r2_resources[] = { [0] = { .start = U5500_B2R2_BASE, @@ -253,6 +267,7 @@ struct platform_device u5500_b2r2_device = { .id = 0, .dev = { .init_name = "b2r2_bus", + .platform_data = &b2r2_platform_data, .coherent_dma_mask = ~0, }, .num_resources = ARRAY_SIZE(b2r2_resources), diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index e002d04c836..ee376a504b8 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -29,6 +29,7 @@ #include <mach/hsi.h> #endif #include <mach/ste-dma40-db8500.h> +#include <video/b2r2_blt.h> #include "pins-db8500.h" @@ -250,6 +251,20 @@ struct platform_device u8500_mcde_device = { }; #endif /* CONFIG_FB_MCDE */ +struct platform_device u8500_b2r2_blt_device = { + .name = "b2r2_blt", + .id = 0, + .dev = { + .init_name = "b2r2_blt_init", + .coherent_dma_mask = ~0, + }, +}; + +static struct b2r2_platform_data b2r2_platform_data = { + .regulator_id = "vsupply", + .clock_id = "b2r2", +}; + static struct resource b2r2_resources[] = { [0] = { .start = U8500_B2R2_BASE, @@ -269,7 +284,8 @@ struct platform_device u8500_b2r2_device = { .name = "b2r2", .id = 0, .dev = { - .init_name = "b2r2_bus", + .init_name = "b2r2_core", + .platform_data = &b2r2_platform_data, .coherent_dma_mask = ~0, }, .num_resources = ARRAY_SIZE(b2r2_resources), diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h index 2392b06f91f..6d176e93653 100644 --- a/arch/arm/mach-ux500/include/mach/devices.h +++ b/arch/arm/mach-ux500/include/mach/devices.h @@ -16,6 +16,8 @@ extern struct platform_device u8500_gpio_devs[]; extern struct platform_device u8500_mcde_device; extern struct platform_device u5500_mcde_device; extern struct platform_device u8500_shrm_device; +extern struct platform_device u8500_b2r2_blt_device; +extern struct platform_device u5500_b2r2_blt_device; extern struct platform_device u8500_b2r2_device; extern struct platform_device u5500_b2r2_device; extern struct platform_device u8500_trace_modem; |