| Message ID | 20211125165412.535063-1-hdegoede@redhat.com |
|---|---|
| Headers | show |
| Series | Add support for X86/ACPI camera sensor/PMIC setup with clk and regulator platform data | expand |
Hi, On 11/26/21 12:45, Hans de Goede wrote: > Hi, > > On 11/26/21 12:39, Daniel Scally wrote: >> Hello >> >> On 26/11/2021 11:30, Hans de Goede wrote: >>> Hi, >>> >>> On 11/26/21 00:39, Laurent Pinchart wrote: >>>> Hi Hans, >>>> >>>> Thank you for the patch. >>>> >>>> On Thu, Nov 25, 2021 at 05:54:04PM +0100, Hans de Goede wrote: >>>>> From: Daniel Scally <djrscally@gmail.com> >>>>> >>>>> The TPS68470 PMIC has an I2C passthrough mode through which I2C traffic >>>>> can be forwarded to a device connected to the PMIC as though it were >>>>> connected directly to the system bus. Enable this mode when the chip >>>>> is initialised. >>>> Is there any drawback doing this unconditionally, if nothing is >>>> connected to the bus on the other side (including no pull-ups) ? >>> I actually never took a really close look at this patch, I just >>> sorta inherited it from Daniel. >>> >>> Now that I have taken a close look, I see that it is setting the >>> exact same bits as which get set when enabling the VSIO regulator. >>> >>> The idea here is that the I2C-passthrough only gets enabled when >>> the VSIO regulator is turned on, because some sensors end up >>> shorting the I2C pins to ground when the sensor is not powered. >>> >>> Since we set these bits when powering up the VSIO regulator >>> and since we do that before trying to talk to the sensor >>> I don't think that we need this (hack) anymore. >>> >>> I will give things a try without this change and if things >>> still work I will drop this patch from the set. >>> >>> Daniel, what do you think? >> >> >> Humm, we're only using the VSIO regulator with the VCM though right? > > Nope, there is a mapping from VSIO to dovdd for the ov8865 in the > board_data; and I'm pretty sure I copied that from your earlier > attempts at getting regulator lookups registered :) > > And even if the VSIO regulator was only used by the VCM, then it would > get turned off after probing the VCM, clearing the 2 bits which this > commit sets. Which would break things if we did not re-enable it when > the ov8865 needs it. > >> Which might not be on when the ov8865 tries to probe. I haven't tried >> without this patch to be honest; I set it because that was what Windows >> does when powering on the PMIC. > > See above, I'm pretty sure we can do without this patch which means > that the INT3472 code will no longer be poking at the PMIC directly > itself, which is good :) > > Anyways I'll give this a try sometime next week and then drop the > patch. I can confirm that this patch indeed is no longer necessary with the current regulator code already taking care of this. I will post version 7 of this patch-set soon, with this patch dropped. Regards, Hans >>>>> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> >>>>> Signed-off-by: Daniel Scally <djrscally@gmail.com> >>>>> --- >>>>> .../x86/intel/int3472/intel_skl_int3472_tps68470.c | 7 +++++++ >>>>> 1 file changed, 7 insertions(+) >>>>> >>>>> diff --git a/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c >>>>> index c05b4cf502fe..42e688f4cad4 100644 >>>>> --- a/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c >>>>> +++ b/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c >>>>> @@ -45,6 +45,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap) >>>>> return ret; >>>>> } >>>>> >>>>> + /* Enable I2C daisy chain */ >>>>> + ret = regmap_write(regmap, TPS68470_REG_S_I2C_CTL, 0x03); >>>>> + if (ret) { >>>>> + dev_err(dev, "Failed to enable i2c daisy chain\n"); >>>>> + return ret; >>>>> + } >>>>> + >>>>> dev_info(dev, "TPS68470 REVID: 0x%02x\n", version); >>>>> >>>>> return 0; >>
Here is v6 of my patch-set adding support for camera sensor connected to a TPS68470 PMIC on x86/ACPI devices. Changes in v6: - Add support for the VCM (Voice Coil Motor) controlling the focus of the back/main sensor camera lens: - Patch 3 and patches 13-15 are new patches for this - While working on this I learned that the VIO regulator is an always on regulator and must be configured at the same voltage as VSIO, the tps68470-regulator driver and the constraints have been updated for this - Addressed clk-tps68470 driver review-remarks - Some minor tweaks based on review-remarks from Andy - Add Andy's Reviewed-by to all patches which were also in v5 I'm quite happy with how this works now, so from my pov this is ready for merging now. Patch 2 already has acks for merging through another tree. Patch 3 "i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function" is new, Mika, Wolfram may we have your Ack for merging this one through Rafael's ACPI or through my platform/drivers/x86 tree too ? Once we have acks to merge both i2c-core-acpi.c through another tree, there are 2 options: a. 1. Patches 1-3 merged by Rafael, Rafael provides an IM branch 2. I create an IM branch with patches 4 + 7-12 3. clk + regulator maintainers merge my IM branch + clk / regulator patch 4. media maintainers merge Rafael's IM branch + media patches b. 1. I create an IM branch with patches 1-4 + 7-12 (with Rafael's ack for 1) 2. clk / regulator / media maintainers merge my IM branch + their resp. patches Assuming Rafael does not foresee any conflicts caused by the few small ACPI patches I believe that going with plan b would be best. Rafael is plan b. ok with you ? You did already Ack patch 1 but IIRC that was not specifically for merging it through another tree. Regards, Hans p.s. For the record here is part of the old cover-letter of v5: Changes in v5: - Update regulator_init_data in patch 10/11 to include the VCM regulator - Address various small review remarks from Andy - Make a couple of functions / vars static in the clk + regulator drivers Reported-by: kernel test robot <lkp@intel.com> Changes in v4: [PATCH 01/11] ACPI: delay enumeration of devices with a _DEP pointing to an INT3472 device: - Move the acpi_dev_ready_for_enumeration() check to acpi_bus_attach() (replacing the acpi_device_is_present() check there) [PATCH 04/11] regulator: Introduce tps68470-regulator driver: - Make the top comment block use c++ style comments - Drop the bogus builtin regulator_init_data - Make the driver enable the PMIC clk when enabling the Core buck regulator, this switching regulator needs the PLL to be on - Kconfig: add || COMPILE_TEST, fix help text [PATCH 05/11] clk: Introduce clk-tps68470 driver - Kconfig: select REGMAP_I2C, add || COMPILE_TEST, fix help text - tps68470_clk_prepare(): Wait for the PLL to lock before returning - tps68470_clk_unprepare(): Remove unnecessary clearing of divider regs - tps68470_clk_probe(): Use devm_clk_hw_register() - Misc. small cleanups The clk and regulator frameworks expect clk/regulator consumer-devices to have info about the consumed clks/regulators described in the device's fw_node, but on ACPI this info is missing. This series worksaround this by providing platform_data with the info to the TPS68470 clk/regulator MFD cells. Patches 1 - 2 deal with a probe-ordering problem this introduces, since the lookups are only registered when the provider-driver binds, trying to get these clks/regulators before then results in a -ENOENT error for clks and a dummy regulator for regulators. See the patches for more details. Patch 3 adds a header file which adds tps68470_clk_platform_data and tps68470_regulator_platform_data structs. The futher patches depend on this new header file. Patch 4 + 5 add the TPS68470 clk and regulator drivers Patches 6 - 11 Modify the INT3472 driver which instantiates the MFD cells to provide the necessary platform-data. Daniel Scally (1): platform/x86: int3472: Enable I2c daisy chain Hans de Goede (14): ACPI: delay enumeration of devices with a _DEP pointing to an INT3472 device i2c: acpi: Use acpi_dev_ready_for_enumeration() helper i2c: acpi: Add i2c_acpi_new_device_by_fwnode() function platform_data: Add linux/platform_data/tps68470.h file regulator: Introduce tps68470-regulator driver clk: Introduce clk-tps68470 driver platform/x86: int3472: Split into 2 drivers platform/x86: int3472: Add get_sensor_adev_and_name() helper platform/x86: int3472: Pass tps68470_clk_platform_data to the tps68470-regulator MFD-cell platform/x86: int3472: Pass tps68470_regulator_platform_data to the tps68470-regulator MFD-cell platform/x86: int3472: Deal with probe ordering issues media: ipu3-cio2: Defer probing until the PMIC is fully setup media: ipu3-cio2: Call cio2_bridge_init() before anything else media: ipu3-cio2: Add support for instantiating i2c-clients for VCMs drivers/acpi/scan.c | 37 ++- drivers/clk/Kconfig | 8 + drivers/clk/Makefile | 1 + drivers/clk/clk-tps68470.c | 257 ++++++++++++++++++ drivers/i2c/i2c-core-acpi.c | 23 +- drivers/media/pci/intel/ipu3/cio2-bridge.c | 92 +++++++ drivers/media/pci/intel/ipu3/cio2-bridge.h | 16 +- drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 10 +- drivers/platform/x86/intel/int3472/Makefile | 9 +- ...lk_and_regulator.c => clk_and_regulator.c} | 2 +- drivers/platform/x86/intel/int3472/common.c | 82 ++++++ .../{intel_skl_int3472_common.h => common.h} | 6 +- ...ntel_skl_int3472_discrete.c => discrete.c} | 51 ++-- .../intel/int3472/intel_skl_int3472_common.c | 106 -------- ...ntel_skl_int3472_tps68470.c => tps68470.c} | 99 ++++++- drivers/platform/x86/intel/int3472/tps68470.h | 25 ++ .../x86/intel/int3472/tps68470_board_data.c | 145 ++++++++++ drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/tps68470-regulator.c | 201 ++++++++++++++ include/acpi/acpi_bus.h | 5 +- include/linux/i2c.h | 17 +- include/linux/mfd/tps68470.h | 11 + include/linux/platform_data/tps68470.h | 35 +++ 24 files changed, 1080 insertions(+), 168 deletions(-) create mode 100644 drivers/clk/clk-tps68470.c rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_clk_and_regulator.c => clk_and_regulator.c} (99%) create mode 100644 drivers/platform/x86/intel/int3472/common.c rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_common.h => common.h} (94%) rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_discrete.c => discrete.c} (91%) delete mode 100644 drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c rename drivers/platform/x86/intel/int3472/{intel_skl_int3472_tps68470.c => tps68470.c} (54%) create mode 100644 drivers/platform/x86/intel/int3472/tps68470.h create mode 100644 drivers/platform/x86/intel/int3472/tps68470_board_data.c create mode 100644 drivers/regulator/tps68470-regulator.c create mode 100644 include/linux/platform_data/tps68470.h