[PATCH 0/2] Enable remaining I2C busses on sm7225-fairphone-fp4

[PATCH 0/2] Enable remaining I2C busses on sm7225-fairphone-fp4

[Luca Weiss]

The first patch consolidate the two different styles where the status
property is placed in the dts, and the second patch enables all the I2C
busses used on the phone even if no subnode is added yet.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
Luca Weiss (2):
      arm64: dts: qcom: sm7225-fairphone-fp4: move status property down
      arm64: dts: qcom: sm7225-fairphone-fp4: enable remaining i2c busses

 arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 59 ++++++++++++++++-------
 1 file changed, 42 insertions(+), 17 deletions(-)
---
base-commit: 09e41676e35ab06e4bce8870ea3bf1f191c3cb90
change-id: 20230213-fp4-more-i2c-f90ccce84e46

Best regards,
-- 
Luca Weiss <luca.weiss@fairphone.com>

[PATCH 1/2] arm64: dts: qcom: sm7225-fairphone-fp4: move status property down

[Luca Weiss]

Currently the dts contains a mix of status-as-first-property (old qcom
style) and status-as-last-property (new style).

Move all status properties down to the bottom once and for all so that
the style is consistent between different nodes.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
 arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index f7602e93121a..86114dd2c0c4 100644
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -110,8 +110,8 @@ active-config0 {
 };
 
 &adsp {
-	status = "okay";
 	firmware-name = "qcom/sm7225/fairphone4/adsp.mdt";
+	status = "okay";
 };
 
 &apps_rsc {
@@ -355,13 +355,13 @@ &cci1_i2c0 {
 };
 
 &cdsp {
-	status = "okay";
 	firmware-name = "qcom/sm7225/fairphone4/cdsp.mdt";
+	status = "okay";
 };
 
 &i2c10 {
-	status = "okay";
 	clock-frequency = <400000>;
+	status = "okay";
 
 	haptics@5a {
 		compatible = "awinic,aw8695";
@@ -396,8 +396,8 @@ &ipa {
 };
 
 &mpss {
-	status = "okay";
 	firmware-name = "qcom/sm7225/fairphone4/modem.mdt";
+	status = "okay";
 };
 
 &pm6150l_flash {
@@ -423,11 +423,11 @@ led-1 {
 };
 
 &pm6150l_wled {
-	status = "okay";
-
 	qcom,switching-freq = <800>;
 	qcom,current-limit-microamp = <20000>;
 	qcom,num-strings = <2>;
+
+	status = "okay";
 };
 
 &pm6350_gpios {
@@ -441,8 +441,8 @@ gpio_keys_pin: gpio-keys-state {
 };
 
 &pm6350_resin {
-	status = "okay";
 	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
 };
 
 &pm7250b_adc {
@@ -535,21 +535,21 @@ &uart9 {
 };
 
 &ufs_mem_hc {
-	status = "okay";
-
 	reset-gpios = <&tlmm 156 GPIO_ACTIVE_LOW>;
 
 	vcc-supply = <&vreg_l7e>;
 	vcc-max-microamp = <800000>;
 	vccq2-supply = <&vreg_l12a>;
 	vccq2-max-microamp = <800000>;
+
+	status = "okay";
 };
 
 &ufs_mem_phy {
-	status = "okay";
-
 	vdda-phy-supply = <&vreg_l18a>;
 	vdda-pll-supply = <&vreg_l22a>;
+
+	status = "okay";
 };
 
 &usb_1 {
@@ -562,26 +562,26 @@ &usb_1_dwc3 {
 };
 
 &usb_1_hsphy {
-	status = "okay";
-
 	vdd-supply = <&vreg_l18a>;
 	vdda-pll-supply = <&vreg_l2a>;
 	vdda-phy-dpdm-supply = <&vreg_l3a>;
+
+	status = "okay";
 };
 
 &usb_1_qmpphy {
-	status = "okay";
-
 	vdda-phy-supply = <&vreg_l22a>;
 	vdda-pll-supply = <&vreg_l16a>;
+
+	status = "okay";
 };
 
 &wifi {
-	status = "okay";
-
 	vdd-0.8-cx-mx-supply = <&vreg_l4a>;
 	vdd-1.8-xo-supply = <&vreg_l7a>;
 	vdd-1.3-rfa-supply = <&vreg_l2e>;
 	vdd-3.3-ch0-supply = <&vreg_l10e>;
 	vdd-3.3-ch1-supply = <&vreg_l11e>;
+
+	status = "okay";
 };

-- 
2.39.1

[PATCH 2/2] arm64: dts: qcom: sm7225-fairphone-fp4: enable remaining i2c busses

[Luca Weiss]

Enable all i2c busses where something is connected on this phone. Add
comments as placeholders for which components are still missing.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
 arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index 86114dd2c0c4..d0f08b42592f 100644
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -359,10 +359,31 @@ &cdsp {
 	status = "okay";
 };
 
+&i2c0 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	/* ST21NFCD NFC @ 8 */
+	/* VL53L3 ToF @ 29 */
+	/* AW88264A amplifier @ 34 */
+	/* AW88264A amplifier @ 35 */
+};
+
+&i2c8 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	/* HX83112A touchscreen @ 48 */
+};
+
 &i2c10 {
 	clock-frequency = <400000>;
 	status = "okay";
 
+	/* PM8008 PMIC @ 8 and 9 */
+	/* PX8618 @ 26 */
+	/* SMB1395 PMIC @ 34 */
+
 	haptics@5a {
 		compatible = "awinic,aw8695";
 		reg = <0x5a>;
@@ -495,6 +516,10 @@ adc-chan@644 {
 	};
 };
 
+&qupv3_id_0 {
+	status = "okay";
+};
+
 &qupv3_id_1 {
 	status = "okay";
 };

-- 
2.39.1

Re: [PATCH 1/2] arm64: dts: qcom: sm7225-fairphone-fp4: move status property down

[Konrad Dybcio]

On 13.02.2023 14:26, Luca Weiss wrote:
> Currently the dts contains a mix of status-as-first-property (old qcom
> style) and status-as-last-property (new style).
> 
> Move all status properties down to the bottom once and for all so that
> the style is consistent between different nodes.
> 
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 34 +++++++++++------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> index f7602e93121a..86114dd2c0c4 100644
> --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> @@ -110,8 +110,8 @@ active-config0 {
>  };
>  
>  &adsp {
> -	status = "okay";
>  	firmware-name = "qcom/sm7225/fairphone4/adsp.mdt";
> +	status = "okay";
>  };
>  
>  &apps_rsc {
> @@ -355,13 +355,13 @@ &cci1_i2c0 {
>  };
>  
>  &cdsp {
> -	status = "okay";
>  	firmware-name = "qcom/sm7225/fairphone4/cdsp.mdt";
> +	status = "okay";
>  };
>  
>  &i2c10 {
> -	status = "okay";
>  	clock-frequency = <400000>;
> +	status = "okay";
>  
>  	haptics@5a {
>  		compatible = "awinic,aw8695";
> @@ -396,8 +396,8 @@ &ipa {
>  };
>  
>  &mpss {
> -	status = "okay";
>  	firmware-name = "qcom/sm7225/fairphone4/modem.mdt";
> +	status = "okay";
>  };
>  
>  &pm6150l_flash {
> @@ -423,11 +423,11 @@ led-1 {
>  };
>  
>  &pm6150l_wled {
> -	status = "okay";
> -
>  	qcom,switching-freq = <800>;
>  	qcom,current-limit-microamp = <20000>;
>  	qcom,num-strings = <2>;
> +
> +	status = "okay";
>  };
>  
>  &pm6350_gpios {
> @@ -441,8 +441,8 @@ gpio_keys_pin: gpio-keys-state {
>  };
>  
>  &pm6350_resin {
> -	status = "okay";
>  	linux,code = <KEY_VOLUMEDOWN>;
> +	status = "okay";
>  };
>  
>  &pm7250b_adc {
> @@ -535,21 +535,21 @@ &uart9 {
>  };
>  
>  &ufs_mem_hc {
> -	status = "okay";
> -
>  	reset-gpios = <&tlmm 156 GPIO_ACTIVE_LOW>;
>  
>  	vcc-supply = <&vreg_l7e>;
>  	vcc-max-microamp = <800000>;
>  	vccq2-supply = <&vreg_l12a>;
>  	vccq2-max-microamp = <800000>;
> +
> +	status = "okay";
>  };
>  
>  &ufs_mem_phy {
> -	status = "okay";
> -
>  	vdda-phy-supply = <&vreg_l18a>;
>  	vdda-pll-supply = <&vreg_l22a>;
> +
> +	status = "okay";
>  };
>  
>  &usb_1 {
> @@ -562,26 +562,26 @@ &usb_1_dwc3 {
>  };
>  
>  &usb_1_hsphy {
> -	status = "okay";
> -
>  	vdd-supply = <&vreg_l18a>;
>  	vdda-pll-supply = <&vreg_l2a>;
>  	vdda-phy-dpdm-supply = <&vreg_l3a>;
> +
> +	status = "okay";
>  };
>  
>  &usb_1_qmpphy {
> -	status = "okay";
> -
>  	vdda-phy-supply = <&vreg_l22a>;
>  	vdda-pll-supply = <&vreg_l16a>;
> +
> +	status = "okay";
>  };
>  
>  &wifi {
> -	status = "okay";
> -
>  	vdd-0.8-cx-mx-supply = <&vreg_l4a>;
>  	vdd-1.8-xo-supply = <&vreg_l7a>;
>  	vdd-1.3-rfa-supply = <&vreg_l2e>;
>  	vdd-3.3-ch0-supply = <&vreg_l10e>;
>  	vdd-3.3-ch1-supply = <&vreg_l11e>;
> +
> +	status = "okay";
>  };
> 

Re: [PATCH 2/2] arm64: dts: qcom: sm7225-fairphone-fp4: enable remaining i2c busses

[Konrad Dybcio]

On 13.02.2023 14:26, Luca Weiss wrote:
> Enable all i2c busses where something is connected on this phone. Add
> comments as placeholders for which components are still missing.
> 
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Any reason you've not enabled GPI DMA yet?

Konrad
>  arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 25 +++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> index 86114dd2c0c4..d0f08b42592f 100644
> --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> @@ -359,10 +359,31 @@ &cdsp {
>  	status = "okay";
>  };
>  
> +&i2c0 {
> +	clock-frequency = <400000>;
> +	status = "okay";
> +
> +	/* ST21NFCD NFC @ 8 */
> +	/* VL53L3 ToF @ 29 */
> +	/* AW88264A amplifier @ 34 */
> +	/* AW88264A amplifier @ 35 */
> +};
> +
> +&i2c8 {
> +	clock-frequency = <400000>;
> +	status = "okay";
> +
> +	/* HX83112A touchscreen @ 48 */
> +};
> +
>  &i2c10 {
>  	clock-frequency = <400000>;
>  	status = "okay";
>  
> +	/* PM8008 PMIC @ 8 and 9 */
> +	/* PX8618 @ 26 */
> +	/* SMB1395 PMIC @ 34 */
> +
>  	haptics@5a {
>  		compatible = "awinic,aw8695";
>  		reg = <0x5a>;
> @@ -495,6 +516,10 @@ adc-chan@644 {
>  	};
>  };
>  
> +&qupv3_id_0 {
> +	status = "okay";
> +};
> +
>  &qupv3_id_1 {
>  	status = "okay";
>  };
> 

Re: [PATCH 2/2] arm64: dts: qcom: sm7225-fairphone-fp4: enable remaining i2c busses

[Luca Weiss]

On Mon Feb 13, 2023 at 3:40 PM CET, Konrad Dybcio wrote:
>
>
> On 13.02.2023 14:26, Luca Weiss wrote:
> > Enable all i2c busses where something is connected on this phone. Add
> > comments as placeholders for which components are still missing.
> > 
> > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> > ---
> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>
> Any reason you've not enabled GPI DMA yet?

Good call, I enabled it in a different commit that isn't meant for
upstream, thought it was already enabled in mainline.

Will send a v2 with this added:

+&gpi_dma0 {
+	status = "okay";
+};
+
+&gpi_dma1 {
+	status = "okay";
+};

>
> Konrad
> >  arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 25 +++++++++++++++++++++++
> >  1 file changed, 25 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> > index 86114dd2c0c4..d0f08b42592f 100644
> > --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> > +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
> > @@ -359,10 +359,31 @@ &cdsp {
> >  	status = "okay";
> >  };
> >  
> > +&i2c0 {
> > +	clock-frequency = <400000>;
> > +	status = "okay";
> > +
> > +	/* ST21NFCD NFC @ 8 */
> > +	/* VL53L3 ToF @ 29 */
> > +	/* AW88264A amplifier @ 34 */
> > +	/* AW88264A amplifier @ 35 */
> > +};
> > +
> > +&i2c8 {
> > +	clock-frequency = <400000>;
> > +	status = "okay";
> > +
> > +	/* HX83112A touchscreen @ 48 */
> > +};
> > +
> >  &i2c10 {
> >  	clock-frequency = <400000>;
> >  	status = "okay";
> >  
> > +	/* PM8008 PMIC @ 8 and 9 */
> > +	/* PX8618 @ 26 */
> > +	/* SMB1395 PMIC @ 34 */
> > +
> >  	haptics@5a {
> >  		compatible = "awinic,aw8695";
> >  		reg = <0x5a>;
> > @@ -495,6 +516,10 @@ adc-chan@644 {
> >  	};
> >  };
> >  
> > +&qupv3_id_0 {
> > +	status = "okay";
> > +};
> > +
> >  &qupv3_id_1 {
> >  	status = "okay";
> >  };
> >