From 367d31471c3272b87a7e842355b2aa4bc688add8 Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Wed, 6 Nov 2024 20:05:29 +0100 Subject: [PATCH 1/7] arm64: dts: sprd: sp9860g-1h10: fix constant-charge-voltage-max-microvolt property This property has hyphens/dashes, not underscores. Reviewed-by: Baolin Wang Signed-off-by: Stanislav Jakubek Acked-by: Rob Herring Link: https://lore.kernel.org/r/aa557091d9494fdaa3eda75803f9ea97014c8832.1730918663.git.stano.jakubek@gmail.com Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts index 095b24a31313..cd8b1069e387 100644 --- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts @@ -71,7 +71,7 @@ bat: battery { compatible = "simple-battery"; charge-full-design-microamp-hours = <1900000>; charge-term-current-microamp = <120000>; - constant_charge_voltage_max_microvolt = <4350000>; + constant-charge-voltage-max-microvolt = <4350000>; internal-resistance-micro-ohms = <250000>; ocv-capacity-celsius = <20>; ocv-capacity-table-0 = <4185000 100>, <4113000 95>, <4066000 90>, From e864e215ce2197cd5d5c0e9229b4bb83379a5186 Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Wed, 6 Nov 2024 20:05:37 +0100 Subject: [PATCH 2/7] arm64: dts: sprd: sp9860g-1h10: fix factory-internal-resistance-micro-ohms property As per DT bindings, this property was missing the "factory-" prefix. Signed-off-by: Stanislav Jakubek Reviewed-by: Baolin Wang Link: https://lore.kernel.org/r/30d7ad167400764b6fe37f63276c07d3e30d931d.1730918663.git.stano.jakubek@gmail.com Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts index cd8b1069e387..94af7700f3e2 100644 --- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts @@ -72,7 +72,7 @@ bat: battery { charge-full-design-microamp-hours = <1900000>; charge-term-current-microamp = <120000>; constant-charge-voltage-max-microvolt = <4350000>; - internal-resistance-micro-ohms = <250000>; + factory-internal-resistance-micro-ohms = <250000>; ocv-capacity-celsius = <20>; ocv-capacity-table-0 = <4185000 100>, <4113000 95>, <4066000 90>, <4022000 85>, <3983000 80>, <3949000 75>, From ec87fd9f66bb8196ce4c80b6f9a02a8fdb452821 Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Wed, 6 Nov 2024 20:05:45 +0100 Subject: [PATCH 3/7] arm64: dts: sprd: sc2731: move fuel-gauge monitored-battery to device DTS 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 Reviewed-by: Baolin Wang Link: https://lore.kernel.org/r/2959aa8567afbef17337829072adce01158f00bb.1730918663.git.stano.jakubek@gmail.com Signed-off-by: Krzysztof Kozlowski --- 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"; }; From a34907f484949e3a550a54a19d71e8616d812d7e Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Wed, 6 Nov 2024 20:05:52 +0100 Subject: [PATCH 4/7] arm64: dts: sprd: sc9863a: fix in-ports property This property is called "in-ports", not "in-port", fix it. Signed-off-by: Stanislav Jakubek Reviewed-by: Baolin Wang Link: https://lore.kernel.org/r/5318a47282b8c15a3135fd12dacedb8aa70592e2.1730918663.git.stano.jakubek@gmail.com Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/sprd/sc9863a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/sprd/sc9863a.dtsi b/arch/arm64/boot/dts/sprd/sc9863a.dtsi index e5a2857721e2..31172ac44adc 100644 --- a/arch/arm64/boot/dts/sprd/sc9863a.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9863a.dtsi @@ -288,7 +288,7 @@ etf_little_out: endpoint { }; }; - in-port { + in-ports { port { etf_little_in: endpoint { remote-endpoint = From 49f4ad82f031ac390ea4571a5bf7d58ee27ce4f2 Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Wed, 6 Nov 2024 20:05:59 +0100 Subject: [PATCH 5/7] arm64: dts: sprd: sc9863a: reorder clocks, clock-names per bindings DT bindings expect the SC9863A clock-controller clocks/clock-names to be in a specific order, reorder them. Signed-off-by: Stanislav Jakubek Reviewed-by: Baolin Wang Link: https://lore.kernel.org/r/d235438fbbd53c28b63cada2cf7e1234c120355e.1730918663.git.stano.jakubek@gmail.com Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/sprd/sc9863a.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/sprd/sc9863a.dtsi b/arch/arm64/boot/dts/sprd/sc9863a.dtsi index 31172ac44adc..e97000e560e7 100644 --- a/arch/arm64/boot/dts/sprd/sc9863a.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9863a.dtsi @@ -163,18 +163,18 @@ gic: interrupt-controller@14000000 { ap_clk: clock-controller@21500000 { compatible = "sprd,sc9863a-ap-clk"; reg = <0 0x21500000 0 0x1000>; - clocks = <&ext_32k>, <&ext_26m>; - clock-names = "ext-32k", "ext-26m"; + clocks = <&ext_26m>, <&ext_32k>; + clock-names = "ext-26m", "ext-32k"; #clock-cells = <1>; }; aon_clk: clock-controller@402d0000 { compatible = "sprd,sc9863a-aon-clk"; reg = <0 0x402d0000 0 0x1000>; - clocks = <&ext_26m>, <&rco_100m>, - <&ext_32k>, <&ext_4m>; - clock-names = "ext-26m", "rco-100m", - "ext-32k", "ext-4m"; + clocks = <&ext_26m>, <&ext_32k>, + <&ext_4m>, <&rco_100m>; + clock-names = "ext-26m", "ext-32k", + "ext-4m", "rco-100m"; #clock-cells = <1>; }; From 751df73d825b3f7e6cad42ed333c28096635784d Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 27 Sep 2024 14:42:23 +0200 Subject: [PATCH 6/7] arm64: dts: uniphier: Switch to hp-det-gpios Replace the deprecated "hp-det-gpio" property by "hp-det-gpios" in Audio Graph Card device nodes. Signed-off-by: Geert Uytterhoeven Reviewed-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/b14b8512181c2a3b0744698e8a21b4e16451d7b3.1727438777.git.geert+renesas@glider.be Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index a251c4343548..de219570bbc9 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -61,7 +61,7 @@ &i2s_port3 &i2s_port4 &spdif_port0 &comp_spdif_port0>; - hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; + hp-det-gpios = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index 79f6db2455c1..20e5fb724fae 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -61,7 +61,7 @@ &i2s_port3 &i2s_port4 &spdif_port0 &comp_spdif_port0>; - hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; + hp-det-gpios = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>; }; spdif-out { From e1daed030b56049caa2d8cc040c824990374d941 Mon Sep 17 00:00:00 2001 From: Stanislav Jakubek Date: Fri, 6 Dec 2024 09:28:30 +0100 Subject: [PATCH 7/7] arm64: dts: sprd: Fix battery-detect-gpios property According to DT bindings, the property is called 'battery-detect-gpios', not 'bat-detect-gpio'. Update the property as such. Signed-off-by: Stanislav Jakubek Link: https://lore.kernel.org/r/Z1K1rnndKGIFdgfj@standask-GA-A55M-S2HP Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/sprd/sc2731.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/sprd/sc2731.dtsi b/arch/arm64/boot/dts/sprd/sc2731.dtsi index 2d27427c41a2..458685b82462 100644 --- a/arch/arm64/boot/dts/sprd/sc2731.dtsi +++ b/arch/arm64/boot/dts/sprd/sc2731.dtsi @@ -97,7 +97,7 @@ pmic_adc: adc@480 { pmic_fgu: fuel-gauge@a00 { compatible = "sprd,sc2731-fgu"; reg = <0xa00>; - bat-detect-gpio = <&pmic_eic 9 GPIO_ACTIVE_HIGH>; + battery-detect-gpios = <&pmic_eic 9 GPIO_ACTIVE_HIGH>; io-channels = <&pmic_adc 3>, <&pmic_adc 6>; io-channel-names = "bat-temp", "charge-vol"; nvmem-cell-names = "fgu_calib";