ARM: ux500: Clean-up MSP platform code
This patch contains a couple of general MSP clean-ups pertaining to layout changes and changing functions to be void instead of int instead of regardlessly returning '0'. Acked-by: Ola Lilja <ola.o.lilja@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
9cf24b157c
commit
65b67d33fb
|
@ -143,11 +143,11 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent,
|
||||||
|
|
||||||
/* Platform device for ASoC MOP500 machine */
|
/* Platform device for ASoC MOP500 machine */
|
||||||
static struct platform_device snd_soc_mop500 = {
|
static struct platform_device snd_soc_mop500 = {
|
||||||
.name = "snd-soc-mop500",
|
.name = "snd-soc-mop500",
|
||||||
.id = 0,
|
.id = 0,
|
||||||
.dev = {
|
.dev = {
|
||||||
.platform_data = NULL,
|
.platform_data = NULL,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Platform device for Ux500-PCM */
|
/* Platform device for Ux500-PCM */
|
||||||
|
@ -171,7 +171,7 @@ static struct msp_i2s_platform_data msp3_platform_data = {
|
||||||
.msp_i2s_dma_tx = NULL,
|
.msp_i2s_dma_tx = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
int mop500_msp_init(struct device *parent)
|
void mop500_msp_init(struct device *parent)
|
||||||
{
|
{
|
||||||
pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
|
pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
|
||||||
platform_device_register(&snd_soc_mop500);
|
platform_device_register(&snd_soc_mop500);
|
||||||
|
@ -185,6 +185,4 @@ int mop500_msp_init(struct device *parent)
|
||||||
&msp2_platform_data);
|
&msp2_platform_data);
|
||||||
db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
|
db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
|
||||||
&msp3_platform_data);
|
&msp3_platform_data);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) ST-Ericsson SA 2012
|
|
||||||
*
|
|
||||||
* Author: Ola Lilja <ola.o.lilja@stericsson.com>,
|
|
||||||
* for ST-Ericsson.
|
|
||||||
*
|
|
||||||
* License terms:
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as published
|
|
||||||
* by the Free Software Foundation.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void mop500_msp_init(struct device *parent);
|
|
|
@ -54,7 +54,6 @@
|
||||||
#include "devices-db8500.h"
|
#include "devices-db8500.h"
|
||||||
#include "board-mop500.h"
|
#include "board-mop500.h"
|
||||||
#include "board-mop500-regulators.h"
|
#include "board-mop500-regulators.h"
|
||||||
#include "board-mop500-msp.h"
|
|
||||||
|
|
||||||
static struct gpio_led snowball_led_array[] = {
|
static struct gpio_led snowball_led_array[] = {
|
||||||
{
|
{
|
||||||
|
|
|
@ -94,6 +94,7 @@ void __init mop500_stuib_init(void);
|
||||||
void __init mop500_pinmaps_init(void);
|
void __init mop500_pinmaps_init(void);
|
||||||
void __init snowball_pinmaps_init(void);
|
void __init snowball_pinmaps_init(void);
|
||||||
void __init hrefv60_pinmaps_init(void);
|
void __init hrefv60_pinmaps_init(void);
|
||||||
|
void mop500_msp_init(struct device *parent);
|
||||||
|
|
||||||
int __init mop500_uib_init(void);
|
int __init mop500_uib_init(void);
|
||||||
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
|
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
|
||||||
|
|
Loading…
Reference in New Issue