These updates are all for board specific code, including
 
 * defconfig updates for shmobile, davinci, bcm2835, imx, omap and tegra
 * SD/MMC and I2C support on bcm2835 (Raspberry PI)
 * minor updates for PXA
 * shmobile updates to GPIO usage in board files
 * More things in OMAP board files are moved over to device tree probing
 * Better support for audio devices on some OMAP platforms
 
 Conflicts include the omap board-apollon.c file that is removed without
 a replacement, and conflicting context in the 4430sdp board file.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUSUyPmCrR//JCVInAQKc4xAAm3UXWLjjIecgdcWperYzUn8wVGg2sRvT
 eFFtGvj3iC+HttPw01O2uVn2O/ixW6SJIgls1O3VTt6IKXPQg3OCjeu1/1vvgq14
 IWuOVS9TLUS4IWkbIvQSdWrDTHocon1Umx+yIgyOpenHBn6kHMg1Tx6qQlUKKo8q
 ne8DKlAfSmao2oHg08Biuzc+cjUOCj7Dq57P1Y5gRhtmdXiFfvdd6GytyFAGUl/m
 60c7BECUs9ileeAUTgehsUk84uV9w/FHeWhccxKspd8GjuHg31t5lB/PEEud34FK
 CTBWoPRn/xG6qjmp34kjP2zIFVfiYYscJpSzXw+cOmPx2gNcs9mGUflAmG9I2t/C
 TPuRCgmhqjZkfHjoNPUaGSvLa4m3279lrqxVqU6BWs8NlqzXSma1rqUKCxikV4lR
 OlPasykwIGdHoJWyrm517RRkLq9Jn2XxtZmequp8TAsUBzW1Su3ZNArSQ6VqGTgs
 W8T20UGVj4bDaAUG4VICeRZGIJx5wknEr11NrRL1a0/EFhFUxNFZf5JAs1YHw/Yi
 rJP8oTppbo6eAaTThc6/a1/rklu8TUcRvmeS+iIH4IFxbroqc/ntAYd16+cKhPbO
 EJtvUv2B3WQZesV7zmDG4TzleYjgYeFxPzTeYHHOYRIgDA3al2eSlp6EIZULSmul
 gqxlMv/YHF8=
 =/qBE
 -----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board specific changes from Arnd Bergmann:
 "These updates are all for board specific code, including
   - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
     tegra
   - SD/MMC and I2C support on bcm2835 (Raspberry PI)
   - minor updates for PXA
   - shmobile updates to GPIO usage in board files
   - More things in OMAP board files are moved over to device tree
     probing
   - Better support for audio devices on some OMAP platforms"
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...
		
	
			
		
			
				
	
	
		
			558 lines
		
	
	
	
		
			16 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			558 lines
		
	
	
	
		
			16 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * 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/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,
 | 
						|
};
 | 
						|
 | 
						|
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
 | 
						|
static int twl_set_voltage(void *data, int target_uV)
 | 
						|
{
 | 
						|
	struct voltagedomain *voltdm = (struct voltagedomain *)data;
 | 
						|
	return voltdm_scale(voltdm, target_uV);
 | 
						|
}
 | 
						|
 | 
						|
static int twl_get_voltage(void *data)
 | 
						|
{
 | 
						|
	struct voltagedomain *voltdm = (struct voltagedomain *)data;
 | 
						|
	return voltdm_get_voltage(voltdm);
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
void __init omap_pmic_init(int bus, u32 clkrate,
 | 
						|
			   const char *pmic_type, int pmic_irq,
 | 
						|
			   struct twl4030_platform_data *pmic_data)
 | 
						|
{
 | 
						|
	omap_mux_init_signal("sys_nirq", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);
 | 
						|
	strlcpy(pmic_i2c_board_info.type, pmic_type,
 | 
						|
		sizeof(pmic_i2c_board_info.type));
 | 
						|
	pmic_i2c_board_info.irq = pmic_irq;
 | 
						|
	pmic_i2c_board_info.platform_data = pmic_data;
 | 
						|
 | 
						|
	omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);
 | 
						|
}
 | 
						|
 | 
						|
void __init omap4_pmic_init(const char *pmic_type,
 | 
						|
		    struct twl4030_platform_data *pmic_data,
 | 
						|
		    struct i2c_board_info *devices, int nr_devices)
 | 
						|
{
 | 
						|
	/* PMIC part*/
 | 
						|
	omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);
 | 
						|
	omap_mux_init_signal("fref_clk0_out.sys_drm_msecure", OMAP_PIN_OUTPUT);
 | 
						|
	omap_pmic_init(1, 400, pmic_type, 7 + OMAP44XX_IRQ_GIC_START, pmic_data);
 | 
						|
 | 
						|
	/* Register additional devices on i2c1 bus if needed */
 | 
						|
	if (devices)
 | 
						|
		i2c_register_board_info(1, devices, nr_devices);
 | 
						|
}
 | 
						|
 | 
						|
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 defined(CONFIG_ARCH_OMAP3)
 | 
						|
