Skip to content

Commit 9254773

Browse files
committed
Merge tag 'dt64-cleanup-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements in ARM64 DTS for v6.14 1. Spreadtrum: - Correct few issues pointed out by DT schema around properties and node names. - Move fuel-gauge from DTSI to DTS, because it belongs to the board. - Use undeprecated properties, like battery-detect-gpios, already supported by Linux. 2. Uniphier: Use un-deprecated hp-det-gpios (no ABI impact expected). * tag 'dt64-cleanup-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: arm64: dts: sprd: Fix battery-detect-gpios property arm64: dts: uniphier: Switch to hp-det-gpios arm64: dts: sprd: sc9863a: reorder clocks, clock-names per bindings arm64: dts: sprd: sc9863a: fix in-ports property arm64: dts: sprd: sc2731: move fuel-gauge monitored-battery to device DTS arm64: dts: sprd: sp9860g-1h10: fix factory-internal-resistance-micro-ohms property arm64: dts: sprd: sp9860g-1h10: fix constant-charge-voltage-max-microvolt property Link: https://lore.kernel.org/r/20241231132847.135814-1-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 73a2e82 + e1daed0 commit 9254773

5 files changed

Lines changed: 19 additions & 14 deletions

File tree

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
&i2s_port4
6262
&spdif_port0
6363
&comp_spdif_port0>;
64-
hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
64+
hp-det-gpios = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
6565
};
6666

6767
spdif-out {

arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
&i2s_port4
6262
&spdif_port0
6363
&comp_spdif_port0>;
64-
hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
64+
hp-det-gpios = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
6565
};
6666

6767
spdif-out {

arch/arm64/boot/dts/sprd/sc2731.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@
9494
nvmem-cells = <&adc_big_scale>, <&adc_small_scale>;
9595
};
9696

97-
fuel-gauge@a00 {
97+
pmic_fgu: fuel-gauge@a00 {
9898
compatible = "sprd,sc2731-fgu";
9999
reg = <0xa00>;
100-
bat-detect-gpio = <&pmic_eic 9 GPIO_ACTIVE_HIGH>;
100+
battery-detect-gpios = <&pmic_eic 9 GPIO_ACTIVE_HIGH>;
101101
io-channels = <&pmic_adc 3>, <&pmic_adc 6>;
102102
io-channel-names = "bat-temp", "charge-vol";
103-
monitored-battery = <&bat>;
104103
nvmem-cell-names = "fgu_calib";
105104
nvmem-cells = <&fgu_calib>;
106105
interrupt-parent = <&sc2731_pmic>;
107106
interrupts = <4>;
107+
status = "disabled";
108108
};
109109

110110
vibrator@ec8 {

arch/arm64/boot/dts/sprd/sc9863a.dtsi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,18 +163,18 @@
163163
ap_clk: clock-controller@21500000 {
164164
compatible = "sprd,sc9863a-ap-clk";
165165
reg = <0 0x21500000 0 0x1000>;
166-
clocks = <&ext_32k>, <&ext_26m>;
167-
clock-names = "ext-32k", "ext-26m";
166+
clocks = <&ext_26m>, <&ext_32k>;
167+
clock-names = "ext-26m", "ext-32k";
168168
#clock-cells = <1>;
169169
};
170170

171171
aon_clk: clock-controller@402d0000 {
172172
compatible = "sprd,sc9863a-aon-clk";
173173
reg = <0 0x402d0000 0 0x1000>;
174-
clocks = <&ext_26m>, <&rco_100m>,
175-
<&ext_32k>, <&ext_4m>;
176-
clock-names = "ext-26m", "rco-100m",
177-
"ext-32k", "ext-4m";
174+
clocks = <&ext_26m>, <&ext_32k>,
175+
<&ext_4m>, <&rco_100m>;
176+
clock-names = "ext-26m", "ext-32k",
177+
"ext-4m", "rco-100m";
178178
#clock-cells = <1>;
179179
};
180180

@@ -288,7 +288,7 @@
288288
};
289289
};
290290

291-
in-port {
291+
in-ports {
292292
port {
293293
etf_little_in: endpoint {
294294
remote-endpoint =

arch/arm64/boot/dts/sprd/sp9860g-1h10.dts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
compatible = "simple-battery";
7272
charge-full-design-microamp-hours = <1900000>;
7373
charge-term-current-microamp = <120000>;
74-
constant_charge_voltage_max_microvolt = <4350000>;
75-
internal-resistance-micro-ohms = <250000>;
74+
constant-charge-voltage-max-microvolt = <4350000>;
75+
factory-internal-resistance-micro-ohms = <250000>;
7676
ocv-capacity-celsius = <20>;
7777
ocv-capacity-table-0 = <4185000 100>, <4113000 95>, <4066000 90>,
7878
<4022000 85>, <3983000 80>, <3949000 75>,
@@ -84,6 +84,11 @@
8484
};
8585
};
8686

87+
&pmic_fgu {
88+
monitored-battery = <&bat>;
89+
status = "okay";
90+
};
91+
8792
&uart0 {
8893
status = "okay";
8994
};

0 commit comments

Comments
 (0)