* [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support
@ 2026-08-14 23:10 Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 1/7] dt-bindings: leds: Add IS32FL3207 controller Ahmad Byagowi
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
Add the generic LED and I2C-mux support needed to describe peripherals
behind the FPGA I2C controller, then use it to instantiate the R4006 and
Time Card V9 board topologies from software nodes.
Patches 1 and 2 add the binding and LED-class driver for the Lumissil
IS32FL3207. The driver supports individual and multicolor LEDs, enforces
per-output current limits, and keeps the controller shut down until every
channel has been configured.
Patch 3 propagates software-node channel descriptions to adapters created
by i2c-mux. It preserves an ACPI primary firmware node, makes I2C adapter
lookup recognize the attached secondary node, and keeps that node alive
through child-client teardown.
Patch 4 tracks the fixed-width board ID and serial number independently.
Profile selection can therefore proceed when the board ID is valid even
if the separate serial EEPROM is absent.
Patch 5 adds the reusable profile-driven topology and recovery lifecycle.
It stops topology work and removes the mux before the root I2C controller
unbinds, preventing new child creation after adapter teardown has begun.
Patch 6 adds the R4006 temperature, humidity, pressure, GNSS LED, and four
SMA LED groups. The BNO08x channel remains empty because no upstream driver
binds that device. Production R4006 IDs may carry a revision suffix.
Patch 7 adds the V9 BME280, BNO055, two GNSS LEDs, and four SMA LEDs. It
uses the exact fixed-width ID "TIMECARD-V9" because earlier revisions
expose the same detectable I2C devices with different LED routing.
The prerequisite patches touch DT bindings, LED, and I2C code. Reviews or
acks from those maintainers are requested so the complete dependency series
can be carried through net-next.
Hardware and build validation:
- Exercised the R4006 LED routing on hardware.
- Checked the V9 controller address, 4.7 kohm RISET, sequential RGB
routing, and second GNSS LED against the V9 schematic.
- Ran dt_binding_check for issi,is32fl3207.yaml.
- Built i2c-core-base.o, i2c-mux.o, leds-is32fl3207.o, and ptp_ocp.o
with W=1 for x86-64 and arm64 using defconfig and allmodconfig.
- Ran strict checkpatch with an 80-column limit on all seven patches.
- Applied the generated mailbox to the stated base and compared the
resulting tree with the source branch.
Changes since v4:
- Split EEPROM readiness, generic topology lifecycle, R4006, and V9 into
separate patches.
- Track board-ID and serial-number readiness independently and publish
each field only after a successful EEPROM read.
- Replace the atomic retry counter with worker-serialized state, bounded
logging, and synchronized root-controller teardown.
- Support multicolor groups whose final components use outputs 16 and 17,
and document current limits relative to the RISET-derived full scale.
- Serialize multicolor calculation, PWM updates, and controller shutdown.
- Match secondary software nodes while preserving an ACPI primary, and
balance software-node ownership on failure and teardown paths.
- Clarify that the BNO08x and LM75B at address 0x4a occupy different mux
channels.
- Rebase onto current net-next.
v4:
https://lore.kernel.org/r/cover.1786543681.git.ahmadexp@gmail.com/
Review of v4 patch 4:
https://lore.kernel.org/r/62242142-0d27-425c-88d6-db65e80bbcea@linux.dev/
Ahmad Byagowi (7):
dt-bindings: leds: Add IS32FL3207 controller
leds: is32fl3207: Add controller driver
i2c: mux: Propagate software nodes to channel adapters
ptp: ocp: Track EEPROM fields independently
ptp: ocp: Add profile-driven I2C topology support
ptp: ocp: Add R4006 I2C peripheral topology
ptp: ocp: Add Time Card V9 I2C peripheral topology
.../bindings/leds/issi,is32fl3207.yaml | 281 +++++
MAINTAINERS | 7 +
drivers/i2c/i2c-core-base.c | 24 +-
drivers/i2c/i2c-mux.c | 77 +-
drivers/leds/rgb/Kconfig | 11 +
drivers/leds/rgb/Makefile | 1 +
drivers/leds/rgb/leds-is32fl3207.c | 736 ++++++++++++
drivers/ptp/ptp_ocp.c | 1025 +++++++++++++++--
8 files changed, 2083 insertions(+), 79 deletions(-)
base-commit: e6a5d573d24cd375e09d24f136523cb3cc85c9d3
--
2.50.1 (Apple Git-155)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next v5 1/7] dt-bindings: leds: Add IS32FL3207 controller
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 2/7] leds: is32fl3207: Add controller driver Ahmad Byagowi
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
The IS32FL3207 is an 18-channel constant-current LED controller with
per-output PWM and current scaling.
Describe I2C addressing, power and shutdown controls, RISET, and
individual or multicolor output groupings. Require board current limits
for each output and document their relationship to the RISET-derived full
scale.
Allow dash-suffixed multicolor group names when a group begins at channel
16 or 17, which cannot be represented by the common schema unit-address
form.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
.../bindings/leds/issi,is32fl3207.yaml | 281 ++++++++++++++++++
MAINTAINERS | 6 +
2 files changed, 287 insertions(+)
create mode 100644 Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml
diff --git a/Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml b/Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml
new file mode 100644
index 000000000000..2e53aa1e202d
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml
@@ -0,0 +1,281 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/leds/issi,is32fl3207.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Lumissil IS32FL3207 18-channel LED controller
+
+maintainers:
+ - Ahmad Byagowi <ahmadexp@gmail.com>
+
+description: |
+ The IS32FL3207 is an I2C LED controller with 18 individually controlled
+ constant-current outputs. Each output has 8-bit current scaling. PWM
+ brightness control uses the controller's default 8-bit, 62 kHz mode.
+ Outputs may be exposed as individual LEDs or grouped as multicolor LEDs.
+
+ The data sheet is available at:
+ https://www.lumissil.com/assets/pdf/core/IS32FL3207_DS.pdf
+
+properties:
+ compatible:
+ const: issi,is32fl3207
+
+ reg:
+ enum: [0x34, 0x35, 0x36, 0x37]
+
+ vcc-supply:
+ description: Regulator providing power to the VCC pin.
+
+ enable-gpios:
+ maxItems: 1
+ description: GPIO connected to SDB, asserted to enable the controller.
+
+ issi,riset-ohms:
+ minimum: 2000
+ maximum: 76500000
+ description: |
+ Resistance in ohms of the external RISET resistor. The resistor sets the
+ full-scale output current according to IOUT(MAX) = 76.5 / RISET amperes.
+ Each LED's led-max-microamp value selects a board-safe peak current no
+ greater than this full scale, using the per-output scaling register.
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 0
+
+patternProperties:
+ "^led@[0-9a-f]+$":
+ type: object
+ $ref: common.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ reg:
+ minimum: 0
+ maximum: 17
+ description: |
+ Zero-based LED output number. Values 0 through 17 correspond to
+ OUT1 through OUT18.
+
+ led-max-microamp:
+ minimum: 1
+ maximum: 38250
+ description: |
+ Board-safe peak current for this output. The value must not exceed
+ the full-scale current derived from issi,riset-ohms.
+
+ color:
+ oneOf:
+ - minimum: 0
+ maximum: 7
+ - minimum: 10
+ maximum: 14
+
+ max-brightness:
+ minimum: 1
+ maximum: 255
+
+ default-state:
+ description:
+ The driver performs a software reset and clears the PWM state during
+ initialization, so an existing state cannot be preserved.
+ enum: ["on", "off"]
+
+ default-brightness:
+ maximum: 255
+ description: |
+ Brightness used when default-state is "on". This value must not
+ exceed max-brightness when max-brightness is specified.
+
+ anyOf:
+ - required:
+ - function
+ - required:
+ - color
+
+ required:
+ - reg
+ - led-max-microamp
+
+ "^multi-led(@[0-9a-f]|-[0-9]+)?$":
+ type: object
+ $ref: leds-class-multicolor.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ reg:
+ minimum: 0
+ maximum: 15
+ description: |
+ Optional zero-based lowest-numbered output used by a group named
+ multi-led@N. Values 0 through 15 correspond to OUT1 through OUT16.
+ For a multi-led-N group without reg, the driver derives the lowest
+ output from its component nodes. This form permits groups beginning
+ at channels 16 or 17 while following the common multicolor node-name
+ schema.
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 0
+
+ max-brightness:
+ minimum: 1
+ maximum: 255
+
+ default-state:
+ description:
+ The driver performs a software reset and clears the PWM state during
+ initialization, so an existing state cannot be preserved.
+ enum: ["on", "off"]
+
+ default-brightness:
+ maximum: 255
+ description: |
+ Brightness used when default-state is "on". This value must not
+ exceed max-brightness when max-brightness is specified.
+
+ patternProperties:
+ "^led@[0-9a-f]+$":
+ type: object
+ $ref: common.yaml#
+ unevaluatedProperties: false
+
+ properties:
+ reg:
+ minimum: 0
+ maximum: 17
+ description: |
+ Zero-based LED output number. Values 0 through 17 correspond to
+ OUT1 through OUT18.
+
+ led-max-microamp:
+ minimum: 1
+ maximum: 38250
+ description: |
+ Board-safe peak current for this output. The value must not
+ exceed the full-scale current derived from issi,riset-ohms.
+
+ color:
+ oneOf:
+ - minimum: 0
+ maximum: 7
+ - minimum: 10
+ maximum: 14
+
+ max-brightness: false
+
+ default-state: false
+
+ default-brightness: false
+
+ retain-state-shutdown: false
+
+ required:
+ - reg
+ - color
+ - led-max-microamp
+
+ anyOf:
+ - required: [led@0]
+ - required: [led@1]
+ - required: [led@2]
+ - required: [led@3]
+ - required: [led@4]
+ - required: [led@5]
+ - required: [led@6]
+ - required: [led@7]
+ - required: [led@8]
+ - required: [led@9]
+ - required: [led@a]
+ - required: [led@b]
+ - required: [led@c]
+ - required: [led@d]
+ - required: [led@e]
+ - required: [led@f]
+ - required: [led@10]
+ - required: [led@11]
+
+ required:
+ - "#address-cells"
+ - "#size-cells"
+
+required:
+ - compatible
+ - reg
+ - issi,riset-ohms
+ - "#address-cells"
+ - "#size-cells"
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/leds/common.h>
+
+ i2c {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ led-controller@34 {
+ compatible = "issi,is32fl3207";
+ reg = <0x34>;
+ #address-cells = <1>;
+ enable-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
+ #size-cells = <0>;
+ vcc-supply = <&led_3v3>;
+ issi,riset-ohms = <4700>;
+
+ multi-led@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ color = <LED_COLOR_ID_RGB>;
+ function = LED_FUNCTION_STATUS;
+ #size-cells = <0>;
+
+ led@0 {
+ reg = <0>;
+ color = <LED_COLOR_ID_RED>;
+ led-max-microamp = <8100>;
+ };
+
+ led@1 {
+ reg = <1>;
+ color = <LED_COLOR_ID_GREEN>;
+ led-max-microamp = <8100>;
+ };
+
+ led@2 {
+ reg = <2>;
+ color = <LED_COLOR_ID_BLUE>;
+ led-max-microamp = <8100>;
+ };
+ };
+
+ multi-led-1 {
+ #address-cells = <1>;
+ color = <LED_COLOR_ID_MULTI>;
+ function = LED_FUNCTION_INDICATOR;
+ #size-cells = <0>;
+
+ led@10 {
+ reg = <16>;
+ color = <LED_COLOR_ID_AMBER>;
+ led-max-microamp = <8100>;
+ };
+
+ led@11 {
+ reg = <17>;
+ color = <LED_COLOR_ID_WHITE>;
+ led-max-microamp = <8100>;
+ };
+ };
+ };
+ };
+...
diff --git a/MAINTAINERS b/MAINTAINERS
index 991460050da7..448e7b7be8df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13827,6 +13827,12 @@ S: Maintained
F: Documentation/filesystems/isofs.rst
F: fs/isofs/
+ISSI IS32FL3207 LED DRIVER
+M: Ahmad Byagowi <ahmadexp@gmail.com>
+L: linux-leds@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml
+
IT87 HARDWARE MONITORING DRIVER
M: Jean Delvare <jdelvare@suse.com>
L: linux-hwmon@vger.kernel.org
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 2/7] leds: is32fl3207: Add controller driver
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 1/7] dt-bindings: leds: Add IS32FL3207 controller Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 3/7] i2c: mux: Propagate software nodes to channel adapters Ahmad Byagowi
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
Add an I2C driver for the Lumissil IS32FL3207 18-channel LED controller.
Expose individual and multicolor LEDs through the LED class. Use the
default 8-bit, 62 kHz PWM mode, derive output current from RISET, and
enforce each output current limit with the scaling registers. Serialize
multicolor calculation, scaling, PWM, and controller-wide update
operations.
Clear retained scaling while SDB holds the outputs disabled. Release SDB
and briefly enable normal operation to issue the required software reset,
then keep the controller in software shutdown while registering every LED.
Enable outputs only after all limits and initial brightness values are
programmed.
Handle an optional supply and enable GPIO. Serialize shutdown against
pending brightness updates and honor retained shutdown state.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
MAINTAINERS | 1 +
drivers/leds/rgb/Kconfig | 11 +
drivers/leds/rgb/Makefile | 1 +
drivers/leds/rgb/leds-is32fl3207.c | 736 +++++++++++++++++++++++++++++
4 files changed, 749 insertions(+)
create mode 100644 drivers/leds/rgb/leds-is32fl3207.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 448e7b7be8df..c6bd00f80cea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13832,6 +13832,7 @@ M: Ahmad Byagowi <ahmadexp@gmail.com>
L: linux-leds@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/leds/issi,is32fl3207.yaml
+F: drivers/leds/rgb/leds-is32fl3207.c
IT87 HARDWARE MONITORING DRIVER
M: Jean Delvare <jdelvare@suse.com>
diff --git a/drivers/leds/rgb/Kconfig b/drivers/leds/rgb/Kconfig
index 6e9ab5f60714..c896be1318dc 100644
--- a/drivers/leds/rgb/Kconfig
+++ b/drivers/leds/rgb/Kconfig
@@ -14,6 +14,17 @@ config LEDS_GROUP_MULTICOLOR
To compile this driver as a module, choose M here: the module
will be called leds-group-multicolor.
+config LEDS_IS32FL3207
+ tristate "LED support for ISSI IS32FL3207"
+ depends on I2C
+ select REGMAP_I2C
+ help
+ Say Y here to include support for the Lumissil IS32FL3207
+ 18-channel I2C LED controller.
+
+ To compile this driver as a module, choose M here: the module will
+ be called leds-is32fl3207.
+
config LEDS_KTD202X
tristate "LED support for KTD202x Chips"
depends on I2C
diff --git a/drivers/leds/rgb/Makefile b/drivers/leds/rgb/Makefile
index cc0f2df66286..228923e8bb11 100644
--- a/drivers/leds/rgb/Makefile
+++ b/drivers/leds/rgb/Makefile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_LEDS_GROUP_MULTICOLOR) += leds-group-multicolor.o
+obj-$(CONFIG_LEDS_IS32FL3207) += leds-is32fl3207.o
obj-$(CONFIG_LEDS_KTD202X) += leds-ktd202x.o
obj-$(CONFIG_LEDS_LP5812) += leds-lp5812.o
obj-$(CONFIG_LEDS_LP5860_CORE) += leds-lp5860-core.o
diff --git a/drivers/leds/rgb/leds-is32fl3207.c b/drivers/leds/rgb/leds-is32fl3207.c
new file mode 100644
index 000000000000..6a46f97ba50a
--- /dev/null
+++ b/drivers/leds/rgb/leds-is32fl3207.c
@@ -0,0 +1,736 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * ISSI IS32FL3207 LED controller driver
+ *
+ * Copyright 2026 Ahmad Byagowi
+ */
+
+#include <linux/bitmap.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
+#include <linux/led-class-multicolor.h>
+#include <linux/math64.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+#include <linux/string.h>
+
+#include <dt-bindings/leds/common.h>
+
+#define IS32FL3207_NUM_CHANNELS 18
+#define IS32FL3207_MAX_BRIGHTNESS 255
+
+#define IS32FL3207_REG_CONTROL 0x00
+#define IS32FL3207_REG_PWM_LOW(channel) (0x01 + 2 * (channel))
+#define IS32FL3207_REG_PWM_UPDATE 0x49
+#define IS32FL3207_REG_SCALING(channel) (0x4a + (channel))
+#define IS32FL3207_REG_GLOBAL_CURRENT 0x6e
+#define IS32FL3207_REG_RESET 0x7f
+
+#define IS32FL3207_CONTROL_ENABLE BIT(0)
+#define IS32FL3207_GLOBAL_CURRENT_MAX 0xff
+
+/* IOUT(MAX) in microamperes = 76,500,000 / RISET in ohms. */
+#define IS32FL3207_CURRENT_NUMERATOR 76500000ULL
+
+struct is32fl3207;
+
+struct is32fl3207_led {
+ struct is32fl3207 *chip;
+ struct led_classdev *led_cdev;
+ union {
+ struct led_classdev cdev;
+ struct led_classdev_mc mcdev;
+ };
+ unsigned int channel;
+};
+
+struct is32fl3207 {
+ struct device *dev;
+ struct regmap *regmap;
+ struct gpio_desc *enable_gpio;
+ struct mutex lock; /* Serializes controller register updates. */
+ unsigned long channels[BITS_TO_LONGS(IS32FL3207_NUM_CHANNELS)];
+ u32 output_max_microamp;
+ unsigned int num_leds;
+ bool shutting_down;
+ struct is32fl3207_led leds[] __counted_by(num_leds);
+};
+
+static int is32fl3207_parse_led_properties(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode,
+ unsigned int *max_brightness,
+ unsigned int *brightness)
+{
+ enum led_default_state default_state;
+ u32 value;
+ int ret;
+
+ *max_brightness = IS32FL3207_MAX_BRIGHTNESS;
+ if (fwnode_property_present(fwnode, "max-brightness")) {
+ ret = fwnode_property_read_u32(fwnode, "max-brightness",
+ &value);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read maximum brightness for %pfw\n",
+ fwnode);
+ if (!value || value > IS32FL3207_MAX_BRIGHTNESS)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid maximum brightness %u for %pfw\n",
+ value, fwnode);
+
+ *max_brightness = value;
+ }
+
+ value = *max_brightness;
+ if (fwnode_property_present(fwnode, "default-brightness")) {
+ ret = fwnode_property_read_u32(fwnode, "default-brightness",
+ &value);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read default brightness for %pfw\n",
+ fwnode);
+ if (value > *max_brightness)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid default brightness %u for %pfw\n",
+ value, fwnode);
+ }
+
+ default_state = led_init_default_state_get(fwnode);
+ if (default_state == LEDS_DEFSTATE_KEEP)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "default state keep is not supported for %pfw\n",
+ fwnode);
+
+ *brightness = default_state == LEDS_DEFSTATE_ON ? value : LED_OFF;
+ return 0;
+}
+
+static int is32fl3207_validate_component(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode)
+{
+ static const char * const unsupported[] = {
+ "default-brightness",
+ "default-state",
+ "max-brightness",
+ "retain-state-shutdown",
+ };
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(unsupported); i++)
+ if (fwnode_property_present(fwnode, unsupported[i]))
+ return dev_err_probe(chip->dev, -EINVAL,
+ "%s is not supported for component %pfw\n",
+ unsupported[i], fwnode);
+
+ return 0;
+}
+
+static int is32fl3207_write_channels_locked(struct is32fl3207 *chip,
+ const struct mc_subled *subleds,
+ unsigned int num_channels)
+{
+ unsigned int i;
+ int ret;
+
+ for (i = 0; i < num_channels; i++) {
+ ret = regmap_write(chip->regmap,
+ IS32FL3207_REG_PWM_LOW(subleds[i].channel),
+ subleds[i].brightness);
+ if (ret)
+ return ret;
+ }
+
+ return regmap_write(chip->regmap, IS32FL3207_REG_PWM_UPDATE, 0);
+}
+
+static int is32fl3207_brightness_set(struct led_classdev *cdev,
+ enum led_brightness brightness)
+{
+ struct is32fl3207_led *led = container_of(cdev, struct is32fl3207_led,
+ cdev);
+ struct mc_subled subled = {
+ .brightness = brightness,
+ .channel = led->channel,
+ };
+
+ guard(mutex)(&led->chip->lock);
+ if (led->chip->shutting_down)
+ return 0;
+
+ return is32fl3207_write_channels_locked(led->chip, &subled, 1);
+}
+
+static int is32fl3207_mc_brightness_set(struct led_classdev *cdev,
+ enum led_brightness brightness)
+{
+ struct led_classdev_mc *mcdev = lcdev_to_mccdev(cdev);
+ struct is32fl3207_led *led = container_of(mcdev, struct is32fl3207_led,
+ mcdev);
+
+ guard(mutex)(&led->chip->lock);
+ if (led->chip->shutting_down)
+ return 0;
+
+ led_mc_calc_color_components(mcdev, brightness);
+
+ return is32fl3207_write_channels_locked(led->chip, mcdev->subled_info,
+ mcdev->num_colors);
+}
+
+static int is32fl3207_turn_off_locked(struct is32fl3207 *chip,
+ struct is32fl3207_led *led)
+{
+ struct led_classdev *cdev = led->led_cdev;
+ struct mc_subled subled = {
+ .brightness = LED_OFF,
+ .channel = led->channel,
+ };
+
+ if (cdev->flags & LED_MULTI_COLOR) {
+ struct led_classdev_mc *mcdev = lcdev_to_mccdev(cdev);
+
+ led_mc_calc_color_components(mcdev, LED_OFF);
+ return is32fl3207_write_channels_locked(chip,
+ mcdev->subled_info,
+ mcdev->num_colors);
+ }
+
+ return is32fl3207_write_channels_locked(chip, &subled, 1);
+}
+
+static int is32fl3207_configure_channel(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode,
+ unsigned int *channel)
+{
+ u64 scaling;
+ u32 max_microamp;
+ u32 reg;
+ int ret;
+
+ ret = fwnode_property_read_u32(fwnode, "reg", ®);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read channel for %pfw\n",
+ fwnode);
+
+ if (reg >= IS32FL3207_NUM_CHANNELS)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "channel %u is out of range\n", reg);
+
+ if (test_bit(reg, chip->channels))
+ return dev_err_probe(chip->dev, -EINVAL,
+ "channel %u is used more than once\n",
+ reg);
+
+ ret = fwnode_property_read_u32(fwnode, "led-max-microamp",
+ &max_microamp);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read current limit for channel %u\n",
+ reg);
+
+ if (!max_microamp || max_microamp > chip->output_max_microamp)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid current limit %u uA for channel %u\n",
+ max_microamp, reg);
+
+ /* GCC is fixed at 0xff, so use each output's scaling register. */
+ scaling = div_u64((u64)max_microamp * 256 * 256,
+ (u64)chip->output_max_microamp *
+ IS32FL3207_GLOBAL_CURRENT_MAX);
+ if (!scaling)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "current limit %u uA is below channel %u resolution\n",
+ max_microamp, reg);
+
+ scaling = min_t(u64, scaling, 0xff);
+
+ guard(mutex)(&chip->lock);
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_SCALING(reg),
+ (unsigned int)scaling);
+ if (ret)
+ return ret;
+
+ set_bit(reg, chip->channels);
+ *channel = reg;
+
+ return 0;
+}
+
+static int is32fl3207_register_single(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode,
+ struct is32fl3207_led *led)
+{
+ struct led_init_data init_data = {
+ .devicename = dev_name(chip->dev),
+ .devname_mandatory = true,
+ .fwnode = fwnode,
+ };
+ unsigned int max_brightness;
+ unsigned int brightness;
+ u32 color;
+ int ret;
+
+ if (!fwnode_property_present(fwnode, "function") &&
+ !fwnode_property_present(fwnode, "color"))
+ return dev_err_probe(chip->dev, -EINVAL,
+ "single LED %pfw requires function or color\n",
+ fwnode);
+
+ ret = is32fl3207_parse_led_properties(chip, fwnode,
+ &max_brightness, &brightness);
+ if (ret)
+ return ret;
+
+ if (fwnode_property_present(fwnode, "color")) {
+ ret = fwnode_property_read_u32(fwnode, "color", &color);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read color for %pfw\n",
+ fwnode);
+ if (color >= LED_COLOR_ID_MAX || color == LED_COLOR_ID_MULTI ||
+ color == LED_COLOR_ID_RGB)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid single LED color %u\n",
+ color);
+ }
+
+ ret = is32fl3207_configure_channel(chip, fwnode, &led->channel);
+ if (ret)
+ return ret;
+ led->chip = chip;
+ led->led_cdev = &led->cdev;
+ led->cdev.brightness = brightness;
+ led->cdev.max_brightness = max_brightness;
+ led->cdev.brightness_set_blocking = is32fl3207_brightness_set;
+
+ ret = is32fl3207_brightness_set(&led->cdev, brightness);
+ if (ret)
+ return ret;
+
+ return devm_led_classdev_register_ext(chip->dev, &led->cdev,
+ &init_data);
+}
+
+static int is32fl3207_register_multicolor(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode,
+ struct is32fl3207_led *led)
+{
+ struct led_init_data init_data = {
+ .devicename = dev_name(chip->dev),
+ .devname_mandatory = true,
+ .fwnode = fwnode,
+ };
+ struct mc_subled *subleds;
+ DECLARE_BITMAP(color_map, LED_COLOR_ID_MAX);
+ unsigned int max_brightness;
+ unsigned int brightness;
+ unsigned int count;
+ unsigned int i = 0;
+ bool has_group_reg;
+ u32 group_color;
+ u32 group_reg;
+ unsigned int first_channel = IS32FL3207_NUM_CHANNELS;
+ int ret;
+
+ ret = is32fl3207_parse_led_properties(chip, fwnode,
+ &max_brightness, &brightness);
+ if (ret)
+ return ret;
+
+ ret = fwnode_property_read_u32(fwnode, "color", &group_color);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read color for %pfw\n", fwnode);
+
+ if (group_color != LED_COLOR_ID_RGB &&
+ group_color != LED_COLOR_ID_MULTI)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid multicolor LED color %u\n",
+ group_color);
+
+ has_group_reg = fwnode_property_present(fwnode, "reg");
+ if (has_group_reg) {
+ ret = fwnode_property_read_u32(fwnode, "reg", &group_reg);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read group index for %pfw\n",
+ fwnode);
+ }
+
+ count = fwnode_get_child_node_count(fwnode);
+ if (!count || count > LED_COLOR_ID_MAX)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid component count %u for %pfw\n",
+ count, fwnode);
+
+ subleds = devm_kcalloc(chip->dev, count, sizeof(*subleds), GFP_KERNEL);
+ if (!subleds)
+ return -ENOMEM;
+ bitmap_zero(color_map, LED_COLOR_ID_MAX);
+
+ fwnode_for_each_child_node_scoped(fwnode, child) {
+ u32 color;
+
+ ret = is32fl3207_validate_component(chip, child);
+ if (ret)
+ return ret;
+
+ ret = fwnode_property_read_u32(child, "color", &color);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read color for %pfw\n",
+ child);
+
+ if (color >= LED_COLOR_ID_MAX || color == LED_COLOR_ID_MULTI ||
+ color == LED_COLOR_ID_RGB)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "invalid component color %u\n",
+ color);
+ if (test_and_set_bit(color, color_map))
+ return dev_err_probe(chip->dev, -EINVAL,
+ "component color %u is used more than once\n",
+ color);
+
+ ret = is32fl3207_configure_channel(chip, child,
+ &subleds[i].channel);
+ if (ret)
+ return ret;
+
+ subleds[i].color_index = color;
+ subleds[i].intensity = max_brightness;
+ subleds[i].max_intensity = 0;
+ first_channel = min(first_channel, subleds[i].channel);
+ i++;
+ }
+
+ if (has_group_reg && group_reg != first_channel)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "group index %u does not match first channel %u\n",
+ group_reg, first_channel);
+
+ led->chip = chip;
+ led->led_cdev = &led->mcdev.led_cdev;
+ led->mcdev.num_colors = count;
+ led->mcdev.subled_info = subleds;
+ led->mcdev.led_cdev.brightness = brightness;
+ led->mcdev.led_cdev.max_brightness = max_brightness;
+ led->mcdev.led_cdev.brightness_set_blocking =
+ is32fl3207_mc_brightness_set;
+
+ ret = is32fl3207_mc_brightness_set(&led->mcdev.led_cdev,
+ brightness);
+ if (ret)
+ return ret;
+
+ return devm_led_classdev_multicolor_register_ext(chip->dev, &led->mcdev,
+ &init_data);
+}
+
+static int is32fl3207_register_led(struct is32fl3207 *chip,
+ struct fwnode_handle *fwnode,
+ struct is32fl3207_led *led)
+{
+ unsigned int count = fwnode_get_child_node_count(fwnode);
+ bool has_color = fwnode_property_present(fwnode, "color");
+ u32 color = LED_COLOR_ID_MAX;
+ int ret;
+
+ if (has_color) {
+ ret = fwnode_property_read_u32(fwnode, "color", &color);
+ if (ret)
+ return dev_err_probe(chip->dev, ret,
+ "failed to read color for %pfw\n",
+ fwnode);
+ }
+
+ if (color == LED_COLOR_ID_RGB || color == LED_COLOR_ID_MULTI) {
+ if (!count)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "multicolor LED %pfw has no components\n",
+ fwnode);
+
+ return is32fl3207_register_multicolor(chip, fwnode, led);
+ }
+
+ if (count)
+ return dev_err_probe(chip->dev, -EINVAL,
+ "single LED %pfw must not have components\n",
+ fwnode);
+
+ return is32fl3207_register_single(chip, fwnode, led);
+}
+
+static int is32fl3207_clear_retained_scaling(struct is32fl3207 *chip)
+{
+ u8 scaling[IS32FL3207_NUM_CHANNELS] = { };
+ int ret;
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL, 0);
+ if (ret)
+ return ret;
+
+ return regmap_bulk_write(chip->regmap,
+ IS32FL3207_REG_SCALING(0), scaling,
+ sizeof(scaling));
+}
+
+static int is32fl3207_hw_init(struct is32fl3207 *chip)
+{
+ u8 scaling[IS32FL3207_NUM_CHANNELS] = { };
+ u8 pwm[2 * IS32FL3207_NUM_CHANNELS] = { };
+ int disable_ret;
+ int ret;
+
+ /* Software reset requires normal operation (SSD = 1). */
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL,
+ IS32FL3207_CONTROL_ENABLE);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_RESET, 0);
+ if (ret)
+ return ret;
+ usleep_range(200, 300);
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL, 0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_GLOBAL_CURRENT,
+ IS32FL3207_GLOBAL_CURRENT_MAX);
+ if (ret)
+ return ret;
+
+ ret = regmap_bulk_write(chip->regmap, IS32FL3207_REG_SCALING(0),
+ scaling, sizeof(scaling));
+ if (ret)
+ return ret;
+
+ ret = regmap_bulk_write(chip->regmap, IS32FL3207_REG_PWM_LOW(0), pwm,
+ sizeof(pwm));
+ if (ret)
+ return ret;
+
+ /* PWM data can be latched only in normal operation. */
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL,
+ IS32FL3207_CONTROL_ENABLE);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_PWM_UPDATE, 0);
+ disable_ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL, 0);
+
+ return ret ?: disable_ret;
+}
+
+static int is32fl3207_enable(struct is32fl3207 *chip)
+{
+ int ret;
+
+ guard(mutex)(&chip->lock);
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_CONTROL,
+ IS32FL3207_CONTROL_ENABLE);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(chip->regmap, IS32FL3207_REG_PWM_UPDATE, 0);
+ if (ret)
+ regmap_write(chip->regmap, IS32FL3207_REG_CONTROL, 0);
+
+ return ret;
+}
+
+static void is32fl3207_disable_locked(struct is32fl3207 *chip)
+{
+ regmap_write(chip->regmap, IS32FL3207_REG_CONTROL, 0);
+ if (chip->enable_gpio)
+ gpiod_set_value_cansleep(chip->enable_gpio, 0);
+}
+
+static void is32fl3207_disable(void *data)
+{
+ struct is32fl3207 *chip = data;
+
+ guard(mutex)(&chip->lock);
+ chip->shutting_down = true;
+ is32fl3207_disable_locked(chip);
+}
+
+static const struct regmap_config is32fl3207_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .max_register = IS32FL3207_REG_RESET,
+};
+
+static int is32fl3207_probe(struct i2c_client *client)
+{
+ struct device *dev = &client->dev;
+ struct is32fl3207 *ddata;
+ unsigned int count;
+ unsigned int i = 0;
+ u32 riset_ohms;
+ int ret;
+
+ count = device_get_child_node_count(dev);
+ if (!count || count > IS32FL3207_NUM_CHANNELS)
+ return dev_err_probe(dev, -EINVAL,
+ "invalid LED count %u\n", count);
+
+ ddata = devm_kzalloc(dev, struct_size(ddata, leds, count), GFP_KERNEL);
+ if (!ddata)
+ return -ENOMEM;
+
+ ddata->dev = dev;
+ ddata->num_leds = count;
+ i2c_set_clientdata(client, ddata);
+
+ ret = device_property_read_u32(dev, "issi,riset-ohms", &riset_ohms);
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to read RISET value\n");
+
+ if (riset_ohms < 2000)
+ return dev_err_probe(dev, -EINVAL,
+ "RISET value %u is below 2000 ohms\n",
+ riset_ohms);
+
+ ddata->output_max_microamp = div_u64(IS32FL3207_CURRENT_NUMERATOR,
+ riset_ohms);
+ if (!ddata->output_max_microamp)
+ return dev_err_probe(dev, -EINVAL,
+ "RISET value %u is too large\n",
+ riset_ohms);
+
+ ddata->enable_gpio = devm_gpiod_get_optional(dev, "enable",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(ddata->enable_gpio))
+ return dev_err_probe(dev, PTR_ERR(ddata->enable_gpio),
+ "failed to get enable GPIO\n");
+
+ ddata->regmap = devm_regmap_init_i2c(client,
+ &is32fl3207_regmap_config);
+ if (IS_ERR(ddata->regmap))
+ return dev_err_probe(dev, PTR_ERR(ddata->regmap),
+ "failed to allocate register map\n");
+
+ ret = devm_mutex_init(dev, &ddata->lock);
+ if (ret)
+ return ret;
+
+ ret = devm_regulator_get_enable_optional(dev, "vcc");
+ if (ret && ret != -ENODEV)
+ return dev_err_probe(dev, ret,
+ "failed to enable VCC regulator\n");
+
+ ret = devm_add_action_or_reset(dev, is32fl3207_disable, ddata);
+ if (ret)
+ return ret;
+
+ /* Let VCC settle while SDB keeps the outputs disabled. */
+ usleep_range(1000, 2000);
+
+ /*
+ * Registers remain accessible with SDB low. Clear retained scaling
+ * before releasing hardware shutdown.
+ */
+ ret = is32fl3207_clear_retained_scaling(ddata);
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "failed to clear retained current scaling\n");
+
+ if (ddata->enable_gpio)
+ gpiod_set_value_cansleep(ddata->enable_gpio, 1);
+
+ /* The SDB rising edge resets the I2C interface; allow it to settle. */
+ usleep_range(1000, 2000);
+
+ ret = is32fl3207_hw_init(ddata);
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "failed to initialize controller\n");
+
+ device_for_each_child_node_scoped(dev, child) {
+ struct is32fl3207_led *led = &ddata->leds[i];
+
+ ret = is32fl3207_register_led(ddata, child, led);
+ if (ret)
+ return ret;
+
+ i++;
+ }
+
+ ret = is32fl3207_enable(ddata);
+ if (ret)
+ return dev_err_probe(dev, ret, "failed to enable controller\n");
+
+ return 0;
+}
+
+static void is32fl3207_shutdown(struct i2c_client *client)
+{
+ struct is32fl3207 *chip = i2c_get_clientdata(client);
+ bool retain_state = false;
+ unsigned int i;
+ int ret = 0;
+
+ guard(mutex)(&chip->lock);
+ chip->shutting_down = true;
+
+ for (i = 0; i < chip->num_leds; i++)
+ if (chip->leds[i].led_cdev->flags & LED_RETAIN_AT_SHUTDOWN) {
+ retain_state = true;
+ break;
+ }
+
+ if (!retain_state) {
+ is32fl3207_disable_locked(chip);
+ return;
+ }
+
+ for (i = 0; i < chip->num_leds; i++) {
+ struct led_classdev *cdev = chip->leds[i].led_cdev;
+
+ if (cdev->flags & LED_RETAIN_AT_SHUTDOWN)
+ continue;
+ ret = is32fl3207_turn_off_locked(chip, &chip->leds[i]);
+
+ if (ret) {
+ dev_warn(chip->dev,
+ "failed to turn off LEDs during shutdown: %d\n",
+ ret);
+ break;
+ }
+ }
+}
+
+static const struct of_device_id is32fl3207_of_match[] = {
+ { .compatible = "issi,is32fl3207" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, is32fl3207_of_match);
+
+static const struct i2c_device_id is32fl3207_id[] = {
+ { .name = "is32fl3207" },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, is32fl3207_id);
+
+static struct i2c_driver is32fl3207_driver = {
+ .driver = {
+ .name = "is32fl3207",
+ .of_match_table = is32fl3207_of_match,
+ },
+ .probe = is32fl3207_probe,
+ .shutdown = is32fl3207_shutdown,
+ .id_table = is32fl3207_id,
+};
+module_i2c_driver(is32fl3207_driver);
+
+MODULE_AUTHOR("Ahmad Byagowi <ahmadexp@gmail.com>");
+MODULE_DESCRIPTION("Lumissil IS32FL3207 LED controller driver");
+MODULE_LICENSE("GPL");
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 3/7] i2c: mux: Propagate software nodes to channel adapters
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 1/7] dt-bindings: leds: Add IS32FL3207 controller Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 2/7] leds: is32fl3207: Add controller driver Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 4/7] ptp: ocp: Track EEPROM fields independently Ahmad Byagowi
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
Device Tree channel nodes are associated with the adapters created by
i2c-mux, but equivalent software-node descriptions are not.
Find the software-node child whose reg value matches the channel and
attach it to the new adapter. Preserve an ACPI primary node when present
and extend I2C firmware-node adapter lookup to match the attached
secondary node.
Track attachment ownership so failure cleanup cannot detach a
pre-existing node. Keep the owned node attached through child-client
removal, then release its reference after adapter deletion.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
drivers/i2c/i2c-core-base.c | 24 +++++++++---
drivers/i2c/i2c-mux.c | 77 ++++++++++++++++++++++++++++++++++++-
2 files changed, 93 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 3ec04787a737..f39575ee0244 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1876,12 +1876,22 @@ int devm_i2c_add_adapter(struct device *dev, struct i2c_adapter *adapter)
}
EXPORT_SYMBOL_GPL(devm_i2c_add_adapter);
-static int i2c_dev_or_parent_fwnode_match(struct device *dev, const void *data)
+static bool i2c_device_match_fwnode(struct device *dev, const void *data)
{
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
+
if (device_match_fwnode(dev, data))
+ return true;
+
+ return !IS_ERR_OR_NULL(fwnode) && fwnode->secondary == data;
+}
+
+static int i2c_dev_or_parent_fwnode_match(struct device *dev, const void *data)
+{
+ if (i2c_device_match_fwnode(dev, data))
return 1;
- if (dev->parent && device_match_fwnode(dev->parent, data))
+ if (dev->parent && i2c_device_match_fwnode(dev->parent, data))
return 1;
return 0;
@@ -1891,8 +1901,9 @@ static int i2c_dev_or_parent_fwnode_match(struct device *dev, const void *data)
* i2c_find_adapter_by_fwnode() - find an i2c_adapter for the fwnode
* @fwnode: &struct fwnode_handle corresponding to the &struct i2c_adapter
*
- * Look up and return the &struct i2c_adapter corresponding to the @fwnode.
- * If no adapter can be found, or @fwnode is NULL, this returns NULL.
+ * Look up and return the &struct i2c_adapter corresponding to the @fwnode,
+ * including a secondary firmware node. If no adapter can be found, or
+ * @fwnode is NULL, this returns NULL.
*
* The user must call put_device(&adapter->dev) once done with the i2c adapter.
*/
@@ -1922,8 +1933,9 @@ EXPORT_SYMBOL(i2c_find_adapter_by_fwnode);
* @fwnode: &struct fwnode_handle corresponding to the &struct i2c_adapter
*
* Look up and return the &struct i2c_adapter corresponding to the @fwnode,
- * and increment the adapter module's use count. If no adapter can be found,
- * or @fwnode is NULL, this returns NULL.
+ * including a secondary firmware node, and increment the adapter module's
+ * use count. If no adapter can be found, or @fwnode is NULL, this returns
+ * NULL.
*
* The user must call i2c_put_adapter(adapter) once done with the i2c adapter.
* Note that this is different from i2c_find_adapter_by_node().
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 681a201c239b..3bca123907b3 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -20,11 +20,13 @@
*/
#include <linux/acpi.h>
+#include <linux/err.h>
#include <linux/i2c.h>
#include <linux/i2c-mux.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
@@ -33,6 +35,7 @@ struct i2c_mux_priv {
struct i2c_adapter adap;
struct i2c_algorithm algo;
struct i2c_mux_core *muxc;
+ struct fwnode_handle *swnode;
u32 chan_id;
};
@@ -264,10 +267,60 @@ static const struct i2c_lock_operations i2c_parent_lock_ops = {
.unlock_bus = i2c_parent_unlock_bus,
};
+static struct fwnode_handle *
+i2c_mux_get_channel_swnode(struct i2c_mux_core *muxc, u32 chan_id)
+{
+ struct fwnode_handle *dev_node = dev_fwnode(muxc->dev);
+ struct fwnode_handle *mux_node, *child = NULL;
+ u32 reg;
+
+ /* A software node supplementing ACPI is the secondary fwnode. */
+ if (!is_software_node(dev_node)) {
+ if (IS_ERR_OR_NULL(dev_node))
+ return NULL;
+ dev_node = dev_node->secondary;
+ }
+ if (!is_software_node(dev_node))
+ return NULL;
+
+ if (muxc->arbitrator)
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-arb");
+ else if (muxc->gate)
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-gate");
+ else
+ mux_node = fwnode_get_named_child_node(dev_node, "i2c-mux");
+
+ if (mux_node) {
+ /* A "reg" property indicates an old-style firmware entry. */
+ if (!fwnode_property_read_u32(mux_node, "reg", ®)) {
+ fwnode_handle_put(mux_node);
+ mux_node = NULL;
+ }
+ }
+
+ if (!mux_node)
+ mux_node = fwnode_handle_get(dev_node);
+ else if (muxc->arbitrator || muxc->gate)
+ child = fwnode_handle_get(mux_node);
+
+ if (!child) {
+ fwnode_for_each_child_node(mux_node, child) {
+ if (fwnode_property_read_u32(child, "reg", ®))
+ continue;
+ if (chan_id == reg)
+ break;
+ }
+ }
+
+ fwnode_handle_put(mux_node);
+ return child;
+}
+
int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
u32 force_nr, u32 chan_id)
{
struct i2c_adapter *parent = muxc->parent;
+ struct fwnode_handle *channel_node = NULL;
struct i2c_mux_priv *priv;
char symlink_name[20];
int ret;
@@ -324,8 +377,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
priv->adap.lock_ops = &i2c_parent_lock_ops;
/*
- * Try to populate the mux adapter's of_node, expands to
- * nothing if !CONFIG_OF.
+ * Associate the mux adapter with its DT or software-node channel.
+ * DT support expands to nothing if !CONFIG_OF.
*/
if (muxc->dev->of_node) {
struct device_node *dev_node = muxc->dev->of_node;
@@ -364,6 +417,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
priv->adap.dev.of_node = child;
of_node_put(mux_node);
+ } else {
+ channel_node = i2c_mux_get_channel_swnode(muxc, chan_id);
}
/*
@@ -374,6 +429,16 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
ACPI_COMPANION(muxc->dev),
chan_id);
+ if (channel_node) {
+ ret = device_add_software_node(&priv->adap.dev,
+ to_software_node(channel_node));
+ if (!ret)
+ priv->swnode = channel_node;
+ fwnode_handle_put(channel_node);
+ if (ret)
+ goto err_free_priv;
+ }
+
if (force_nr) {
priv->adap.nr = force_nr;
ret = i2c_add_numbered_adapter(&priv->adap);
@@ -408,6 +473,8 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc,
return 0;
err_free_priv:
+ if (priv->swnode)
+ device_remove_software_node(&priv->adap.dev);
kfree(priv);
return ret;
}
@@ -429,7 +496,13 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc)
sysfs_remove_link(&muxc->dev->kobj, symlink_name);
sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
+ /*
+ * Keep the software node through child removal. The adapter
+ * device is cleared on deletion, so release the software-node
+ * attachment reference via the saved handle afterwards.
+ */
i2c_del_adapter(adap);
+ fwnode_handle_put(priv->swnode);
of_node_put(np);
kfree(priv);
}
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 4/7] ptp: ocp: Track EEPROM fields independently
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
` (2 preceding siblings ...)
2026-08-14 23:10 ` [PATCH net-next v5 3/7] i2c: mux: Propagate software nodes to channel adapters Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 5/7] ptp: ocp: Add profile-driven I2C topology support Ahmad Byagowi
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
The board ID and serial number can reside in separate EEPROM devices.
Requiring both reads to succeed before publishing either field makes a
missing serial EEPROM block board profile selection and hides an otherwise
valid board ID.
Serialize EEPROM discovery, read each field into temporary storage, and
publish its readiness only after a successful read. Let devlink report
whichever fields are available and make the serial-number sysfs attribute
propagate read failures.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
drivers/ptp/ptp_ocp.c | 129 ++++++++++++++++++++++++++++++------------
1 file changed, 93 insertions(+), 36 deletions(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 3d26ec1f7b9e..31a4c9dfe391 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -21,6 +21,7 @@
#include <net/devlink.h>
#include <linux/i2c.h>
#include <linux/mtd/mtd.h>
+#include <linux/mutex.h>
#include <linux/nvmem-consumer.h>
#include <linux/crc16.h>
#include <linux/dpll.h>
@@ -343,6 +344,10 @@ struct ptp_ocp_serial_port {
#define OCP_BOARD_ID_LEN 13
#define OCP_SERIAL_LEN 6
+#define OCP_EEPROM_BOARD_ID BIT(0)
+#define OCP_EEPROM_SERIAL BIT(1)
+#define OCP_EEPROM_ALL (OCP_EEPROM_BOARD_ID | \
+ OCP_EEPROM_SERIAL)
#define OCP_SMA_NUM 4
#define OCP_SIGNAL_NUM 4
#define OCP_FREQ_NUM 4
@@ -403,7 +408,10 @@ struct ptp_ocp {
u16 fw_version;
u8 board_id[OCP_BOARD_ID_LEN];
u8 serial[OCP_SERIAL_LEN];
- bool has_eeprom_data;
+ struct mutex eeprom_lock; /* Serializes EEPROM discovery. */
+ bool has_board_id;
+ bool has_serial;
+ bool eeprom_error_reported;
u32 pps_req_map;
int flash_start;
u32 utc_tai_offset;
@@ -1969,21 +1977,50 @@ ptp_ocp_nvmem_device_put(struct nvmem_device **nvmemp)
*nvmemp = NULL;
}
-static void
-ptp_ocp_read_eeprom(struct ptp_ocp *bp)
+static int
+ptp_ocp_read_eeprom(struct ptp_ocp *bp, unsigned int fields)
{
const struct ptp_ocp_eeprom_map *map;
struct nvmem_device *nvmem;
+ u8 data[OCP_BOARD_ID_LEN];
+ const char *field_name = "data";
const void *tag;
- int ret;
-
- if (!bp->i2c_ctrl)
- return;
+ unsigned int field;
+ int ret = 0;
tag = NULL;
nvmem = NULL;
+ mutex_lock(&bp->eeprom_lock);
+ fields &= OCP_EEPROM_ALL;
+ if (bp->has_board_id)
+ fields &= ~OCP_EEPROM_BOARD_ID;
+ if (bp->has_serial)
+ fields &= ~OCP_EEPROM_SERIAL;
+ if (!fields)
+ goto out;
+ if (!bp->i2c_ctrl || !bp->eeprom_map) {
+ ret = -ENODEV;
+ goto out;
+ }
for (map = bp->eeprom_map; map->len; map++) {
+ if (map->bp_offset == offsetof(struct ptp_ocp, board_id)) {
+ field = OCP_EEPROM_BOARD_ID;
+ field_name = "board ID";
+ if (bp->has_board_id)
+ continue;
+ } else if (map->bp_offset == offsetof(struct ptp_ocp, serial)) {
+ field = OCP_EEPROM_SERIAL;
+ field_name = "serial number";
+ if (bp->has_serial)
+ continue;
+ } else {
+ continue;
+ }
+
+ if (!(fields & field))
+ continue;
+
if (map->tag != tag) {
tag = map->tag;
ptp_ocp_nvmem_device_put(&nvmem);
@@ -1992,24 +2029,34 @@ ptp_ocp_read_eeprom(struct ptp_ocp *bp)
nvmem = ptp_ocp_nvmem_device_get(bp, tag);
if (IS_ERR(nvmem)) {
ret = PTR_ERR(nvmem);
- goto fail;
+ goto out;
}
}
- ret = nvmem_device_read(nvmem, map->off, map->len,
- BP_MAP_ENTRY_ADDR(bp, map));
- if (ret != map->len)
- goto fail;
+ ret = nvmem_device_read(nvmem, map->off, map->len, data);
+ if (ret < 0)
+ goto out;
+
+ memcpy(BP_MAP_ENTRY_ADDR(bp, map), data, map->len);
+ if (field == OCP_EEPROM_BOARD_ID) {
+ /* Publish the field before marking it ready. */
+ smp_store_release(&bp->has_board_id, true);
+ } else {
+ /* Publish the field before marking it ready. */
+ smp_store_release(&bp->has_serial, true);
+ }
}
- bp->has_eeprom_data = true;
+ ret = 0;
out:
+ if (ret && ret != -EPROBE_DEFER && !bp->eeprom_error_reported) {
+ dev_err(&bp->pdev->dev, "failed to read EEPROM %s: %pe\n",
+ field_name, ERR_PTR(ret));
+ bp->eeprom_error_reported = true;
+ }
ptp_ocp_nvmem_device_put(&nvmem);
- return;
-
-fail:
- dev_err(&bp->pdev->dev, "could not read eeprom: %d\n", ret);
- goto out;
+ mutex_unlock(&bp->eeprom_lock);
+ return ret;
}
static struct device *
@@ -2156,6 +2203,7 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
struct netlink_ext_ack *extack)
{
struct ptp_ocp *bp = devlink_priv(devlink);
+ const char *board_id_key = DEVLINK_INFO_VERSION_GENERIC_BOARD_ID;
const char *fw_image;
char buf[32];
int err;
@@ -2166,24 +2214,24 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
if (err)
return err;
- if (!bp->has_eeprom_data) {
- ptp_ocp_read_eeprom(bp);
- if (!bp->has_eeprom_data)
- return 0;
- }
+ ptp_ocp_read_eeprom(bp, OCP_EEPROM_ALL);
- sprintf(buf, "%pM", bp->serial);
- err = devlink_info_serial_number_put(req, buf);
- if (err)
- return err;
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (smp_load_acquire(&bp->has_serial)) {
+ sprintf(buf, "%pM", bp->serial);
+ err = devlink_info_serial_number_put(req, buf);
+ if (err)
+ return err;
+ }
- snprintf(buf, sizeof(buf), "%.*s", OCP_BOARD_ID_LEN,
- (const char *)bp->board_id);
- err = devlink_info_version_fixed_put(req,
- DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,
- buf);
- if (err)
- return err;
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (smp_load_acquire(&bp->has_board_id)) {
+ snprintf(buf, sizeof(buf), "%.*s", OCP_BOARD_ID_LEN,
+ (const char *)bp->board_id);
+ err = devlink_info_version_fixed_put(req, board_id_key, buf);
+ if (err)
+ return err;
+ }
return 0;
}
@@ -3757,9 +3805,17 @@ static ssize_t
serialnum_show(struct device *dev, struct device_attribute *attr, char *buf)
{
struct ptp_ocp *bp = dev_get_drvdata(dev);
+ int ret;
- if (!bp->has_eeprom_data)
- ptp_ocp_read_eeprom(bp);
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (!smp_load_acquire(&bp->has_serial)) {
+ ret = ptp_ocp_read_eeprom(bp, OCP_EEPROM_SERIAL);
+ if (ret)
+ return ret;
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (!smp_load_acquire(&bp->has_serial))
+ return -ENODATA;
+ }
return sysfs_emit(buf, "%pM\n", bp->serial);
}
@@ -4729,6 +4785,7 @@ ptp_ocp_device_init(struct ptp_ocp *bp, struct pci_dev *pdev)
bp->ptp_info = ptp_ocp_clock_info;
spin_lock_init(&bp->lock);
+ mutex_init(&bp->eeprom_lock);
for (i = 0; i < __PORT_COUNT; i++)
bp->port[i].line = -1;
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 5/7] ptp: ocp: Add profile-driven I2C topology support
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
` (3 preceding siblings ...)
2026-08-14 23:10 ` [PATCH net-next v5 4/7] ptp: ocp: Track EEPROM fields independently Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 6/7] ptp: ocp: Add R4006 I2C peripheral topology Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 7/7] ptp: ocp: Add Time Card V9 " Ahmad Byagowi
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
Some Time Card variants route board peripherals through a PCA9546 mux,
but their peripheral layout depends on the physical board revision.
Add reusable software-node construction and client population helpers.
Use per-device I2C notifications and serialized delayed work to wait for
the root adapter, instantiate a selected profile, and retry dependencies
that are not ready yet.
Stop the work and remove the mux from a platform-bus unbind notifier
before the controller driver deletes its root adapter. This prevents a
new client from being created after i2c_del_adapter() has swept the
adapter children. Board profiles are added separately.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
drivers/ptp/ptp_ocp.c | 718 +++++++++++++++++++++++++++++++++++++++---
1 file changed, 681 insertions(+), 37 deletions(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 31a4c9dfe391..444b26a5e2a9 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -23,9 +23,12 @@
#include <linux/mtd/mtd.h>
#include <linux/mutex.h>
#include <linux/nvmem-consumer.h>
+#include <linux/property.h>
#include <linux/crc16.h>
#include <linux/dpll.h>
+#include <dt-bindings/leds/common.h>
+
#define PCI_DEVICE_ID_META_TIMECARD 0x0400
#define PCI_VENDOR_ID_CELESTICA 0x18d4
@@ -352,6 +355,70 @@ struct ptp_ocp_serial_port {
#define OCP_SIGNAL_NUM 4
#define OCP_FREQ_NUM 4
+#define OCP_I2C_MUX_CHANNELS 4
+#define OCP_I2C_MAX_SENSOR_COUNT 5
+#define OCP_I2C_MAX_LED_COUNT 6
+#define OCP_I2C_MAX_LED_COMPONENT_COUNT (3 * OCP_I2C_MAX_LED_COUNT)
+#define OCP_I2C_MUX_NAME_LEN 32
+#define OCP_I2C_MUX_COMPATIBLE "nxp,pca9546"
+#define OCP_I2C_MUX_TYPE "pca9546"
+#define OCP_I2C_MUX_ADDRESS 0x70
+#define OCP_I2C_RETRY_MAX 10
+#define OCP_I2C_RECOVERY_SECS 30
+#define OCP_I2C_MAX_NODE_COUNT (1 + OCP_I2C_MUX_CHANNELS + \
+ OCP_I2C_MAX_SENSOR_COUNT + 1 + \
+ OCP_I2C_MAX_LED_COUNT + \
+ OCP_I2C_MAX_LED_COMPONENT_COUNT)
+
+struct ptp_ocp_i2c_device {
+ const char *node_name;
+ const char *compatible;
+ const char *type;
+ u8 channel;
+ u8 address;
+};
+
+struct ptp_ocp_led {
+ const char *node_name;
+ const char *function;
+ u8 function_enumerator;
+ bool has_function_enumerator;
+ u8 channel[3];
+};
+
+struct ptp_ocp_i2c_profile {
+ const char *name;
+ const struct ptp_ocp_i2c_device *sensors;
+ unsigned int sensor_count;
+ const struct ptp_ocp_led *leds;
+ unsigned int led_count;
+ const char *led_node_name;
+ u8 led_mux_channel;
+ u8 led_address;
+ u32 led_riset_ohms;
+ u32 led_max_microamp;
+};
+
+struct ptp_ocp_i2c_topology {
+ char mux_name[OCP_I2C_MUX_NAME_LEN];
+ struct software_node mux_node;
+ struct property_entry mux_props[6];
+ struct software_node channel_nodes[OCP_I2C_MUX_CHANNELS];
+ struct property_entry channel_props[OCP_I2C_MUX_CHANNELS][4];
+ struct software_node sensor_nodes[OCP_I2C_MAX_SENSOR_COUNT];
+ struct property_entry sensor_props[OCP_I2C_MAX_SENSOR_COUNT][3];
+ struct software_node led_node;
+ struct property_entry led_props[6];
+ struct software_node led_nodes[OCP_I2C_MAX_LED_COUNT];
+ struct property_entry led_group_props[OCP_I2C_MAX_LED_COUNT][7];
+ struct software_node component_nodes[OCP_I2C_MAX_LED_COMPONENT_COUNT];
+ struct property_entry
+ component_props[OCP_I2C_MAX_LED_COMPONENT_COUNT][4];
+ const struct software_node *node_group[OCP_I2C_MAX_NODE_COUNT + 1];
+ const struct ptp_ocp_i2c_profile *profile;
+ bool registered;
+};
+
enum {
PORT_GNSS,
PORT_GNSS2,
@@ -422,6 +489,17 @@ struct ptp_ocp {
const struct ocp_sma_op *sma_op;
struct dpll_device *dpll;
dpll_tracker tracker;
+ const struct ptp_ocp_i2c_profile *i2c_profile;
+ struct ptp_ocp_i2c_topology *i2c_topology;
+ struct mutex i2c_topology_lock; /* Serializes topology updates. */
+ struct delayed_work i2c_work;
+ struct notifier_block i2c_notifier;
+ struct notifier_block i2c_ctrl_notifier;
+ unsigned int i2c_retry_count;
+ bool i2c_root_present;
+ bool i2c_resources_ready;
+ bool i2c_notifier_registered;
+ bool i2c_ctrl_notifier_registered;
int signals_nr;
int freq_in_nr;
};
@@ -452,6 +530,10 @@ static int ptp_ocp_signal_from_perout(struct ptp_ocp *bp, int gen,
struct ptp_perout_request *req);
static int ptp_ocp_signal_enable(void *priv, u32 req, bool enable);
static int ptp_ocp_sma_store(struct ptp_ocp *bp, const char *buf, int sma_nr);
+static int ptp_ocp_i2c_notifier_call(struct notifier_block *nb,
+ unsigned long action, void *data);
+static int ptp_ocp_i2c_ctrl_notifier_call(struct notifier_block *nb,
+ unsigned long action, void *data);
static int ptp_ocp_art_board_init(struct ptp_ocp *bp, struct ocp_resource *r);
@@ -1998,7 +2080,7 @@ ptp_ocp_read_eeprom(struct ptp_ocp *bp, unsigned int fields)
fields &= ~OCP_EEPROM_SERIAL;
if (!fields)
goto out;
- if (!bp->i2c_ctrl || !bp->eeprom_map) {
+ if (!READ_ONCE(bp->i2c_ctrl) || !bp->eeprom_map) {
ret = -ENODEV;
goto out;
}
@@ -2059,6 +2141,465 @@ ptp_ocp_read_eeprom(struct ptp_ocp *bp, unsigned int fields)
return ret;
}
+static int
+ptp_ocp_i2c_adapter_match(struct device *dev, const void *data)
+{
+ return !!i2c_verify_adapter(dev);
+}
+
+static struct i2c_adapter *
+ptp_ocp_i2c_root_adapter(struct platform_device *i2c_ctrl)
+{
+ struct i2c_adapter *adapter;
+ struct device *dev;
+
+ dev = device_find_child(&i2c_ctrl->dev, NULL,
+ ptp_ocp_i2c_adapter_match);
+ if (!dev)
+ return NULL;
+
+ adapter = to_i2c_adapter(dev);
+ if (!try_module_get(adapter->owner)) {
+ put_device(dev);
+ return NULL;
+ }
+
+ /* The caller owns the reference returned by device_find_child(). */
+ return adapter;
+}
+
+static bool
+ptp_ocp_i2c_supported(struct ptp_ocp *bp)
+{
+ /* PCI IDs identify FPGA images, not a unique PCB revision. */
+ return (bp->pdev->vendor == PCI_VENDOR_ID_META &&
+ bp->pdev->device == PCI_DEVICE_ID_META_TIMECARD) ||
+ (bp->pdev->vendor == PCI_VENDOR_ID_CELESTICA &&
+ bp->pdev->device == PCI_DEVICE_ID_CELESTICA_TIMECARD);
+}
+
+static int
+ptp_ocp_i2c_init_nodes(struct ptp_ocp *bp)
+{
+ static const char * const channel_names[] = {
+ "i2c@0", "i2c@1", "i2c@2", "i2c@3",
+ };
+ static const char * const output_names[] = {
+ "led@0", "led@1", "led@2", "led@3", "led@4", "led@5",
+ "led@6", "led@7", "led@8", "led@9", "led@a", "led@b",
+ "led@c", "led@d", "led@e", "led@f", "led@10", "led@11",
+ };
+ static const u32 colors[] = {
+ LED_COLOR_ID_RED, LED_COLOR_ID_GREEN, LED_COLOR_ID_BLUE,
+ };
+ const struct ptp_ocp_i2c_profile *profile = bp->i2c_profile;
+ struct device *dev = &bp->pdev->dev;
+ struct ptp_ocp_i2c_topology *topology;
+ unsigned int component = 0;
+ unsigned int node = 0;
+ unsigned int expected_nodes;
+ unsigned int i, j, prop;
+ int ret;
+
+ if (!profile)
+ return -EINVAL;
+ if (bp->i2c_topology && bp->i2c_topology->registered)
+ return 0;
+ if (bp->i2c_topology) {
+ topology = bp->i2c_topology;
+ goto register_nodes;
+ }
+ if (profile->sensor_count > OCP_I2C_MAX_SENSOR_COUNT ||
+ profile->led_count > OCP_I2C_MAX_LED_COUNT ||
+ profile->led_mux_channel >= OCP_I2C_MUX_CHANNELS)
+ return -EINVAL;
+
+ for (i = 0; i < profile->sensor_count; i++)
+ if (profile->sensors[i].channel >= OCP_I2C_MUX_CHANNELS)
+ return -EINVAL;
+
+ for (i = 0; i < profile->led_count; i++)
+ for (j = 0; j < ARRAY_SIZE(profile->leds[i].channel); j++)
+ if (profile->leds[i].channel[j] >=
+ ARRAY_SIZE(output_names))
+ return -EINVAL;
+
+ topology = devm_kzalloc(dev, sizeof(*topology), GFP_KERNEL);
+ if (!topology)
+ return -ENOMEM;
+
+ topology->profile = profile;
+ snprintf(topology->mux_name, sizeof(topology->mux_name),
+ "ocp%d-%s-mux", bp->id, profile->name);
+ topology->mux_node.name = topology->mux_name;
+ topology->mux_node.properties = topology->mux_props;
+ topology->mux_props[0] =
+ PROPERTY_ENTRY_STRING("compatible", OCP_I2C_MUX_COMPATIBLE);
+ topology->mux_props[1] =
+ PROPERTY_ENTRY_U32("reg", OCP_I2C_MUX_ADDRESS);
+ topology->mux_props[2] =
+ PROPERTY_ENTRY_BOOL("i2c-mux-idle-disconnect");
+ topology->mux_props[3] = PROPERTY_ENTRY_U32("#address-cells", 1);
+ topology->mux_props[4] = PROPERTY_ENTRY_U32("#size-cells", 0);
+ topology->node_group[node++] = &topology->mux_node;
+
+ for (i = 0; i < OCP_I2C_MUX_CHANNELS; i++) {
+ topology->channel_nodes[i].name = channel_names[i];
+ topology->channel_nodes[i].parent = &topology->mux_node;
+ topology->channel_nodes[i].properties =
+ topology->channel_props[i];
+ topology->channel_props[i][0] = PROPERTY_ENTRY_U32("reg", i);
+ topology->channel_props[i][1] =
+ PROPERTY_ENTRY_U32("#address-cells", 1);
+ topology->channel_props[i][2] =
+ PROPERTY_ENTRY_U32("#size-cells", 0);
+ topology->node_group[node++] = &topology->channel_nodes[i];
+ }
+
+ for (i = 0; i < profile->sensor_count; i++) {
+ const struct ptp_ocp_i2c_device *sensor;
+
+ sensor = &profile->sensors[i];
+ topology->sensor_nodes[i].name = sensor->node_name;
+ topology->sensor_nodes[i].parent =
+ &topology->channel_nodes[sensor->channel];
+ topology->sensor_nodes[i].properties =
+ topology->sensor_props[i];
+ prop = 0;
+ if (sensor->compatible)
+ topology->sensor_props[i][prop++] =
+ PROPERTY_ENTRY_STRING("compatible",
+ sensor->compatible);
+ topology->sensor_props[i][prop] =
+ PROPERTY_ENTRY_U32("reg", sensor->address);
+ topology->node_group[node++] = &topology->sensor_nodes[i];
+ }
+
+ topology->led_node.name = profile->led_node_name;
+ topology->led_node.parent =
+ &topology->channel_nodes[profile->led_mux_channel];
+ topology->led_node.properties = topology->led_props;
+ topology->led_props[0] =
+ PROPERTY_ENTRY_STRING("compatible", "issi,is32fl3207");
+ topology->led_props[1] =
+ PROPERTY_ENTRY_U32("reg", profile->led_address);
+ topology->led_props[2] =
+ PROPERTY_ENTRY_U32("issi,riset-ohms",
+ profile->led_riset_ohms);
+ topology->led_props[3] = PROPERTY_ENTRY_U32("#address-cells", 1);
+ topology->led_props[4] = PROPERTY_ENTRY_U32("#size-cells", 0);
+ topology->node_group[node++] = &topology->led_node;
+
+ for (i = 0; i < profile->led_count; i++) {
+ const struct ptp_ocp_led *led = &profile->leds[i];
+ u32 group_reg;
+
+ group_reg = min3(led->channel[0], led->channel[1],
+ led->channel[2]);
+ topology->led_nodes[i].name = led->node_name;
+ topology->led_nodes[i].parent = &topology->led_node;
+ topology->led_nodes[i].properties =
+ topology->led_group_props[i];
+ prop = 0;
+ topology->led_group_props[i][prop++] =
+ PROPERTY_ENTRY_U32("reg", group_reg);
+ topology->led_group_props[i][prop++] =
+ PROPERTY_ENTRY_U32("color", LED_COLOR_ID_RGB);
+ topology->led_group_props[i][prop++] =
+ PROPERTY_ENTRY_STRING("function", led->function);
+ if (led->has_function_enumerator)
+ topology->led_group_props[i][prop++] =
+ PROPERTY_ENTRY_U32("function-enumerator",
+ led->function_enumerator);
+ topology->led_group_props[i][prop++] =
+ PROPERTY_ENTRY_U32("#address-cells", 1);
+ topology->led_group_props[i][prop] =
+ PROPERTY_ENTRY_U32("#size-cells", 0);
+ topology->node_group[node++] = &topology->led_nodes[i];
+
+ for (j = 0; j < ARRAY_SIZE(led->channel); j++, component++) {
+ u8 channel = led->channel[j];
+
+ topology->component_nodes[component].name =
+ output_names[channel];
+ topology->component_nodes[component].parent =
+ &topology->led_nodes[i];
+ topology->component_nodes[component].properties =
+ topology->component_props[component];
+ topology->component_props[component][0] =
+ PROPERTY_ENTRY_U32("reg", channel);
+ topology->component_props[component][1] =
+ PROPERTY_ENTRY_U32("color", colors[j]);
+ topology->component_props[component][2] =
+ PROPERTY_ENTRY_U32("led-max-microamp",
+ profile->led_max_microamp);
+ topology->node_group[node++] =
+ &topology->component_nodes[component];
+ }
+ }
+
+ expected_nodes = 1 + OCP_I2C_MUX_CHANNELS +
+ profile->sensor_count + 1 + profile->led_count +
+ 3 * profile->led_count;
+ if (WARN_ON(node != expected_nodes)) {
+ devm_kfree(dev, topology);
+ return -EINVAL;
+ }
+
+ bp->i2c_topology = topology;
+
+register_nodes:
+ ret = software_node_register_node_group(topology->node_group);
+ if (ret)
+ return ret;
+
+ topology->registered = true;
+ return 0;
+}
+
+static int
+ptp_ocp_i2c_add_device(struct i2c_adapter *adapter,
+ const struct software_node *node,
+ const char *type, u16 address)
+{
+ struct fwnode_handle *fwnode = software_node_fwnode(node);
+ struct i2c_board_info info = { };
+ struct i2c_client *client;
+
+ client = i2c_find_device_by_fwnode(fwnode);
+ if (client) {
+ put_device(&client->dev);
+ return 0;
+ }
+
+ strscpy(info.type, type, sizeof(info.type));
+ info.addr = address;
+ info.fwnode = fwnode;
+ client = i2c_new_client_device(adapter, &info);
+ if (IS_ERR(client))
+ return PTR_ERR(client);
+
+ return 0;
+}
+
+static int
+ptp_ocp_i2c_populate_channel(struct ptp_ocp *bp, unsigned int channel)
+{
+ struct ptp_ocp_i2c_topology *topology = bp->i2c_topology;
+ const struct ptp_ocp_i2c_profile *profile = topology->profile;
+ const struct software_node *node;
+ struct fwnode_handle *fwnode;
+ struct i2c_adapter *adapter;
+ unsigned int i;
+ int err, ret = 0;
+
+ fwnode = software_node_fwnode(&topology->channel_nodes[channel]);
+ adapter = i2c_get_adapter_by_fwnode(fwnode);
+ if (!adapter)
+ return -EAGAIN;
+
+ for (i = 0; i < profile->sensor_count; i++) {
+ const struct ptp_ocp_i2c_device *sensor;
+
+ sensor = &profile->sensors[i];
+ if (sensor->channel != channel)
+ continue;
+
+ node = &topology->sensor_nodes[i];
+ err = ptp_ocp_i2c_add_device(adapter, node, sensor->type,
+ sensor->address);
+ if (err && !ret)
+ ret = err;
+ }
+
+ if (channel == profile->led_mux_channel) {
+ err = ptp_ocp_i2c_add_device(adapter, &topology->led_node,
+ "is32fl3207",
+ profile->led_address);
+ if (err && !ret)
+ ret = err;
+ }
+
+ i2c_put_adapter(adapter);
+ return ret;
+}
+
+static void
+ptp_ocp_i2c_remove_mux(struct ptp_ocp *bp)
+{
+ struct fwnode_handle *fwnode;
+ struct i2c_client *client;
+
+ if (!bp->i2c_topology || !bp->i2c_topology->registered)
+ return;
+
+ fwnode = software_node_fwnode(&bp->i2c_topology->mux_node);
+ client = i2c_find_device_by_fwnode(fwnode);
+ if (!client)
+ return;
+
+ i2c_unregister_device(client);
+ put_device(&client->dev);
+}
+
+static void
+ptp_ocp_i2c_kick(struct ptp_ocp *bp)
+{
+ if (!ptp_ocp_i2c_supported(bp))
+ return;
+ if (!READ_ONCE(bp->i2c_resources_ready))
+ return;
+ if (!READ_ONCE(bp->i2c_root_present))
+ return;
+
+ mod_delayed_work(system_wq, &bp->i2c_work, 1);
+}
+
+static void
+ptp_ocp_i2c_retry(struct ptp_ocp *bp, int error)
+{
+ unsigned long delay = HZ;
+ unsigned int retries;
+ bool exhausted;
+
+ if (!READ_ONCE(bp->i2c_resources_ready))
+ return;
+ if (!READ_ONCE(bp->i2c_root_present))
+ return;
+
+ exhausted = bp->i2c_retry_count == OCP_I2C_RETRY_MAX - 1;
+ if (bp->i2c_retry_count < OCP_I2C_RETRY_MAX)
+ bp->i2c_retry_count++;
+ retries = bp->i2c_retry_count;
+ if (retries >= OCP_I2C_RETRY_MAX) {
+ if (exhausted)
+ dev_err(&bp->pdev->dev,
+ "I2C topology failed after %d attempts: %pe; "
+ "retrying every %d seconds\n",
+ OCP_I2C_RETRY_MAX, ERR_PTR(error),
+ OCP_I2C_RECOVERY_SECS);
+ delay = OCP_I2C_RECOVERY_SECS * HZ;
+ }
+
+ /* Preserve a faster rerun queued by an I2C bus notification. */
+ queue_delayed_work(system_wq, &bp->i2c_work, delay);
+}
+
+static int
+ptp_ocp_i2c_populate_topology(struct ptp_ocp *bp,
+ struct platform_device *i2c_ctrl)
+{
+ const struct software_node *node;
+ struct i2c_adapter *adapter;
+ unsigned int channel;
+ int err, ret = 0;
+
+ if (!READ_ONCE(bp->i2c_root_present))
+ return 0;
+ if (!ptp_ocp_i2c_supported(bp) || !bp->i2c_profile)
+ return 0;
+
+ adapter = ptp_ocp_i2c_root_adapter(i2c_ctrl);
+ if (!adapter)
+ return -EAGAIN;
+
+ ret = ptp_ocp_i2c_init_nodes(bp);
+ if (ret)
+ goto out_put_adapter;
+
+ node = &bp->i2c_topology->mux_node;
+ ret = ptp_ocp_i2c_add_device(adapter, node, OCP_I2C_MUX_TYPE,
+ OCP_I2C_MUX_ADDRESS);
+ if (ret)
+ goto out_put_adapter;
+
+ for (channel = 0; channel < OCP_I2C_MUX_CHANNELS; channel++) {
+ err = ptp_ocp_i2c_populate_channel(bp, channel);
+ if (err && !ret)
+ ret = err;
+ }
+
+out_put_adapter:
+ i2c_put_adapter(adapter);
+ return ret;
+}
+
+static void
+ptp_ocp_i2c_work(struct work_struct *work)
+{
+ struct ptp_ocp *bp = container_of(work, struct ptp_ocp,
+ i2c_work.work);
+ struct platform_device *i2c_ctrl;
+ struct device *i2c_ctrl_dev;
+ unsigned int retries;
+ int ret = 0;
+
+ /* Pair with resource publication after registration. */
+ if (!smp_load_acquire(&bp->i2c_resources_ready))
+ return;
+ if (!ptp_ocp_i2c_supported(bp))
+ return;
+
+ mutex_lock(&bp->i2c_topology_lock);
+ if (!READ_ONCE(bp->i2c_resources_ready) ||
+ !READ_ONCE(bp->i2c_root_present)) {
+ mutex_unlock(&bp->i2c_topology_lock);
+ return;
+ }
+
+ i2c_ctrl = READ_ONCE(bp->i2c_ctrl);
+ if (!i2c_ctrl) {
+ ret = -EAGAIN;
+ goto out_unlock;
+ }
+
+ i2c_ctrl_dev = get_device(&i2c_ctrl->dev);
+ ret = ptp_ocp_i2c_populate_topology(bp, i2c_ctrl);
+ put_device(i2c_ctrl_dev);
+
+out_unlock:
+ mutex_unlock(&bp->i2c_topology_lock);
+
+ if (ret) {
+ ptp_ocp_i2c_retry(bp, ret);
+ return;
+ }
+
+ retries = bp->i2c_retry_count;
+ bp->i2c_retry_count = 0;
+ if (retries >= OCP_I2C_RETRY_MAX)
+ dev_info(&bp->pdev->dev, "I2C topology setup recovered\n");
+}
+
+static void
+ptp_ocp_i2c_unregister(struct ptp_ocp *bp)
+{
+ struct ptp_ocp_i2c_topology *topology;
+
+ WRITE_ONCE(bp->i2c_resources_ready, false);
+ WRITE_ONCE(bp->i2c_root_present, false);
+ disable_delayed_work_sync(&bp->i2c_work);
+ mutex_lock(&bp->i2c_topology_lock);
+ topology = bp->i2c_topology;
+ if (!topology) {
+ bp->i2c_profile = NULL;
+ goto out;
+ }
+
+ if (topology->registered) {
+ ptp_ocp_i2c_remove_mux(bp);
+ software_node_unregister_node_group(topology->node_group);
+ topology->registered = false;
+ }
+
+ bp->i2c_topology = NULL;
+ bp->i2c_profile = NULL;
+
+out:
+ bp->i2c_retry_count = 0;
+ mutex_unlock(&bp->i2c_topology_lock);
+}
+
static struct device *
ptp_ocp_find_flash(struct ptp_ocp *bp)
{
@@ -2330,7 +2871,7 @@ ptp_ocp_register_i2c(struct ptp_ocp *bp, struct ocp_resource *r)
if (IS_ERR(p))
return PTR_ERR(p);
- bp_assign_entry(bp, r, p);
+ WRITE_ONCE(bp->i2c_ctrl, p);
return 0;
}
@@ -4786,6 +5327,7 @@ ptp_ocp_device_init(struct ptp_ocp *bp, struct pci_dev *pdev)
bp->ptp_info = ptp_ocp_clock_info;
spin_lock_init(&bp->lock);
mutex_init(&bp->eeprom_lock);
+ mutex_init(&bp->i2c_topology_lock);
for (i = 0; i < __PORT_COUNT; i++)
bp->port[i].line = -1;
@@ -4915,6 +5457,7 @@ ptp_ocp_detach_sysfs(struct ptp_ocp *bp)
{
struct device *dev = &bp->dev;
+ sysfs_remove_link(&dev->kobj, "i2c");
sysfs_remove_link(&dev->kobj, "ptp");
sysfs_remove_link(&dev->kobj, "pps");
}
@@ -4922,8 +5465,19 @@ ptp_ocp_detach_sysfs(struct ptp_ocp *bp)
static void
ptp_ocp_detach(struct ptp_ocp *bp)
{
+ struct platform_device *i2c_ctrl;
int i;
+ if (bp->i2c_ctrl_notifier_registered) {
+ bus_unregister_notifier(&platform_bus_type,
+ &bp->i2c_ctrl_notifier);
+ bp->i2c_ctrl_notifier_registered = false;
+ }
+ if (bp->i2c_notifier_registered) {
+ bus_unregister_notifier(&i2c_bus_type, &bp->i2c_notifier);
+ bp->i2c_notifier_registered = false;
+ }
+ ptp_ocp_i2c_unregister(bp);
ptp_ocp_debugfs_remove_device(bp);
ptp_ocp_detach_sysfs(bp);
ptp_ocp_attr_group_del(bp);
@@ -4955,8 +5509,13 @@ ptp_ocp_detach(struct ptp_ocp *bp)
for (i = 0; i < __PORT_COUNT; i++)
if (bp->port[i].line != -1)
serial8250_unregister_port(bp->port[i].line);
- platform_device_unregister(bp->spi_flash);
- platform_device_unregister(bp->i2c_ctrl);
+ if (bp->spi_flash)
+ platform_device_unregister(bp->spi_flash);
+ i2c_ctrl = READ_ONCE(bp->i2c_ctrl);
+ if (i2c_ctrl) {
+ WRITE_ONCE(bp->i2c_ctrl, NULL);
+ platform_device_unregister(i2c_ctrl);
+ }
if (bp->i2c_clk)
clk_hw_unregister_fixed_rate(bp->i2c_clk);
if (bp->n_irqs)
@@ -5138,6 +5697,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto out_disable;
INIT_DELAYED_WORK(&bp->sync_work, ptp_ocp_sync_work);
+ INIT_DELAYED_WORK(&bp->i2c_work, ptp_ocp_i2c_work);
/* compat mode.
* Older FPGA firmware only returns 2 irq's.
@@ -5152,9 +5712,32 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
bp->n_irqs = err;
pci_set_master(pdev);
+ bp->i2c_notifier.notifier_call = ptp_ocp_i2c_notifier_call;
+ err = bus_register_notifier(&i2c_bus_type, &bp->i2c_notifier);
+ if (err) {
+ dev_err(&pdev->dev,
+ "failed to register I2C notifier: %d\n", err);
+ goto out;
+ }
+ bp->i2c_notifier_registered = true;
+ bp->i2c_ctrl_notifier.notifier_call =
+ ptp_ocp_i2c_ctrl_notifier_call;
+ err = bus_register_notifier(&platform_bus_type,
+ &bp->i2c_ctrl_notifier);
+ if (err) {
+ dev_err(&pdev->dev,
+ "failed to register I2C controller notifier: %d\n",
+ err);
+ goto out;
+ }
+ bp->i2c_ctrl_notifier_registered = true;
+
err = ptp_ocp_register_resources(bp, id->driver_data);
if (err)
goto out;
+ /* Publish all board resources before I2C topology work can run. */
+ smp_store_release(&bp->i2c_resources_ready, true);
+ ptp_ocp_i2c_kick(bp);
bp->ptp = ptp_clock_register(&bp->ptp_info, &pdev->dev);
if (IS_ERR(bp->ptp)) {
@@ -5248,46 +5831,115 @@ static struct pci_driver ptp_ocp_driver = {
.shutdown = ptp_ocp_remove,
};
+static bool
+ptp_ocp_i2c_is_child(struct ptp_ocp *bp, struct device *child)
+{
+ struct device *dev = child;
+
+ while (dev) {
+ if (dev == &bp->pdev->dev)
+ return true;
+ dev = dev->parent;
+ }
+
+ return false;
+}
+
+static bool
+ptp_ocp_i2c_is_root(struct ptp_ocp *bp, struct i2c_adapter *adapter)
+{
+ struct platform_device *i2c_ctrl = READ_ONCE(bp->i2c_ctrl);
+ struct device *parent = adapter->dev.parent;
+
+ if (!parent)
+ return false;
+ if (i2c_ctrl && parent == &i2c_ctrl->dev)
+ return true;
+
+ /* The adapter can notify before ptp_ocp_register_i2c() stores it. */
+ return parent->parent == &bp->pdev->dev;
+}
+
+static int
+ptp_ocp_i2c_ctrl_notifier_call(struct notifier_block *nb,
+ unsigned long action, void *data)
+{
+ struct ptp_ocp *bp = container_of(nb, struct ptp_ocp,
+ i2c_ctrl_notifier);
+ struct platform_device *i2c_ctrl = READ_ONCE(bp->i2c_ctrl);
+ struct device *dev = data;
+
+ if (action != BUS_NOTIFY_UNBIND_DRIVER || !i2c_ctrl ||
+ dev != &i2c_ctrl->dev)
+ return 0;
+
+ /*
+ * Stop topology creation before the controller driver's remove path
+ * deletes its root adapter. Otherwise a newly-created mux client can
+ * pin that adapter after i2c_del_adapter() has swept its children.
+ */
+ WRITE_ONCE(bp->i2c_root_present, false);
+ cancel_delayed_work_sync(&bp->i2c_work);
+ mutex_lock(&bp->i2c_topology_lock);
+ ptp_ocp_i2c_remove_mux(bp);
+ bp->i2c_retry_count = 0;
+ mutex_unlock(&bp->i2c_topology_lock);
+ sysfs_remove_link(&bp->dev.kobj, "i2c");
+
+ return 0;
+}
+
static int
ptp_ocp_i2c_notifier_call(struct notifier_block *nb,
unsigned long action, void *data)
{
- struct device *dev, *child = data;
+ struct i2c_adapter *adapter;
+ struct i2c_client *client;
+ struct device *child = data;
struct ptp_ocp *bp;
- bool add;
+
+ bp = container_of(nb, struct ptp_ocp, i2c_notifier);
+ if (!ptp_ocp_i2c_is_child(bp, child))
+ return 0;
switch (action) {
case BUS_NOTIFY_ADD_DEVICE:
- case BUS_NOTIFY_DEL_DEVICE:
- add = action == BUS_NOTIFY_ADD_DEVICE;
- break;
- default:
+ adapter = i2c_verify_adapter(child);
+ if (!adapter)
+ return 0;
+ if (ptp_ocp_i2c_is_root(bp, adapter)) {
+ WRITE_ONCE(bp->i2c_root_present, true);
+ ptp_ocp_symlink(bp, child, "i2c");
+ }
+ ptp_ocp_i2c_kick(bp);
return 0;
- }
- if (!i2c_verify_adapter(child))
+ case BUS_NOTIFY_DEL_DEVICE:
+ adapter = i2c_verify_adapter(child);
+ if (!adapter)
+ return 0;
+ if (ptp_ocp_i2c_is_root(bp, adapter)) {
+ WRITE_ONCE(bp->i2c_root_present, false);
+ sysfs_remove_link(&bp->dev.kobj, "i2c");
+ }
return 0;
- dev = child;
- while ((dev = dev->parent))
- if (dev->driver && !strcmp(dev->driver->name, KBUILD_MODNAME))
- goto found;
- return 0;
+ case BUS_NOTIFY_BOUND_DRIVER:
+ client = i2c_verify_client(child);
+ if (!client || client->addr != 0x50)
+ return 0;
+ if (!ptp_ocp_i2c_is_root(bp, client->adapter))
+ return 0;
+ ptp_ocp_i2c_kick(bp);
+ return 0;
-found:
- bp = dev_get_drvdata(dev);
- if (add)
- ptp_ocp_symlink(bp, child, "i2c");
- else
- sysfs_remove_link(&bp->dev.kobj, "i2c");
+ default:
+ return 0;
+ }
return 0;
}
-static struct notifier_block ptp_ocp_i2c_notifier = {
- .notifier_call = ptp_ocp_i2c_notifier_call,
-};
-
static int __init
ptp_ocp_init(void)
{
@@ -5301,21 +5953,14 @@ ptp_ocp_init(void)
if (err)
goto out;
- what = "i2c notifier";
- err = bus_register_notifier(&i2c_bus_type, &ptp_ocp_i2c_notifier);
- if (err)
- goto out_notifier;
-
what = "ptp_ocp driver";
err = pci_register_driver(&ptp_ocp_driver);
if (err)
- goto out_register;
+ goto out_class;
return 0;
-out_register:
- bus_unregister_notifier(&i2c_bus_type, &ptp_ocp_i2c_notifier);
-out_notifier:
+out_class:
class_unregister(&timecard_class);
out:
ptp_ocp_debugfs_fini();
@@ -5326,7 +5971,6 @@ ptp_ocp_init(void)
static void __exit
ptp_ocp_fini(void)
{
- bus_unregister_notifier(&i2c_bus_type, &ptp_ocp_i2c_notifier);
pci_unregister_driver(&ptp_ocp_driver);
class_unregister(&timecard_class);
ptp_ocp_debugfs_fini();
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 6/7] ptp: ocp: Add R4006 I2C peripheral topology
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
` (4 preceding siblings ...)
2026-08-14 23:10 ` [PATCH net-next v5 5/7] ptp: ocp: Add profile-driven I2C topology support Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 7/7] ptp: ocp: Add Time Card V9 " Ahmad Byagowi
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
R4006 boards place sensors and an IS32FL3207 LED controller behind
a four-channel PCA9546 mux.
Describe the LM75B, SHT3x, and ICP10100 sensors and the five RGB LED
groups. The BNO08x at address 0x4a is omitted because it has no upstream
driver; the LM75B using the same address is on a different mux channel.
Read the board ID independently of the serial EEPROM and select this
profile from the R4006 prefix. Production IDs may append a board revision,
while unknown board IDs remain untouched.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
drivers/ptp/ptp_ocp.c | 97 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 96 insertions(+), 1 deletion(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 444b26a5e2a9..5ae50ad83bda 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -578,6 +578,71 @@ static struct ptp_ocp_eeprom_map art_eeprom_map[] = {
{ }
};
+/*
+ * The BNO08x at 0x4a on channel 3 has no upstream Linux driver, so omit it.
+ * The LM75B at the same address is a separate device on mux channel 0.
+ */
+static const struct ptp_ocp_i2c_device ptp_ocp_r4006_sensors[] = {
+ { "temperature@48", "national,lm75b", "lm75b", 0, 0x48 },
+ { "temperature@49", "national,lm75b", "lm75b", 0, 0x49 },
+ { "temperature@4a", "national,lm75b", "lm75b", 0, 0x4a },
+ { "humidity@44", NULL, "sht3x", 1, 0x44 },
+ { "pressure@63", "invensense,icp10100", "icp10100", 2, 0x63 },
+};
+
+static const struct ptp_ocp_led ptp_ocp_r4006_leds[] = {
+ {
+ .node_name = "multi-led@c",
+ .function = LED_FUNCTION_STATUS,
+ .channel = { 13, 12, 14 },
+ },
+ {
+ .node_name = "multi-led@6",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 1,
+ .has_function_enumerator = true,
+ .channel = { 7, 6, 8 },
+ },
+ {
+ .node_name = "multi-led@9",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 2,
+ .has_function_enumerator = true,
+ .channel = { 10, 9, 11 },
+ },
+ {
+ .node_name = "multi-led@0",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 3,
+ .has_function_enumerator = true,
+ .channel = { 1, 0, 2 },
+ },
+ {
+ .node_name = "multi-led@3",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 4,
+ .has_function_enumerator = true,
+ .channel = { 4, 3, 5 },
+ },
+};
+
+static_assert(ARRAY_SIZE(ptp_ocp_r4006_sensors) <=
+ OCP_I2C_MAX_SENSOR_COUNT);
+static_assert(ARRAY_SIZE(ptp_ocp_r4006_leds) <= OCP_I2C_MAX_LED_COUNT);
+
+static const struct ptp_ocp_i2c_profile ptp_ocp_r4006_profile = {
+ .name = "r4006",
+ .sensors = ptp_ocp_r4006_sensors,
+ .sensor_count = ARRAY_SIZE(ptp_ocp_r4006_sensors),
+ .leds = ptp_ocp_r4006_leds,
+ .led_count = ARRAY_SIZE(ptp_ocp_r4006_leds),
+ .led_node_name = "led-controller@34",
+ .led_mux_channel = 1,
+ .led_address = 0x34,
+ .led_riset_ohms = 4700,
+ .led_max_microamp = 8150,
+};
+
#define bp_assign_entry(bp, res, val) ({ \
uintptr_t addr = (uintptr_t)(bp) + (res)->bp_offset; \
*(typeof(val) *)addr = val; \
@@ -2178,6 +2243,20 @@ ptp_ocp_i2c_supported(struct ptp_ocp *bp)
bp->pdev->device == PCI_DEVICE_ID_CELESTICA_TIMECARD);
}
+static const struct ptp_ocp_i2c_profile *
+ptp_ocp_i2c_select_profile(struct ptp_ocp *bp)
+{
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (!smp_load_acquire(&bp->has_board_id))
+ return NULL;
+
+ /* Production R4006 board IDs may carry a revision suffix. */
+ if (!memcmp(bp->board_id, "R4006", 5))
+ return &ptp_ocp_r4006_profile;
+
+ return NULL;
+}
+
static int
ptp_ocp_i2c_init_nodes(struct ptp_ocp *bp)
{
@@ -2496,13 +2575,29 @@ ptp_ocp_i2c_populate_topology(struct ptp_ocp *bp,
if (!READ_ONCE(bp->i2c_root_present))
return 0;
- if (!ptp_ocp_i2c_supported(bp) || !bp->i2c_profile)
+ if (!ptp_ocp_i2c_supported(bp) || !bp->eeprom_map)
return 0;
adapter = ptp_ocp_i2c_root_adapter(i2c_ctrl);
if (!adapter)
return -EAGAIN;
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (!smp_load_acquire(&bp->has_board_id)) {
+ ret = ptp_ocp_read_eeprom(bp, OCP_EEPROM_BOARD_ID);
+ if (ret)
+ goto out_put_adapter;
+ }
+ /* Pairs with field publication in ptp_ocp_read_eeprom(). */
+ if (!smp_load_acquire(&bp->has_board_id)) {
+ ret = -EAGAIN;
+ goto out_put_adapter;
+ }
+ if (!bp->i2c_profile)
+ bp->i2c_profile = ptp_ocp_i2c_select_profile(bp);
+ if (!bp->i2c_profile)
+ goto out_put_adapter;
+
ret = ptp_ocp_i2c_init_nodes(bp);
if (ret)
goto out_put_adapter;
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next v5 7/7] ptp: ocp: Add Time Card V9 I2C peripheral topology
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
` (5 preceding siblings ...)
2026-08-14 23:10 ` [PATCH net-next v5 6/7] ptp: ocp: Add R4006 I2C peripheral topology Ahmad Byagowi
@ 2026-08-14 23:10 ` Ahmad Byagowi
6 siblings, 0 replies; 8+ messages in thread
From: Ahmad Byagowi @ 2026-08-14 23:10 UTC (permalink / raw)
To: netdev
Cc: Lee Jones, Pavel Machek, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Andi Shyti, Peter Rosin, Nam Tran, Vadim Fedorenko,
Richard Cochran, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Kees Cook, Gustavo A . R . Silva,
linux-leds, devicetree, linux-i2c, linux-kernel, linux-hardening
Time Card V9 boards use the same mux infrastructure with a BME280,
a BNO055, and an IS32FL3207 at a different address.
Describe six RGB groups. The first two expose the GNSS1 and GNSS2
status LEDs on outputs 0 through 5; the remaining four expose the SMA
indicator LEDs on outputs 6 through 17.
Select the profile only when the fixed-width board ID exactly matches
TIMECARD-V9 with zero or erased-byte padding. Older revisions share the
detectable I2C devices but not the V9 LED wiring.
Signed-off-by: Ahmad Byagowi <ahmadexp@gmail.com>
---
drivers/ptp/ptp_ocp.c | 87 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 5ae50ad83bda..5100278f164d 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -643,6 +643,73 @@ static const struct ptp_ocp_i2c_profile ptp_ocp_r4006_profile = {
.led_max_microamp = 8150,
};
+static const struct ptp_ocp_i2c_device ptp_ocp_v9_sensors[] = {
+ { "pressure@76", "bosch,bme280", "bme280", 1, 0x76 },
+ { "imu@29", "bosch,bno055", "bno055", 1, 0x29 },
+};
+
+static const struct ptp_ocp_led ptp_ocp_v9_leds[] = {
+ {
+ .node_name = "multi-led@0",
+ .function = LED_FUNCTION_STATUS,
+ .function_enumerator = 1,
+ .has_function_enumerator = true,
+ .channel = { 0, 1, 2 },
+ },
+ {
+ .node_name = "multi-led@3",
+ .function = LED_FUNCTION_STATUS,
+ .function_enumerator = 2,
+ .has_function_enumerator = true,
+ .channel = { 3, 4, 5 },
+ },
+ {
+ .node_name = "multi-led@6",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 1,
+ .has_function_enumerator = true,
+ .channel = { 6, 7, 8 },
+ },
+ {
+ .node_name = "multi-led@9",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 2,
+ .has_function_enumerator = true,
+ .channel = { 9, 10, 11 },
+ },
+ {
+ .node_name = "multi-led@c",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 3,
+ .has_function_enumerator = true,
+ .channel = { 12, 13, 14 },
+ },
+ {
+ .node_name = "multi-led@f",
+ .function = LED_FUNCTION_INDICATOR,
+ .function_enumerator = 4,
+ .has_function_enumerator = true,
+ .channel = { 15, 16, 17 },
+ },
+};
+
+static_assert(ARRAY_SIZE(ptp_ocp_v9_sensors) <=
+ OCP_I2C_MAX_SENSOR_COUNT);
+static_assert(ARRAY_SIZE(ptp_ocp_v9_leds) <= OCP_I2C_MAX_LED_COUNT);
+
+static const struct ptp_ocp_i2c_profile ptp_ocp_v9_profile = {
+ .name = "v9",
+ .sensors = ptp_ocp_v9_sensors,
+ .sensor_count = ARRAY_SIZE(ptp_ocp_v9_sensors),
+ .leds = ptp_ocp_v9_leds,
+ .led_count = ARRAY_SIZE(ptp_ocp_v9_leds),
+ .led_node_name = "led-controller@37",
+ .led_mux_channel = 1,
+ .led_address = 0x37,
+ .led_riset_ohms = 4700,
+ .led_max_microamp = 8100,
+};
+
#define bp_assign_entry(bp, res, val) ({ \
uintptr_t addr = (uintptr_t)(bp) + (res)->bp_offset; \
*(typeof(val) *)addr = val; \
@@ -2243,6 +2310,22 @@ ptp_ocp_i2c_supported(struct ptp_ocp *bp)
bp->pdev->device == PCI_DEVICE_ID_CELESTICA_TIMECARD);
}
+static bool
+ptp_ocp_board_id_matches(const u8 *board_id, const char *id)
+{
+ size_t len = strlen(id);
+ unsigned int i;
+
+ if (len > OCP_BOARD_ID_LEN || memcmp(board_id, id, len))
+ return false;
+
+ for (i = len; i < OCP_BOARD_ID_LEN; i++)
+ if (board_id[i] != 0 && board_id[i] != 0xff)
+ return false;
+
+ return true;
+}
+
static const struct ptp_ocp_i2c_profile *
ptp_ocp_i2c_select_profile(struct ptp_ocp *bp)
{
@@ -2254,6 +2337,10 @@ ptp_ocp_i2c_select_profile(struct ptp_ocp *bp)
if (!memcmp(bp->board_id, "R4006", 5))
return &ptp_ocp_r4006_profile;
+ /* Older revisions share V9's I2C devices but not its LED wiring. */
+ if (ptp_ocp_board_id_matches(bp->board_id, "TIMECARD-V9"))
+ return &ptp_ocp_v9_profile;
+
return NULL;
}
--
2.50.1 (Apple Git-155)
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-08-14 23:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-14 23:10 [PATCH net-next v5 0/7] ptp: ocp: Add R4006 and V9 I2C peripheral support Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 1/7] dt-bindings: leds: Add IS32FL3207 controller Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 2/7] leds: is32fl3207: Add controller driver Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 3/7] i2c: mux: Propagate software nodes to channel adapters Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 4/7] ptp: ocp: Track EEPROM fields independently Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 5/7] ptp: ocp: Add profile-driven I2C topology support Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 6/7] ptp: ocp: Add R4006 I2C peripheral topology Ahmad Byagowi
2026-08-14 23:10 ` [PATCH net-next v5 7/7] ptp: ocp: Add Time Card V9 " Ahmad Byagowi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox