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

Commit 0d07c1cb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Remove legacy twl4030 platform init code 



This code is no longer used and can be removed as we
are using device tree.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cb6675d6

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -257,4 +257,4 @@ obj-y += $(nand-m) $(nand-y) 
smsc911x-$(CONFIG_SMSC911X)		:= gpmc-smsc911x.o

obj-y					+= $(smsc911x-m) $(smsc911x-y)



obj-y					+= common-board-devices.o twl-common.o dss-common.o
 
obj-y					+= common-board-devices.o dss-common.o

arch/arm/mach-omap2/common-board-devices.h

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <sound/tlv320aic3x.h>

#include <linux/mfd/menelaus.h>

#include "twl-common.h"



#define NAND_BLOCK_SIZE	SZ_128K

arch/arm/mach-omap2/twl-common.c

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

 * twl-common.c

 *

 * Copyright (C) 2011 Texas Instruments, Inc..

 * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#include <linux/i2c.h>

#include <linux/i2c/twl.h>

#include <linux/gpio.h>

#include <linux/string.h>

#include <linux/phy/phy.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include "soc.h"

#include "twl-common.h"

#include "pm.h"

#include "voltage.h"

#include "mux.h"



static struct i2c_board_info __initdata pmic_i2c_board_info = {

	.addr		= 0x48,

	.flags		= I2C_CLIENT_WAKE,

};



void __init omap_pmic_late_init(void)

{

	/* Init the OMAP TWL parameters (if PMIC has been registerd) */

	if (!pmic_i2c_board_info.irq)

		return;



	omap3_twl_init();

	omap4_twl_init();

}



#if IS_ENABLED(CONFIG_SND_OMAP_SOC_OMAP_TWL4030)

#include <linux/platform_data/omap-twl4030.h>



/* Commonly used configuration */

static struct omap_tw4030_pdata omap_twl4030_audio_data;



static struct platform_device audio_device = {

	.name		= "omap-twl4030",

	.id		= -1,

};



void omap_twl4030_audio_init(char *card_name,

				    struct omap_tw4030_pdata *pdata)

{

	if (!pdata)

		pdata = &omap_twl4030_audio_data;



	pdata->card_name = card_name;



	audio_device.dev.platform_data = pdata;

	platform_device_register(&audio_device);

}



#else /* SOC_OMAP_TWL4030 */

void omap_twl4030_audio_init(char *card_name,

				    struct omap_tw4030_pdata *pdata)

{

	return;

}

#endif /* SOC_OMAP_TWL4030 */

arch/arm/mach-omap2/twl-common.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
#ifndef __OMAP_PMIC_COMMON__

#define __OMAP_PMIC_COMMON__



#include "common.h"



#define TWL_COMMON_PDATA_USB		(1 << 0)

#define TWL_COMMON_PDATA_BCI		(1 << 1)

#define TWL_COMMON_PDATA_MADC		(1 << 2)

#define TWL_COMMON_PDATA_AUDIO		(1 << 3)



/* Common LDO regulators for TWL4030/TWL6030 */

#define TWL_COMMON_REGULATOR_VDAC	(1 << 0)

#define TWL_COMMON_REGULATOR_VAUX1	(1 << 1)

#define TWL_COMMON_REGULATOR_VAUX2	(1 << 2)

#define TWL_COMMON_REGULATOR_VAUX3	(1 << 3)



/* TWL6030 LDO regulators */

#define TWL_COMMON_REGULATOR_VMMC	(1 << 4)

#define TWL_COMMON_REGULATOR_VPP	(1 << 5)

#define TWL_COMMON_REGULATOR_VUSIM	(1 << 6)

#define TWL_COMMON_REGULATOR_VANA	(1 << 7)

#define TWL_COMMON_REGULATOR_VCXIO	(1 << 8)

#define TWL_COMMON_REGULATOR_VUSB	(1 << 9)

#define TWL_COMMON_REGULATOR_CLK32KG	(1 << 10)

#define TWL_COMMON_REGULATOR_V1V8	(1 << 11)

#define TWL_COMMON_REGULATOR_V2V1	(1 << 12)



/* TWL4030 LDO regulators */

#define TWL_COMMON_REGULATOR_VPLL1	(1 << 4)

#define TWL_COMMON_REGULATOR_VPLL2	(1 << 5)





struct twl4030_platform_data;

struct twl6040_platform_data;

struct omap_tw4030_pdata;

struct i2c_board_info;



void omap_pmic_late_init(void);



void omap_twl4030_audio_init(char *card_name, struct omap_tw4030_pdata *pdata);



#endif /* __OMAP_PMIC_COMMON__ */