Merge tag 'mfd-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Core Frameworks: - Set 'struct device' fwnode when registering a new device New Drivers: - Add support for ROHM BD70528 PMIC New Device Support: - Add support for LP87561 4-Phase Regulator to TI LP87565 PMIC - Add support for RK809 and RK817 to Rockchip RK808 - Add support for Lid Angle to ChromeOS core - Add support for CS47L15 CODEC to Madera core - Add support for CS47L92 CODEC to Madera core - Add support for ChromeOS (legacy) Accelerometers in ChromeOS core - Add support for Add Intel Elkhart Lake PCH to Intel LPSS New Functionality: - Provide regulator supply information when registering; madera-core - Additional Device Tree support; lp87565, madera, cros-ec, rohm,bd71837-pmic - Allow over-riding power button press via Device Tree; rohm-bd718x7 - Differentiate between running processors; cros_ec_dev Fix-ups: - Big header file update; cros_ec_commands.h - Split header per-subsystem; rohm-bd718x7 - Remove superfluous code; menelaus, cs5535-mfd, cs47lXX-tables - Trivial; sorting, coding style; intel-lpss-pci - Only remove Power Off functionality if set locally; rk808 - Make use for Power Off Prepare(); rk808 - Fix spelling mistake in header guards; stmfx - Properly free IDA resources - SPDX fixups; cs47lXX-tables, madera - Error path fixups; hi655x-pmic Bug Fixes: - Add missing break in case() statement - Repair undefined behaviour when not initialising variables; arizona-core, madera-core - Fix reference to Device Tree documentation; madera" * tag 'mfd-next-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (45 commits) mfd: hi655x-pmic: Fix missing return value check for devm_regmap_init_mmio_clk mfd: madera: Fixup SPDX headers mfd: madera: Remove some unused registers and fix some defaults mfd: intel-lpss: Release IDA resources mfd: intel-lpss: Add Intel Elkhart Lake PCH PCI IDs mfd: cs5535-mfd: Remove ifdef OLPC noise mfd: stmfx: Fix macro definition spelling dt-bindings: mfd: Add link to ROHM BD71847 Datasheet MAINAINERS: Swap words in INTEL PMIC MULTIFUNCTION DEVICE DRIVERS mfd: cros_ec_dev: Register cros_ec_accel_legacy driver as a subdevice mfd: rk808: Prepare rk805 for poweroff mfd: rk808: Check pm_power_off pointer mfd: cros_ec: differentiate SCP from EC by feature bit dt-bindings: Add binding for cros-ec-rpmsg mfd: madera: Add Madera core support for CS47L92 mfd: madera: Add Madera core support for CS47L15 mfd: madera: Update DT bindings to add additional CODECs mfd: madera: Add supply mapping for MICVDD mfd: madera: Fix potential uninitialised use of variable mfd: madera: Fix bad reference to pinctrl.txt file ...
This commit is contained in:
Linus Torvalds
@@ -285,13 +285,15 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec)
|
||||
|
||||
resp = (struct ec_response_motion_sense *)msg->data;
|
||||
sensor_num = resp->dump.sensor_count;
|
||||
/* Allocate 1 extra sensors in FIFO are needed */
|
||||
sensor_cells = kcalloc(sensor_num + 1, sizeof(struct mfd_cell),
|
||||
/*
|
||||
* Allocate 2 extra sensors if lid angle sensor and/or FIFO are needed.
|
||||
*/
|
||||
sensor_cells = kcalloc(sensor_num + 2, sizeof(struct mfd_cell),
|
||||
GFP_KERNEL);
|
||||
if (sensor_cells == NULL)
|
||||
goto error;
|
||||
|
||||
sensor_platforms = kcalloc(sensor_num + 1,
|
||||
sensor_platforms = kcalloc(sensor_num,
|
||||
sizeof(struct cros_ec_sensor_platform),
|
||||
GFP_KERNEL);
|
||||
if (sensor_platforms == NULL)
|
||||
@@ -351,6 +353,11 @@ static void cros_ec_sensors_register(struct cros_ec_dev *ec)
|
||||
sensor_cells[id].name = "cros-ec-ring";
|
||||
id++;
|
||||
}
|
||||
if (cros_ec_check_features(ec,
|
||||
EC_FEATURE_REFINED_TABLET_MODE_HYSTERESIS)) {
|
||||
sensor_cells[id].name = "cros-ec-lid-angle";
|
||||
id++;
|
||||
}
|
||||
|
||||
ret = mfd_add_devices(ec->dev, 0, sensor_cells, id,
|
||||
NULL, 0, NULL);
|
||||
@@ -364,6 +371,72 @@ error:
|
||||
kfree(msg);
|
||||
}
|
||||
|
||||
static struct cros_ec_sensor_platform sensor_platforms[] = {
|
||||
{ .sensor_num = 0 },
|
||||
{ .sensor_num = 1 }
|
||||
};
|
||||
|
||||
static const struct mfd_cell cros_ec_accel_legacy_cells[] = {
|
||||
{
|
||||
.name = "cros-ec-accel-legacy",
|
||||
.platform_data = &sensor_platforms[0],
|
||||
.pdata_size = sizeof(struct cros_ec_sensor_platform),
|
||||
},
|
||||
{
|
||||
.name = "cros-ec-accel-legacy",
|
||||
.platform_data = &sensor_platforms[1],
|
||||
.pdata_size = sizeof(struct cros_ec_sensor_platform),
|
||||
}
|
||||
};
|
||||
|
||||
static void cros_ec_accel_legacy_register(struct cros_ec_dev *ec)
|
||||
{
|
||||
struct cros_ec_device *ec_dev = ec->ec_dev;
|
||||
u8 status;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* ECs that need legacy support are the main EC, directly connected to
|
||||
* the AP.
|
||||
*/
|
||||
if (ec->cmd_offset != 0)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Check if EC supports direct memory reads and if EC has
|
||||
* accelerometers.
|
||||
*/
|
||||
if (ec_dev->cmd_readmem) {
|
||||
ret = ec_dev->cmd_readmem(ec_dev, EC_MEMMAP_ACC_STATUS, 1,
|
||||
&status);
|
||||
if (ret < 0) {
|
||||
dev_warn(ec->dev, "EC direct read error.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check if EC has accelerometers. */
|
||||
if (!(status & EC_MEMMAP_ACC_STATUS_PRESENCE_BIT)) {
|
||||
dev_info(ec->dev, "EC does not have accelerometers.\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The device may still support accelerometers:
|
||||
* it would be an older ARM based device that do not suppor the
|
||||
* EC_CMD_GET_FEATURES command.
|
||||
*
|
||||
* Register 2 accelerometers, we will fail in the IIO driver if there
|
||||
* are no sensors.
|
||||
*/
|
||||
ret = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
|
||||
cros_ec_accel_legacy_cells,
|
||||
ARRAY_SIZE(cros_ec_accel_legacy_cells),
|
||||
NULL, 0, NULL);
|
||||
if (ret)
|
||||
dev_err(ec_dev->dev, "failed to add EC sensors\n");
|
||||
}
|
||||
|
||||
static const struct mfd_cell cros_ec_cec_cells[] = {
|
||||
{ .name = "cros-ec-cec" }
|
||||
};
|
||||
@@ -440,6 +513,16 @@ static int ec_device_probe(struct platform_device *pdev)
|
||||
ec_platform->ec_name = CROS_EC_DEV_TP_NAME;
|
||||
}
|
||||
|
||||
/* Check whether this is actually a SCP rather than an EC. */
|
||||
if (cros_ec_check_features(ec, EC_FEATURE_SCP)) {
|
||||
dev_info(dev, "CrOS SCP MCU detected.\n");
|
||||
/*
|
||||
* Help userspace differentiating ECs from SCP,
|
||||
* regardless of the probing order.
|
||||
*/
|
||||
ec_platform->ec_name = CROS_EC_DEV_SCP_NAME;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add the class device
|
||||
* Link to the character device for creating the /dev entry
|
||||
@@ -459,6 +542,9 @@ static int ec_device_probe(struct platform_device *pdev)
|
||||
/* check whether this EC is a sensor hub. */
|
||||
if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE))
|
||||
cros_ec_sensors_register(ec);
|
||||
else
|
||||
/* Workaroud for older EC firmware */
|
||||
cros_ec_accel_legacy_register(ec);
|
||||
|
||||
/* Check whether this EC instance has CEC host command support */
|
||||
if (cros_ec_check_features(ec, EC_FEATURE_CEC)) {
|
||||
|
||||
Reference in New Issue
Block a user