[PATCH 0/3] KX022-1020 accel support + inertial sensors on msm8226-microsoft

[PATCH 0/3] KX022-1020 accel support + inertial sensors on msm8226-microsoft

[Rayyan Ansari]

Hi,
The following patches:
- Add support for the Kionix KX022-1020 accelerometer
- Add the KX022-1020 accelerometer and AK09911 magnetometer to msm8x26
  Lumia devices

Thanks,
Rayyan

Rayyan Ansari (3):
  dt-bindings: iio: kionix,kxcjk1013: Document KX022-1020
  iio: accel: kxcjk-1013: Add support for KX022-1020
  ARM: dts: qcom: msm8226-microsoft-common: Add inertial sensors

 .../bindings/iio/accel/kionix,kxcjk1013.yaml  |  1 +
 .../qcom/qcom-msm8226-microsoft-common.dtsi   | 26 +++++++++++++++++++
 .../qcom-msm8226-microsoft-moneypenny.dts     |  3 +++
 .../dts/qcom/qcom-msm8926-microsoft-tesla.dts |  3 +++
 drivers/iio/accel/kxcjk-1013.c                |  8 ++++--
 5 files changed, 39 insertions(+), 2 deletions(-)

-- 
2.45.2

[PATCH 1/3] dt-bindings: iio: kionix,kxcjk1013: Document KX022-1020

[Rayyan Ansari]

Document the KX022-1020 accelerometer, which has the same register
layout as the KX023-1025 and so can use the same driver.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 .../devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml b/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml
index 6ddb03f61bd9..951a3a2ba8fc 100644
--- a/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml
+++ b/Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml
@@ -16,6 +16,7 @@ properties:
       - kionix,kxcj91008
       - kionix,kxtj21009
       - kionix,kxtf9
+      - kionix,kx022-1020
       - kionix,kx023-1025
 
   reg:
-- 
2.45.2

Re: [PATCH 1/3] dt-bindings: iio: kionix,kxcjk1013: Document KX022-1020

[Krzysztof Kozlowski]

On 14/07/2024 19:33, Rayyan Ansari wrote:
> Document the KX022-1020 accelerometer, which has the same register
> layout as the KX023-1025 and so can use the same driver.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 2/3] iio: accel: kxcjk-1013: Add support for KX022-1020

[Rayyan Ansari]

Add compatible for the KX022-1020 accelerometer [1] using the
KX022-1023 [2] register map as both have an identical i2c interface.

[1]: https://kionixfs.azureedge.net/en/datasheet/KX022-1020%20Specifications%20Rev%2012.0.pdf
[2]: https://kionixfs.azureedge.net/en/datasheet/KX023-1025%20Specifications%20Rev%2012.0.pdf

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 drivers/iio/accel/kxcjk-1013.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 8280d2bef0a3..b76df8816323 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -173,6 +173,7 @@ enum kx_chipset {
 	KXCJ91008,
 	KXTJ21009,
 	KXTF9,
+	KX0221020,
 	KX0231025,
 	KX_MAX_CHIPS /* this must be last */
 };
@@ -580,8 +581,8 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
 		return ret;
 	}
 
