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

Commit 65b67d33 authored by Lee Jones's avatar Lee Jones
Browse files

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: default avatarOla Lilja <ola.o.lilja@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 9cf24b15

arch/arm/mach-ux500/board-mop500-msp.c

+6 −8
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct msp_i2s_platform_data msp3_platform_data = { 
	.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__);

	platform_device_register(&snd_soc_mop500);
@@ -185,6 +185,4 @@ int mop500_msp_init(struct device *parent) 
			   &msp2_platform_data);

	db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,

			   &msp3_platform_data);



	return 0;

}

arch/arm/mach-ux500/board-mop500-msp.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * 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);

arch/arm/mach-ux500/board-mop500.c

+0 −1
Original line number Diff line number Diff line
@@ -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[] = {

	{

arch/arm/mach-ux500/board-mop500.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 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);



int __init mop500_uib_init(void);

void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,