| Message ID | 2959aa8567afbef17337829072adce01158f00bb.1730918663.git.stano.jakubek@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanup Spreadtrum/Unisoc ARM64 DT (part 2) | expand |
On 2024/11/7 03:05, Stanislav Jakubek wrote: > The monitored-battery property is a property of the board, not the PMIC. > Move this property to the DTS of its only user, sp9860g-1h10. > While at it, disable the fuel-gauge node by default and enable it only > for its users, as it requires board-specific properties to work correctly. > > Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com> Looks reasonable to me. Thanks. Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> > --- > Changes in V2: > - none > > Note that the 'sprd,calib-resistance-micro-ohms' property isn't specified > as I do not have the board or any other source of information about it. > > If the SPRD folks could chime in here, that'd be great. > > arch/arm64/boot/dts/sprd/sc2731.dtsi | 4 ++-- > arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 5 +++++ > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/sprd/sc2731.dtsi b/arch/arm64/boot/dts/sprd/sc2731.dtsi > index 12136e68dada..2d27427c41a2 100644 > --- a/arch/arm64/boot/dts/sprd/sc2731.dtsi > +++ b/arch/arm64/boot/dts/sprd/sc2731.dtsi > @@ -94,17 +94,17 @@ pmic_adc: adc@480 { > nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; > }; > > - fuel-gauge@a00 { > + pmic_fgu: fuel-gauge@a00 { > compatible = "sprd,sc2731-fgu"; > reg = <0xa00>; > bat-detect-gpio = <&pmic_eic 9 GPIO_ACTIVE_HIGH>; > io-channels = <&pmic_adc 3>, <&pmic_adc 6>; > io-channel-names = "bat-temp", "charge-vol"; > - monitored-battery = <&bat>; > nvmem-cell-names = "fgu_calib"; > nvmem-cells = <&fgu_calib>; > interrupt-parent = <&sc2731_pmic>; > interrupts = <4>; > + status = "disabled"; > }; > > vibrator@ec8 { > diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts > index 94af7700f3e2..b1fa817ece1e 100644 > --- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts > +++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts > @@ -84,6 +84,11 @@ bat: battery { > }; > }; > > +&pmic_fgu { > + monitored-battery = <&bat>; > + status = "okay"; > +}; > + > &uart0 { > status = "okay"; > };
diff --git a/arch/arm64/boot/dts/sprd/sc2731.dtsi b/arch/arm64/boot/dts/sprd/sc2731.dtsi index 12136e68dada..2d27427c41a2 100644 --- a/arch/arm64/boot/dts/sprd/sc2731.dtsi +++ b/arch/arm64/boot/dts/sprd/sc2731.dtsi @@ -94,17 +94,17 @@ pmic_adc: adc@480 { nvmem-cells = <&adc_big_scale>, <&adc_small_scale>; }; - fuel-gauge@a00 { + pmic_fgu: fuel-gauge@a00 { compatible = "sprd,sc2731-fgu"; reg = <0xa00>; bat-detect-gpio = <&pmic_eic 9 GPIO_ACTIVE_HIGH>; io-channels = <&pmic_adc 3>, <&pmic_adc 6>; io-channel-names = "bat-temp", "charge-vol"; - monitored-battery = <&bat>; nvmem-cell-names = "fgu_calib"; nvmem-cells = <&fgu_calib>; interrupt-parent = <&sc2731_pmic>; interrupts = <4>; + status = "disabled"; }; vibrator@ec8 { diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts index 94af7700f3e2..b1fa817ece1e 100644 --- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts @@ -84,6 +84,11 @@ bat: battery { }; }; +&pmic_fgu { + monitored-battery = <&bat>; + status = "okay"; +}; + &uart0 { status = "okay"; };
The monitored-battery property is a property of the board, not the PMIC. Move this property to the DTS of its only user, sp9860g-1h10. While at it, disable the fuel-gauge node by default and enable it only for its users, as it requires board-specific properties to work correctly. Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com> --- Changes in V2: - none Note that the 'sprd,calib-resistance-micro-ohms' property isn't specified as I do not have the board or any other source of information about it. If the SPRD folks could chime in here, that'd be great. arch/arm64/boot/dts/sprd/sc2731.dtsi | 4 ++-- arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)