-	/* On KX023, route all used interrupts to INT1 for now */
-	if (data->chipset == KX0231025 && data->client->irq > 0) {
+	/* On KX023 and KX022, route all used interrupts to INT1 for now */
+	if ((data->chipset == KX0231025 || data->chipset == KX0221020) && data->client->irq > 0) {
 		ret = i2c_smbus_write_byte_data(data->client, KX023_REG_INC4,
 						KX023_REG_INC4_DRDY1 |
 						KX023_REG_INC4_WUFI1);
@@ -1507,6 +1508,7 @@ static int kxcjk1013_probe(struct i2c_client *client)
 	case KXTF9:
 		data->regs = &kxtf9_regs;
 		break;
+	case KX0221020:
 	case KX0231025:
 		data->regs = &kx0231025_regs;
 		break;
@@ -1712,6 +1714,7 @@ static const struct i2c_device_id kxcjk1013_id[] = {
 	{"kxcj91008", KXCJ91008},
 	{"kxtj21009", KXTJ21009},
 	{"kxtf9",     KXTF9},
+	{"kx022-1020", KX0221020},
 	{"kx023-1025", KX0231025},
 	{"SMO8500",   KXCJ91008},
 	{}
@@ -1724,6 +1727,7 @@ static const struct of_device_id kxcjk1013_of_match[] = {
 	{ .compatible = "kionix,kxcj91008", },
 	{ .compatible = "kionix,kxtj21009", },
 	{ .compatible = "kionix,kxtf9", },
+	{ .compatible = "kionix,kx022-1020", },
 	{ .compatible = "kionix,kx023-1025", },
 	{ }
 };
-- 
2.45.2

Re: [PATCH 2/3] iio: accel: kxcjk-1013: Add support for KX022-1020

[Hans de Goede]

Hi,

On 7/14/24 7:33 PM, Rayyan Ansari wrote:
> Add compatible for the KX022-1020 accelerometer [1] using the
> KX022-1023 [2] register map as both have an identical i2c interface.
> 
> [1]: https://kionixfs.azureedge.net/en/datasheet/KX022-1020%20Specifications%20Rev%2012.0.pdf
> [2]: https://kionixfs.azureedge.net/en/datasheet/KX023-1025%20Specifications%20Rev%2012.0.pdf
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>  drivers/iio/accel/kxcjk-1013.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index 8280d2bef0a3..b76df8816323 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -173,6 +173,7 @@ enum kx_chipset {
>  	KXCJ91008,
>  	KXTJ21009,
>  	KXTF9,
> +	KX0221020,
>  	KX0231025,
>  	KX_MAX_CHIPS /* this must be last */
>  };
> @@ -580,8 +581,8 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data)
>  		return ret;
>  	}
>  
> -	/* On KX023, route all used interrupts to INT1 for now */
> -	if (data->chipset == KX0231025 && data->client->irq > 0) {
> +	/* On KX023 and KX022, route all used interrupts to INT1 for now */
> +	if ((data->chipset == KX0231025 || data->chipset == KX0221020) && data->client->irq > 0) {
>  		ret = i2c_smbus_write_byte_data(data->client, KX023_REG_INC4,
>  						KX023_REG_INC4_DRDY1 |
>  						KX023_REG_INC4_WUFI1);
> @@ -1507,6 +1508,7 @@ static int kxcjk1013_probe(struct i2c_client *client)
>  	case KXTF9:
>  		data->regs = &kxtf9_regs;
>  		break;
> +	case KX0221020:
>  	case KX0231025:
>  		data->regs = &kx0231025_regs;
>  		break;
> @@ -1712,6 +1714,7 @@ static const struct i2c_device_id kxcjk1013_id[] = {
>  	{"kxcj91008", KXCJ91008},
>  	{"kxtj21009", KXTJ21009},
>  	{"kxtf9",     KXTF9},
> +	{"kx022-1020", KX0221020},
>  	{"kx023-1025", KX0231025},
>  	{"SMO8500",   KXCJ91008},
>  	{}
> @@ -1724,6 +1727,7 @@ static const struct of_device_id kxcjk1013_of_match[] = {
>  	{ .compatible = "kionix,kxcj91008", },
>  	{ .compatible = "kionix,kxtj21009", },
>  	{ .compatible = "kionix,kxtf9", },
> +	{ .compatible = "kionix,kx022-1020", },
>  	{ .compatible = "kionix,kx023-1025", },
>  	{ }
>  };

Re: [PATCH 2/3] iio: accel: kxcjk-1013: Add support for KX022-1020

[Andy Shevchenko]

On Mon, Jul 15, 2024 at 10:30:46AM +0200, Hans de Goede wrote:
> On 7/14/24 7:33 PM, Rayyan Ansari wrote:
> > Add compatible for the KX022-1020 accelerometer [1] using the
> > KX022-1023 [2] register map as both have an identical i2c interface.
> > 
> > [1]: https://kionixfs.azureedge.net/en/datasheet/KX022-1020%20Specifications%20Rev%2012.0.pdf
> > [2]: https://kionixfs.azureedge.net/en/datasheet/KX023-1025%20Specifications%20Rev%2012.0.pdf
> > 
> > Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> 
> Thanks, patch looks good to me:
> 
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Note, this patch broke kx231025 case...

> >  	KXCJ91008,
> >  	KXTJ21009,
> >  	KXTF9,
> > +	KX0221020,
> >  	KX0231025,
> >  	KX_MAX_CHIPS /* this must be last */
> >  };

...because this enum is used of ODR startup timeout settings which
are all moved now to be 0 and new ID inherited the timeouts from
the KX0231025 case.

Since I have been looking into the driver, and I have a few patches
coming, I propose to do the following (as it's still ODR data being
missed) to:
1) revert this one;
2) apply my set;
3) re-apply this with the fixed data.