static struct twl4030_usb_data omap3_usb_pdata = {
 | 
						|
	.usb_mode	= T2_USB_MODE_ULPI,
 | 
						|
};
 | 
						|
 | 
						|
static int omap3_batt_table[] = {
 | 
						|
/* 0 C */
 | 
						|
30800, 29500, 28300, 27100,
 | 
						|
26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
 | 
						|
17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
 | 
						|
11600, 11200, 10800, 10400, 10000, 9630,  9280,  8950,  8620,  8310,
 | 
						|
8020,  7730,  7460,  7200,  6950,  6710,  6470,  6250,  6040,  5830,
 | 
						|
5640,  5450,  5260,  5090,  4920,  4760,  4600,  4450,  4310,  4170,
 | 
						|
4040,  3910,  3790,  3670,  3550
 | 
						|
};
 | 
						|
 | 
						|
static struct twl4030_bci_platform_data omap3_bci_pdata = {
 | 
						|
	.battery_tmp_tbl	= omap3_batt_table,
 | 
						|
	.tblsize		= ARRAY_SIZE(omap3_batt_table),
 | 
						|
};
 | 
						|
 | 
						|
static struct twl4030_madc_platform_data omap3_madc_pdata = {
 | 
						|
	.irq_line	= 1,
 | 
						|
};
 | 
						|
 | 
						|
static struct twl4030_codec_data omap3_codec;
 | 
						|
 | 
						|
