[PATCH 03/21] ARM: ux500: Clean-up MSP platform code
This patch contains a couple of general MSP clean-ups and a bug-fix.
The general clean-ups pertain to layout changes and changing functions
to be void instead of int and not to regardlessly return '0'. The bug
that's fixed is thought to be caused by a merge error. The code
erroneously attempts to platform_device_register a non-existent struct.
It's a simple fix, just reference the correct platform_data structure
in its place.
Signed-off-by: Lee Jones
---
arch/arm/mach-ux500/board-mop500-msp.c | 28 +---
arch/arm/mach-ux500/board-mop500-msp.h | 14 --
arch/arm/mach-ux500/board-mop500.c |1 -
arch/arm/mach-ux500/board-mop500.h |3 +++
4 files changed, 16 insertions(+), 30 deletions(-)
delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c
b/arch/arm/mach-ux500/board-mop500-msp.c
index 9960480..217df1d 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -192,21 +192,21 @@ static struct platform_device *db8500_add_msp_i2s(struct
device *parent,
}
/* Platform device for ASoC U8500 machine */
-static struct platform_device snd_soc_u8500 = {
- .name = "snd-soc-u8500",
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
+static struct platform_device snd_soc_mop500 = {
+ .name = "snd-soc-mop500",
+ .id = 0,
+ .dev = {
+ .platform_data = NULL,
+ },
};
/* Platform device for Ux500-PCM */
static struct platform_device ux500_pcm = {
- .name = "ux500-pcm",
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
+ .name = "ux500-pcm",
+ .id = 0,
+ .dev = {
+ .platform_data = NULL,
+ },
};
static struct msp_i2s_platform_data msp2_platform_data = {
@@ -223,12 +223,12 @@ static struct msp_i2s_platform_data msp3_platform_data = {
.msp_i2s_exit = msp13_i2s_exit,
};
-int mop500_msp_init(struct device *parent)
+void mop500_msp_init(struct device *parent)
{
struct platform_device *msp1;
pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__);
- platform_device_register(_soc_u8500);
+ platform_device_register(_soc_mop500);
pr_info("Initialize MSP I2S-devices.\n");
db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
@@ -262,6 +262,4 @@ int mop500_msp_init(struct device *parent)
pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
platform_device_register(_pcm);
-
- return 0;
}
diff --git a/arch/arm/mach-ux500/board-mop500-msp.h
b/arch/arm/mach-ux500/board-mop500-msp.h
deleted file mode 100644
index 6fcfb5e..000
--- a/arch/arm/mach-ux500/board-mop500-msp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2012
- *
- * Author: Ola Lilja ,
- * 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);
diff --git a/arch/arm/mach-ux500/board-mop500.c
b/arch/arm/mach-ux500/board-mop500.c
index e641003..b87393c 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -54,7 +54,6 @@
#include "devices-db8500.h"
#include "board-mop500.h"
#include "board-mop500-regulators.h"
-#include "board-mop500-msp.h"
static struct gpio_led snowball_led_array[] = {
{
diff --git a/arch/arm/mach-ux500/board-mop500.h
b/arch/arm/mach-ux500/board-mop500.h
index d04a8e6..1d7316b 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -92,6 +92,9 @@ void __init mop500_stuib_init(void);
void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void);
+void mop500_msp_init(struct device *parent);
+/* Due for removal once the MSP driver has been fully DT:ed. */
+void mop500_of_msp_init(struct device *parent);
int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 03/21] ARM: ux500: Clean-up MSP platform code
This patch contains a couple of general MSP clean-ups and a bug-fix.
The general clean-ups pertain to layout changes and changing functions
to be void instead of int and not to regardlessly return '0'. The bug
that's fixed is thought to be caused by a merge error. The code
erroneously attempts to platform_device_register a non-existent struct.
It's a simple fix, just reference the correct platform_data structure
in its place.
Signed-off-by: Lee Jones lee.jo...@linaro.org
---
arch/arm/mach-ux500/board-mop500-msp.c | 28 +---
arch/arm/mach-ux500/board-mop500-msp.h | 14 --
arch/arm/mach-ux500/board-mop500.c |1 -
arch/arm/mach-ux500/board-mop500.h |3 +++
4 files changed, 16 insertions(+), 30 deletions(-)
delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c
b/arch/arm/mach-ux500/board-mop500-msp.c
index 9960480..217df1d 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -192,21 +192,21 @@ static struct platform_device *db8500_add_msp_i2s(struct
device *parent,
}
/* Platform device for ASoC U8500 machine */
-static struct platform_device snd_soc_u8500 = {
- .name = snd-soc-u8500,
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
+static struct platform_device snd_soc_mop500 = {
+ .name = snd-soc-mop500,
+ .id = 0,
+ .dev = {
+ .platform_data = NULL,
+ },
};
/* Platform device for Ux500-PCM */
static struct platform_device ux500_pcm = {
- .name = ux500-pcm,
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
+ .name = ux500-pcm,
+ .id = 0,
+ .dev = {
+ .platform_data = NULL,
+ },
};
static struct msp_i2s_platform_data msp2_platform_data = {
@@ -223,12 +223,12 @@ static struct msp_i2s_platform_data msp3_platform_data = {
.msp_i2s_exit = msp13_i2s_exit,
};
-int mop500_msp_init(struct device *parent)
+void mop500_msp_init(struct device *parent)
{
struct platform_device *msp1;
pr_info(%s: Register platform-device 'snd-soc-u8500'.\n, __func__);
- platform_device_register(snd_soc_u8500);
+ platform_device_register(snd_soc_mop500);
pr_info(Initialize MSP I2S-devices.\n);
db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
@@ -262,6 +262,4 @@ int mop500_msp_init(struct device *parent)
pr_info(%s: Register platform-device 'ux500-pcm'\n, __func__);
platform_device_register(ux500_pcm);
-
- return 0;
}
diff --git a/arch/arm/mach-ux500/board-mop500-msp.h
b/arch/arm/mach-ux500/board-mop500-msp.h
deleted file mode 100644
index 6fcfb5e..000
--- a/arch/arm/mach-ux500/board-mop500-msp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2012
- *
- * Author: Ola Lilja ola.o.li...@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);
diff --git a/arch/arm/mach-ux500/board-mop500.c
b/arch/arm/mach-ux500/board-mop500.c
index e641003..b87393c 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -54,7 +54,6 @@
#include devices-db8500.h
#include board-mop500.h
#include board-mop500-regulators.h
-#include board-mop500-msp.h
static struct gpio_led snowball_led_array[] = {
{
diff --git a/arch/arm/mach-ux500/board-mop500.h
b/arch/arm/mach-ux500/board-mop500.h
index d04a8e6..1d7316b 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -92,6 +92,9 @@ void __init mop500_stuib_init(void);
void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void);
+void mop500_msp_init(struct device *parent);
+/* Due for removal once the MSP driver has been fully DT:ed. */
+void mop500_of_msp_init(struct device *parent);
int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
--
1.7.9.5
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