Another approach can be done (but probably not by me) is to move the ID
to the proper location, add ODR startup timeouts or explain why it's not
needed and then apply my patch.

But, taking into account that we are almost at -rc5 and I want my stuff
not to be postponed, I tend to follow the first approach.

Opinions, comments?

P.S. FWIW, my set will include switching this driver to use chip_info
structure so the similar mistakes won't happen again, that's also why
I prefer the first approach I listed above.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 2/3] iio: accel: kxcjk-1013: Add support for KX022-1020

[Jonathan Cameron]

On Thu, 24 Oct 2024 17:28:14 +0300
Andy Shevchenko <andy.shevchenko@gmail.com> wrote:

> On Mon, Jul 15, 2024 at 10:30:46AM +0200, Hans de Goede wrote:
> > On 7/14/24 7:33 PM, Rayyan Ansari wrote:  
> > > Add compatible for the KX022-1020 accelerometer [1] using the
> > > KX022-1023 [2] register map as both have an identical i2c interface.
> > > 
> > > [1]: https://kionixfs.azureedge.net/en/datasheet/KX022-1020%20Specifications%20Rev%2012.0.pdf
> > > [2]: https://kionixfs.azureedge.net/en/datasheet/KX023-1025%20Specifications%20Rev%2012.0.pdf
> > > 
> > > Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>  
> > 
> > Thanks, patch looks good to me:
> > 
> > Reviewed-by: Hans de Goede <hdegoede@redhat.com>  
> 
> Note, this patch broke kx231025 case...
> 
> > >  	KXCJ91008,
> > >  	KXTJ21009,
> > >  	KXTF9,
> > > +	KX0221020,
> > >  	KX0231025,
> > >  	KX_MAX_CHIPS /* this must be last */
> > >  };  
> 
> ...because this enum is used of ODR startup timeout settings which
> are all moved now to be 0 and new ID inherited the timeouts from
> the KX0231025 case.
> 
> Since I have been looking into the driver, and I have a few patches
> coming, I propose to do the following (as it's still ODR data being
> missed) to:
> 1) revert this one
> 2) apply my set;
> 3) re-apply this with the fixed data.

> 
> Another approach can be done (but probably not by me) is to move the ID
> to the proper location, add ODR startup timeouts or explain why it's not
> needed and then apply my patch.
> 
> But, taking into account that we are almost at -rc5 and I want my stuff
> not to be postponed, I tend to follow the first approach.
> 
> Opinions, comments?
> 
> P.S. FWIW, my set will include switching this driver to use chip_info
> structure so the similar mistakes won't happen again, that's also why
> I prefer the first approach I listed above.
> 

Hmm. Either I want the revert in before the release, or your series
to make the merge window (and hence probably hit in first couple of stable
releases).

Ideal would be revert very soon and chase it in to togreg so your series
can go on top, but that would rely on some lucky timing of pull requests
and merges that is probably too optimistic.

Jonathan

Re: [PATCH 2/3] iio: accel: kxcjk-1013: Add support for KX022-1020

[Andy Shevchenko]

On Thu, Oct 24, 2024 at 7:34 PM Jonathan Cameron
<Jonathan.Cameron@huawei.com> wrote:
> On Thu, 24 Oct 2024 17:28:14 +0300
> Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
> > On Mon, Jul 15, 2024 at 10:30:46AM +0200, Hans de Goede wrote:
> > > On 7/14/24 7:33 PM, Rayyan Ansari wrote:
> > > > Add compatible for the KX022-1020 accelerometer [1] using the
> > > > KX022-1023 [2] register map as both have an identical i2c interface.
> > > >
> > > > [1]: https://kionixfs.azureedge.net/en/datasheet/KX022-1020%20Specifications%20Rev%2012.0.pdf
> > > > [2]: https://kionixfs.azureedge.net/en/datasheet/KX023-1025%20Specifications%20Rev%2012.0.pdf
> > > >
> > > > Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> > >
> > > Thanks, patch looks good to me:
> > >
> > > Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Note, this patch broke kx231025 case...
> >
> > > >   KXCJ91008,
> > > >   KXTJ21009,
> > > >   KXTF9,
> > > > + KX0221020,
> > > >   KX0231025,
> > > >   KX_MAX_CHIPS /* this must be last */
> > > >  };
> >
> > ...because this enum is used of ODR startup timeout settings which
> > are all moved now to be 0 and new ID inherited the timeouts from
> > the KX0231025 case.
> >
> > Since I have been looking into the driver, and I have a few patches
> > coming, I propose to do the following (as it's still ODR data being
> > missed) to:
> > 1) revert this one
> > 2) apply my set;
> > 3) re-apply this with the fixed data.
>
> > Another approach can be done (but probably not by me) is to move the ID
> > to the proper location, add ODR startup timeouts or explain why it's not
> > needed and then apply my patch.
> >
> > But, taking into account that we are almost at -rc5 and I want my stuff
> > not to be postponed, I tend to follow the first approach.
> >
> > Opinions, comments?
> >
> > P.S. FWIW, my set will include switching this driver to use chip_info
> > structure so the similar mistakes won't happen again, that's also why
> > I prefer the first approach I listed above.
>
> Hmm. Either I want the revert in before the release, or your series
> to make the merge window (and hence probably hit in first couple of stable
> releases).

I have sent the v3 (out of 24 patches) that includes revert and a fix
in the I2C ID table. Those two can be backported.

> Ideal would be revert very soon and chase it in to togreg so your series
> can go on top, but that would rely on some lucky timing of pull requests
> and merges that is probably too optimistic.

Up to you how to proceed, the patches are available in the mailing list :-)

-- 
With Best Regards,
Andy Shevchenko

[PATCH 3/3] ARM: dts: qcom: msm8226-microsoft-common: Add inertial sensors

[Rayyan Ansari]

Add nodes for the Asahi Kasei AK09911 magnetometer and the Kionix
KX022-1020 accelerometer, both of which are connected over i2c2, in the
common device tree for msm8x26 Lumias.

Moneypenny (Lumia 630) does not have a magnetometer, and so the node is
deleted.
Tesla's (Lumia 830's) magnetometer is currently unknown.

Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
---
 .../qcom/qcom-msm8226-microsoft-common.dtsi   | 26 +++++++++++++++++++
 .../qcom-msm8226-microsoft-moneypenny.dts     |  3 +++
 .../dts/qcom/qcom-msm8926-microsoft-tesla.dts |  3 +++
 3 files changed, 32 insertions(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
index 8839b23fc693..ca76bf8af75e 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
@@ -84,6 +84,32 @@ smem_region: smem@fa00000 {
 	};
 };
 
+&blsp1_i2c2 {
+	status = "okay";
+
+	magnetometer: magnetometer@c {
+		compatible = "asahi-kasei,ak09911";
+		reg = <0x0c>;
+
+		vdd-supply = <&pm8226_l15>;
+		vid-supply = <&pm8226_l6>;
+	};
+
+	accelerometer: accelerometer@1e {
+		compatible = "kionix,kx022-1020";
+		reg = <0x1e>;
+
+		interrupts-extended = <&tlmm 63 IRQ_TYPE_EDGE_RISING>;
+
+		vdd-supply = <&pm8226_l15>;
+		vddio-supply = <&pm8226_l6>;
+
+		mount-matrix = "1",  "0",  "0",
+			       "0", "-1",  "0",
+			       "0",  "0",  "1";
+	};
+};
+
 &blsp1_i2c5 {
 	status = "okay";
 
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
index 992b7115b5f8..a28a83cb5340 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts
@@ -10,6 +10,9 @@
 
 #include "qcom-msm8226-microsoft-common.dtsi"
 
+/* This device has no magnetometer */
+/delete-node/ &magnetometer;
+
 / {
 	model = "Nokia Lumia 630";
 	compatible = "microsoft,moneypenny", "qcom,msm8226";
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
index 53a6d4e85959..55077a5f2e34 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts
@@ -13,6 +13,9 @@
 /* This device has touchscreen on i2c1 instead */
 /delete-node/ &touchscreen;
 
+/* The magnetometer used on this device is currently unknown */
+/delete-node/ &magnetometer;
+
 / {
 	model = "Nokia Lumia 830";
 	compatible = "microsoft,tesla", "qcom,msm8926", "qcom,msm8226";
-- 
2.45.2

Re: [PATCH 3/3] ARM: dts: qcom: msm8226-microsoft-common: Add inertial sensors

[Konrad Dybcio]

On 14.07.2024 7:33 PM, Rayyan Ansari wrote:
> Add nodes for the Asahi Kasei AK09911 magnetometer and the Kionix
> KX022-1020 accelerometer, both of which are connected over i2c2, in the
> common device tree for msm8x26 Lumias.
> 
> Moneypenny (Lumia 630) does not have a magnetometer, and so the node is
> deleted.
> Tesla's (Lumia 830's) magnetometer is currently unknown.
> 
> Signed-off-by: Rayyan Ansari <rayyan@ansari.sh>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad

Re: [PATCH 0/3] KX022-1020 accel support + inertial sensors on msm8226-microsoft

[Jonathan Cameron]

On Sun, 14 Jul 2024 18:33:02 +0100
Rayyan Ansari <rayyan@ansari.sh> wrote:

> Hi,
> The following patches:
> - Add support for the Kionix KX022-1020 accelerometer
> - Add the KX022-1020 accelerometer and AK09911 magnetometer to msm8x26
>   Lumia devices
Applied patches 1 and 2 to the iio.git tree testing branch.
That will be rebased on rc1, once available, and then be pushed out as
togreg which is the branch that linux-next etc pick up.

Thanks,

Jonathan

> 
> Thanks,
> Rayyan
> 
> Rayyan Ansari (3):
>   dt-bindings: iio: kionix,kxcjk1013: Document KX022-1020
>   iio: accel: kxcjk-1013: Add support for KX022-1020
>   ARM: dts: qcom: msm8226-microsoft-common: Add inertial sensors
> 
>  .../bindings/iio/accel/kionix,kxcjk1013.yaml  |  1 +
>  .../qcom/qcom-msm8226-microsoft-common.dtsi   | 26 +++++++++++++++++++
>  .../qcom-msm8226-microsoft-moneypenny.dts     |  3 +++
>  .../dts/qcom/qcom-msm8926-microsoft-tesla.dts |  3 +++
>  drivers/iio/accel/kxcjk-1013.c                |  8 ++++--
>  5 files changed, 39 insertions(+), 2 deletions(-)
> 

Re: (subset) [PATCH 0/3] KX022-1020 accel support + inertial sensors on msm8226-microsoft

[Bjorn Andersson]

On Sun, 14 Jul 2024 18:33:02 +0100, Rayyan Ansari wrote:
> The following patches:
> - Add support for the Kionix KX022-1020 accelerometer
> - Add the KX022-1020 accelerometer and AK09911 magnetometer to msm8x26
>   Lumia devices
> 
> Thanks,
> Rayyan
> 
> [...]

Applied, thanks!

[3/3] ARM: dts: qcom: msm8226-microsoft-common: Add inertial sensors
      commit: 18042ad9dfd01d247407bb0721c6338eb8a9a2ac

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>