forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
* 'for-linus' of git://android.git.kernel.org/kernel/tegra: ARM: tegra: harmony: initialize the TPS65862 PMIC ARM: tegra: update defconfig ARM: tegra: harmony: update PCI-e initialization sequence ARM: tegra: trimslice: enable MMC/SD slots ARM: tegra: enable new drivers in defconfig ARM: tegra: Add Toshiba AC100 support ARM: tegra: harmony: Set WM8903 gpio_base ARM: tegra: harmony: I2C-related portions of audio support ARM: tegra: harmony: register i2c devices ARM: tegra: seaboard: register i2c devices ARM: tegra: harmony: Beginnings of audio support ARM: tegra: create defines for SD-related GPIO names ARM: tegra: add devices.c entries for audio
- Loading branch information
Showing
20 changed files
with
787 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* | ||
| * Copyright (C) 2010 NVIDIA, Inc. | ||
| * | ||
| * 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., 59 Temple Place, Suite 330, Boston, MA | ||
| * 02111-1307, USA | ||
| */ | ||
| #include <linux/i2c.h> | ||
| #include <linux/platform_device.h> | ||
| #include <linux/gpio.h> | ||
|
|
||
| #include <linux/regulator/machine.h> | ||
| #include <linux/mfd/tps6586x.h> | ||
|
|
||
| #include <mach/irqs.h> | ||
|
|
||
| #define PMC_CTRL 0x0 | ||
| #define PMC_CTRL_INTR_LOW (1 << 17) | ||
|
|
||
| static struct regulator_consumer_supply tps658621_ldo0_supply[] = { | ||
| REGULATOR_SUPPLY("pex_clk", NULL), | ||
| }; | ||
|
|
||
| static struct regulator_init_data ldo0_data = { | ||
| .constraints = { | ||
| .min_uV = 1250 * 1000, | ||
| .max_uV = 3300 * 1000, | ||
| .valid_modes_mask = (REGULATOR_MODE_NORMAL | | ||
| REGULATOR_MODE_STANDBY), | ||
| .valid_ops_mask = (REGULATOR_CHANGE_MODE | | ||
| REGULATOR_CHANGE_STATUS | | ||
| REGULATOR_CHANGE_VOLTAGE), | ||
| }, | ||
| .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), | ||
| .consumer_supplies = tps658621_ldo0_supply, | ||
| }; | ||
|
|
||
| #define HARMONY_REGULATOR_INIT(_id, _minmv, _maxmv) \ | ||
| static struct regulator_init_data _id##_data = { \ | ||
| .constraints = { \ | ||
| .min_uV = (_minmv)*1000, \ | ||
| .max_uV = (_maxmv)*1000, \ | ||
| .valid_modes_mask = (REGULATOR_MODE_NORMAL | \ | ||
| REGULATOR_MODE_STANDBY), \ | ||
| .valid_ops_mask = (REGULATOR_CHANGE_MODE | \ | ||
| REGULATOR_CHANGE_STATUS | \ | ||
| REGULATOR_CHANGE_VOLTAGE), \ | ||
| }, \ | ||
| } | ||
|
|
||
| HARMONY_REGULATOR_INIT(sm0, 725, 1500); | ||
| HARMONY_REGULATOR_INIT(sm1, 725, 1500); | ||
| HARMONY_REGULATOR_INIT(sm2, 3000, 4550); | ||
| HARMONY_REGULATOR_INIT(ldo1, 725, 1500); | ||
| HARMONY_REGULATOR_INIT(ldo2, 725, 1500); | ||
| HARMONY_REGULATOR_INIT(ldo3, 1250, 3300); | ||
| HARMONY_REGULATOR_INIT(ldo4, 1700, 2475); | ||
| HARMONY_REGULATOR_INIT(ldo5, 1250, 3300); | ||
| HARMONY_REGULATOR_INIT(ldo6, 1250, 3300); | ||
| HARMONY_REGULATOR_INIT(ldo7, 1250, 3300); | ||
| HARMONY_REGULATOR_INIT(ldo8, 1250, 3300); | ||
| HARMONY_REGULATOR_INIT(ldo9, 1250, 3300); | ||
|
|
||
| #define TPS_REG(_id, _data) \ | ||
| { \ | ||
| .id = TPS6586X_ID_##_id, \ | ||
| .name = "tps6586x-regulator", \ | ||
| .platform_data = _data, \ | ||
| } | ||
|
|
||
| static struct tps6586x_subdev_info tps_devs[] = { | ||
| TPS_REG(SM_0, &sm0_data), | ||
| TPS_REG(SM_1, &sm1_data), | ||
| TPS_REG(SM_2, &sm2_data), | ||
| TPS_REG(LDO_0, &ldo0_data), | ||
| TPS_REG(LDO_1, &ldo1_data), | ||
| TPS_REG(LDO_2, &ldo2_data), | ||
| TPS_REG(LDO_3, &ldo3_data), | ||
| TPS_REG(LDO_4, &ldo4_data), | ||
| TPS_REG(LDO_5, &ldo5_data), | ||
| TPS_REG(LDO_6, &ldo6_data), | ||
| TPS_REG(LDO_7, &ldo7_data), | ||
| TPS_REG(LDO_8, &ldo8_data), | ||
| TPS_REG(LDO_9, &ldo9_data), | ||
| }; | ||
|
|
||
| static struct tps6586x_platform_data tps_platform = { | ||
| .irq_base = TEGRA_NR_IRQS, | ||
| .num_subdevs = ARRAY_SIZE(tps_devs), | ||
| .subdevs = tps_devs, | ||
| .gpio_base = TEGRA_NR_GPIOS, | ||
| }; | ||
|
|
||
| static struct i2c_board_info __initdata harmony_regulators[] = { | ||
| { | ||
| I2C_BOARD_INFO("tps6586x", 0x34), | ||
| .irq = INT_EXTERNAL_PMU, | ||
| .platform_data = &tps_platform, | ||
| }, | ||
| }; | ||
|
|
||
| int __init harmony_regulator_init(void) | ||
| { | ||
| i2c_register_board_info(3, harmony_regulators, 1); | ||
|
|
||
| return 0; | ||
| } |
Oops, something went wrong.