Merge tag 'regulator-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown: "The biggest chunk of the regulator changes for this release outside of the new drivers is the conversion of the fixed regulator to use the GPIO descriptor API, there's a small addition to the GPIO API plus a bunch of updates to board files to implement it. This is some really welcome work from Linus Walleij that's had a bunch of review and has been sitting in -next for a while so I'm fairly happy there's no major issues. - Helpers for overlapping linear ranges. - Display opmode and consumer requested load in the regualtor_summary file in debugfs, plus a fix there. - Support for the fun and entertaining power off mechanism that the pfuze100 hardware implements. - Conversion of the fixed regulator API to use GPIO descriptors, including pulling in a bunch of patches to a bunch of board files. - New drivers for Cirrus Logic Lochnagar, Qualcomm PMS405, Rohm BD71847, ST PMIC1, and TI LM363x devices" * tag 'regulator-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (36 commits) regulator: lochnagar: Use a consisent comment style for SPDX header regulator: bd718x7: Remove struct bd718xx_pmic regulator: Fetch enable gpiods nonexclusive regulator/gpio: Allow nonexclusive GPIO access regulator: lochnagar: Add support for the Cirrus Logic Lochnagar regulator: stpmic1: Return REGULATOR_MODE_INVALID for invalid mode regulator: stpmic1: add stpmic1 regulator driver dt-bindings: regulator: document stpmic1 pmic regulators regulator: axp20x: Mark expected switch fall-throughs regulator: bd718xx: fix build warning on x86_64 regulator: fixed: Default enable high on DT regulators regulator: bd718xx: rename bd71837 to 718xx regulator: bd718XX use pickable ranges regulator/mfd: bd718xx: rename bd71837/bd71847 common instances regulator: Support regulators where voltage ranges are selectable mfd: dt bindings: add BD71847 device-tree binding documentation regulator: dt bindings: add BD71847 device-tree binding documentation regulator/mfd: Support ROHM BD71847 power management IC regulator: da905{2,5}: Remove unnecessary array check regulator: qcom: Add PMS405 regulators ...
This commit is contained in:
@ -633,7 +633,6 @@ static struct regulator_init_data cn12_power_init_data = {
|
||||
static struct fixed_voltage_config cn12_power_info = {
|
||||
.supply_name = "CN12 SD/MMC Vdd",
|
||||
.microvolts = 3300000,
|
||||
.gpio = GPIO_PTB7,
|
||||
.enable_high = 1,
|
||||
.init_data = &cn12_power_init_data,
|
||||
};
|
||||
@ -646,6 +645,16 @@ static struct platform_device cn12_power = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table cn12_power_gpiod_table = {
|
||||
.dev_id = "reg-fixed-voltage.0",
|
||||
.table = {
|
||||
/* Offset 7 on port B */
|
||||
GPIO_LOOKUP("sh7724_pfc", GPIO_PTB7,
|
||||
NULL, GPIO_ACTIVE_HIGH),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
|
||||
/* SDHI0 */
|
||||
static struct regulator_consumer_supply sdhi0_power_consumers[] =
|
||||
@ -665,7 +674,6 @@ static struct regulator_init_data sdhi0_power_init_data = {
|
||||
static struct fixed_voltage_config sdhi0_power_info = {
|
||||
.supply_name = "CN11 SD/MMC Vdd",
|
||||
.microvolts = 3300000,
|
||||
.gpio = GPIO_PTB6,
|
||||
.enable_high = 1,
|
||||
.init_data = &sdhi0_power_init_data,
|
||||
};
|
||||
@ -678,6 +686,16 @@ static struct platform_device sdhi0_power = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table sdhi0_power_gpiod_table = {
|
||||
.dev_id = "reg-fixed-voltage.1",
|
||||
.table = {
|
||||
/* Offset 6 on port B */
|
||||
GPIO_LOOKUP("sh7724_pfc", GPIO_PTB6,
|
||||
NULL, GPIO_ACTIVE_HIGH),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
||||
static struct tmio_mmc_data sdhi0_info = {
|
||||
.chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX,
|
||||
.chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX,
|
||||
@ -1413,6 +1431,11 @@ static int __init arch_setup(void)
|
||||
DMA_MEMORY_EXCLUSIVE);
|
||||
platform_device_add(ecovec_ceu_devices[1]);
|
||||
|
||||
gpiod_add_lookup_table(&cn12_power_gpiod_table);
|
||||
#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
|
||||
gpiod_add_lookup_table(&sdhi0_power_gpiod_table);
|
||||
#endif
|
||||
|
||||
return platform_add_devices(ecovec_devices,
|
||||
ARRAY_SIZE(ecovec_devices));
|
||||
}
|
||||
|
Reference in New Issue
Block a user