From 841bb8e98b3383fdb98b43251923b94e6c86f1cf Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Thu, 14 Mar 2024 10:05:58 +0000 Subject: [PATCH 0966/1002] overlays: i2c-mux: Add 'base' parameter Add a 'base' parameter to set an explicit bus number for the channels, where the requested bus number is base + channel ID. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/overlays/README | 3 +++ arch/arm/boot/dts/overlays/i2c-mux-overlay.dts | 4 ++++ drivers/i2c/i2c-mux.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index c55723aad8f5..e1cf6028a6e0 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -2026,6 +2026,9 @@ Params: pca9542 Select the NXP PCA9542 device addr Change I2C address of the device (default 0x70) + base Set an explicit base value for the channel bus + numbers + i2c0 Choose the I2C0 bus on GPIOs 0&1 i2c_csi_dsi Choose the I2C0 bus on GPIOs 44&45 diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts index 84f7cfd67199..0575b276cd26 100644 --- a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts @@ -159,6 +159,10 @@ __overrides__ { <&pca9545>,"reg:0", <&pca9548>,"reg:0"; + base = <&pca9542>,"base-nr:0", + <&pca9545>,"base-nr:0", + <&pca9548>,"base-nr:0"; + i2c0 = <&frag100>, "target:0=",<&i2c0>, <0>,"+101+102"; i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>, diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index fb39278760d6..83d7d5c23368 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -360,7 +360,7 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, of_property_read_u32(dev_node, "base-nr", &base_nr); if (!force_nr) - force_nr = base_nr; + force_nr = base_nr + chan_id; if (muxc->arbitrator) mux_node = of_get_child_by_name(dev_node, "i2c-arb"); -- 2.44.0