Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.75 Removed upstream: bcm27xx/patches-6.12/950-0225-media-i2c-ov5647-Correct-pixel-array-offset.patch[1] bcm27xx/patches-6.12/950-0226-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch[2] bcm27xx/patches-6.12/950-0248-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch[3] qualcommax/patches-6.12/0074-v6.20-clk-qcom-gcc-ipq5018-flag-sleep-clock-as-critical.patch[4] Manually rebased: bcm27xx/patches-6.12/950-0262-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch bcm27xx/patches-6.12/950-0071-drivers-mfd-sensehat-Add-Raspberry-Pi-Sense-HAT-to-s.patch bcm27xx/patches-6.12/950-0516-media-i2c-ov5647-Add-V4L2_CID_LINK_FREQUENCY-control.patch lantiq/patches-6.12/101-find_active_root.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.75&id=58f1767ad5c9eda3dd0befddc1843259d46d64fa 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.75&id=ff65571ffae52b65577121e7696bf22156e1928a 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.75&id=fbf2a108ed5eb1c896d3f354bd05314c2e22e78f 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.75&id=b109dd4970a0fc89d54b1198b163f86125dd2977 Build system: x86/64 Build-tested: flogic/glinet_gl-mt6000 Run-tested: flogic/glinet_gl-mt6000 Co-authored-by: Shiji Yang <yangshiji66@outlook.com> Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/22276 Signed-off-by: Robert Marko <robimarko@gmail.com>
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
From 65a525d752863c08855e3250178dcc889c8904a8 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 19 Jan 2022 17:22:57 +0000
|
|
Subject: [PATCH] mfd: simple-mfd-i2c: Add configuration for RPi POE HAT
|
|
|
|
The Raspbery Pi PoE+ HAT exposes a fan controller and power
|
|
supply status reporting via a single I2C address.
|
|
|
|
Create an MFD device that allows loading of the relevant
|
|
sub-drivers, with a shared I2C regmap.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/mfd/Kconfig | 10 ++++++++++
|
|
drivers/mfd/simple-mfd-i2c.c | 10 ++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
--- a/drivers/mfd/Kconfig
|
|
+++ b/drivers/mfd/Kconfig
|
|
@@ -1210,6 +1210,16 @@ config MFD_SY7636A
|
|
To enable support for building sub-devices as modules,
|
|
choose M here.
|
|
|
|
+config MFD_RASPBERRYPI_POE_HAT
|
|
+ tristate "Raspberry Pi PoE HAT MFD"
|
|
+ depends on I2C
|
|
+ select MFD_SIMPLE_MFD_I2C
|
|
+ help
|
|
+ This module supports the PWM fan controller found on the Raspberry Pi
|
|
+ POE and POE+ HAT boards, and the power supply driver on the POE+ HAT.
|
|
+ (Functionally it relies on MFD_SIMPLE_MFD_I2C to provide the framework
|
|
+ that loads the child drivers).
|
|
+
|
|
config MFD_RDC321X
|
|
tristate "RDC R-321x southbridge"
|
|
select MFD_CORE
|
|
--- a/drivers/mfd/simple-mfd-i2c.c
|
|
+++ b/drivers/mfd/simple-mfd-i2c.c
|
|
@@ -29,6 +29,15 @@ static const struct regmap_config regmap
|
|
.val_bits = 8,
|
|
};
|
|
|
|
+static const struct regmap_config regmap_config_16r_8v = {
|
|
+ .reg_bits = 16,
|
|
+ .val_bits = 8,
|
|
+};
|
|
+
|
|
+static const struct simple_mfd_data rpi_poe_core = {
|
|
+ .regmap_config = ®map_config_16r_8v,
|
|
+};
|
|
+
|
|
static int simple_mfd_i2c_probe(struct i2c_client *i2c)
|
|
{
|
|
const struct simple_mfd_data *simple_mfd_data;
|
|
@@ -119,6 +128,7 @@ static const struct of_device_id simple_
|
|
{ .compatible = "maxim,max77705-battery", .data = &maxim_mon_max77705},
|
|
{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
|
|
{ .compatible = "spacemit,p1", .data = &spacemit_p1, },
|
|
+ { .compatible = "raspberrypi,poe-core", &rpi_poe_core },
|
|
{ .compatible = "raspberrypi,sensehat" },
|
|
{}
|
|
};
|