static struct twl4030_audio_data omap3_audio_pdata = {
 | 
						|
	.audio_mclk = 26000000,
 | 
						|
	.codec = &omap3_codec,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = {
 | 
						|
	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap3_vdac_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1800000,
 | 
						|
		.max_uV			= 1800000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies	= ARRAY_SIZE(omap3_vdda_dac_supplies),
 | 
						|
	.consumer_supplies	= omap3_vdda_dac_supplies,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap3_vpll2_supplies[] = {
 | 
						|
	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
 | 
						|
	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap3_vpll2_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV                 = 1800000,
 | 
						|
		.max_uV                 = 1800000,
 | 
						|
		.valid_modes_mask       = REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask         = REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap3_vpll2_supplies),
 | 
						|
	.consumer_supplies		= omap3_vpll2_supplies,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap3_vdd1_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vcc", "cpu0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap3_vdd2_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vcc", "l3_main.0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap3_vdd1 = {
 | 
						|
	.constraints = {
 | 
						|
		.name			= "vdd_mpu_iva",
 | 
						|
		.min_uV			= 600000,
 | 
						|
		.max_uV			= 1450000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap3_vdd1_supply),
 | 
						|
	.consumer_supplies		= omap3_vdd1_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap3_vdd2 = {
 | 
						|
	.constraints = {
 | 
						|
		.name			= "vdd_core",
 | 
						|
		.min_uV			= 600000,
 | 
						|
		.max_uV			= 1450000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap3_vdd2_supply),
 | 
						|
	.consumer_supplies		= omap3_vdd2_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct twl_regulator_driver_data omap3_vdd1_drvdata = {
 | 
						|
	.get_voltage = twl_get_voltage,
 | 
						|
	.set_voltage = twl_set_voltage,
 | 
						|
};
 | 
						|
 | 
						|
static struct twl_regulator_driver_data omap3_vdd2_drvdata = {
 | 
						|
	.get_voltage = twl_get_voltage,
 | 
						|
	.set_voltage = twl_set_voltage,
 | 
						|
};
 | 
						|
 | 
						|
void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
 | 
						|
				  u32 pdata_flags, u32 regulators_flags)
 | 
						|
{
 | 
						|
	if (!pmic_data->vdd1) {
 | 
						|
		omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
 | 
						|
		omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
 | 
						|
		pmic_data->vdd1 = &omap3_vdd1;
 | 
						|
	}
 | 
						|
	if (!pmic_data->vdd2) {
 | 
						|
		omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
 | 
						|
		omap3_vdd2_drvdata.data = voltdm_lookup("core");
 | 
						|
		pmic_data->vdd2 = &omap3_vdd2;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Common platform data configurations */
 | 
						|
	if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
 | 
						|
		pmic_data->usb = &omap3_usb_pdata;
 | 
						|
 | 
						|
	if (pdata_flags & TWL_COMMON_PDATA_BCI && !pmic_data->bci)
 | 
						|
		pmic_data->bci = &omap3_bci_pdata;
 | 
						|
 | 
						|
	if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)
 | 
						|
		pmic_data->madc = &omap3_madc_pdata;
 | 
						|
 | 
						|
	if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->audio)
 | 
						|
		pmic_data->audio = &omap3_audio_pdata;
 | 
						|
 | 
						|
	/* Common regulator configurations */
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
 | 
						|
		pmic_data->vdac = &omap3_vdac_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VPLL2 && !pmic_data->vpll2)
 | 
						|
		pmic_data->vpll2 = &omap3_vpll2_idata;
 | 
						|
}
 | 
						|
#endif /* CONFIG_ARCH_OMAP3 */
 | 
						|
 | 
						|
#if defined(CONFIG_ARCH_OMAP4)
 | 
						|
static struct twl4030_usb_data omap4_usb_pdata = {
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vdda_hdmi_dac_supplies[] = {
 | 
						|
	REGULATOR_SUPPLY("vdda_hdmi_dac", "omapdss_hdmi"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vdac_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1800000,
 | 
						|
		.max_uV			= 1800000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies	= ARRAY_SIZE(omap4_vdda_hdmi_dac_supplies),
 | 
						|
	.consumer_supplies	= omap4_vdda_hdmi_dac_supplies,
 | 
						|
	.supply_regulator	= "V2V1",
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vaux2_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1200000,
 | 
						|
		.max_uV			= 2800000,
 | 
						|
		.apply_uV		= true,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
 | 
						|
					| REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vaux3_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1000000,
 | 
						|
		.max_uV			= 3000000,
 | 
						|
		.apply_uV		= true,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
 | 
						|
					| REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vmmc_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
 | 
						|
};
 | 
						|
 | 
						|
/* VMMC1 for MMC1 card */
 | 
						|
static struct regulator_init_data omap4_vmmc_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1200000,
 | 
						|
		.max_uV			= 3000000,
 | 
						|
		.apply_uV		= true,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
 | 
						|
					| REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies  = ARRAY_SIZE(omap4_vmmc_supply),
 | 
						|
	.consumer_supplies      = omap4_vmmc_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vpp_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1800000,
 | 
						|
		.max_uV			= 2500000,
 | 
						|
		.apply_uV		= true,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
 | 
						|
					| REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vana_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 2100000,
 | 
						|
		.max_uV			= 2100000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vcxio_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dss"),
 | 
						|
	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"),
 | 
						|
	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.1"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vcxio_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1800000,
 | 
						|
		.max_uV			= 1800000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
		.always_on		= true,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies	= ARRAY_SIZE(omap4_vcxio_supply),
 | 
						|
	.consumer_supplies	= omap4_vcxio_supply,
 | 
						|
	.supply_regulator	= "V2V1",
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vusb_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 3300000,
 | 
						|
		.max_uV			= 3300000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_clk32kg_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vdd1_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vcc", "cpu0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vdd2_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vcc", "iva.0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_vdd3_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vcc", "l3_main.0"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vdd1 = {
 | 
						|
	.constraints = {
 | 
						|
		.name			= "vdd_mpu",
 | 
						|
		.min_uV			= 500000,
 | 
						|
		.max_uV			= 1500000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd1_supply),
 | 
						|
	.consumer_supplies		= omap4_vdd1_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vdd2 = {
 | 
						|
	.constraints = {
 | 
						|
		.name			= "vdd_iva",
 | 
						|
		.min_uV			= 500000,
 | 
						|
		.max_uV			= 1500000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd2_supply),
 | 
						|
	.consumer_supplies		= omap4_vdd2_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_vdd3 = {
 | 
						|
	.constraints = {
 | 
						|
		.name			= "vdd_core",
 | 
						|
		.min_uV			= 500000,
 | 
						|
		.max_uV			= 1500000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies		= ARRAY_SIZE(omap4_vdd3_supply),
 | 
						|
	.consumer_supplies		= omap4_vdd3_supply,
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
static struct twl_regulator_driver_data omap4_vdd1_drvdata = {
 | 
						|
	.get_voltage = twl_get_voltage,
 | 
						|
	.set_voltage = twl_set_voltage,
 | 
						|
};
 | 
						|
 | 
						|
static struct twl_regulator_driver_data omap4_vdd2_drvdata = {
 | 
						|
	.get_voltage = twl_get_voltage,
 | 
						|
	.set_voltage = twl_set_voltage,
 | 
						|
};
 | 
						|
 | 
						|
static struct twl_regulator_driver_data omap4_vdd3_drvdata = {
 | 
						|
	.get_voltage = twl_get_voltage,
 | 
						|
	.set_voltage = twl_set_voltage,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_v1v8_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("vio", "1-004b"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_v1v8_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 1800000,
 | 
						|
		.max_uV			= 1800000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
		.always_on		= true,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies	= ARRAY_SIZE(omap4_v1v8_supply),
 | 
						|
	.consumer_supplies	= omap4_v1v8_supply,
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_consumer_supply omap4_v2v1_supply[] = {
 | 
						|
	REGULATOR_SUPPLY("v2v1", "1-004b"),
 | 
						|
};
 | 
						|
 | 
						|
static struct regulator_init_data omap4_v2v1_idata = {
 | 
						|
	.constraints = {
 | 
						|
		.min_uV			= 2100000,
 | 
						|
		.max_uV			= 2100000,
 | 
						|
		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 | 
						|
					| REGULATOR_MODE_STANDBY,
 | 
						|
		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 | 
						|
					| REGULATOR_CHANGE_STATUS,
 | 
						|
	},
 | 
						|
	.num_consumer_supplies	= ARRAY_SIZE(omap4_v2v1_supply),
 | 
						|
	.consumer_supplies	= omap4_v2v1_supply,
 | 
						|
};
 | 
						|
 | 
						|
void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
 | 
						|
				  u32 pdata_flags, u32 regulators_flags)
 | 
						|
{
 | 
						|
	if (!pmic_data->vdd1) {
 | 
						|
		omap4_vdd1.driver_data = &omap4_vdd1_drvdata;
 | 
						|
		omap4_vdd1_drvdata.data = voltdm_lookup("mpu");
 | 
						|
		pmic_data->vdd1 = &omap4_vdd1;
 | 
						|
	}
 | 
						|
 | 
						|
	if (!pmic_data->vdd2) {
 | 
						|
		omap4_vdd2.driver_data = &omap4_vdd2_drvdata;
 | 
						|
		omap4_vdd2_drvdata.data = voltdm_lookup("iva");
 | 
						|
		pmic_data->vdd2 = &omap4_vdd2;
 | 
						|
	}
 | 
						|
 | 
						|
	if (!pmic_data->vdd3) {
 | 
						|
		omap4_vdd3.driver_data = &omap4_vdd3_drvdata;
 | 
						|
		omap4_vdd3_drvdata.data = voltdm_lookup("core");
 | 
						|
		pmic_data->vdd3 = &omap4_vdd3;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Common platform data configurations */
 | 
						|
	if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)
 | 
						|
		pmic_data->usb = &omap4_usb_pdata;
 | 
						|
 | 
						|
	/* Common regulator configurations */
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)
 | 
						|
		pmic_data->vdac = &omap4_vdac_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VAUX2 && !pmic_data->vaux2)
 | 
						|
		pmic_data->vaux2 = &omap4_vaux2_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VAUX3 && !pmic_data->vaux3)
 | 
						|
		pmic_data->vaux3 = &omap4_vaux3_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VMMC && !pmic_data->vmmc)
 | 
						|
		pmic_data->vmmc = &omap4_vmmc_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VPP && !pmic_data->vpp)
 | 
						|
		pmic_data->vpp = &omap4_vpp_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VANA && !pmic_data->vana)
 | 
						|
		pmic_data->vana = &omap4_vana_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VCXIO && !pmic_data->vcxio)
 | 
						|
		pmic_data->vcxio = &omap4_vcxio_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_VUSB && !pmic_data->vusb)
 | 
						|
		pmic_data->vusb = &omap4_vusb_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_CLK32KG &&
 | 
						|
	    !pmic_data->clk32kg)
 | 
						|
		pmic_data->clk32kg = &omap4_clk32kg_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_V1V8 && !pmic_data->v1v8)
 | 
						|
		pmic_data->v1v8 = &omap4_v1v8_idata;
 | 
						|
 | 
						|
	if (regulators_flags & TWL_COMMON_REGULATOR_V2V1 && !pmic_data->v2v1)
 | 
						|
		pmic_data->v2v1 = &omap4_v2v1_idata;
 | 
						|
}
 | 
						|
#endif /* CONFIG_ARCH_OMAP4 */
 | 
						|
 | 
						|
#if defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) || \
 | 
						|
	defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030_MODULE)
 | 
						|
#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 */
 |