github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Minor improvements in ARM64 DTS for v6.14

Browse Source 
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).
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmdz8DcQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1x2OD/wKTRgxeiVafNc2rCXuAMskPYL64SXwzLFi
 x+0hSHCFIuzyVdwDONFL6SlT82umqr2ngMZbY6718di6vnkTV06yrJAQIiMS0H7R
 RM1giaZDhHaz+nySmZ6oPCmFjEApYxVed7RmuCyB4bvKsMf7zjqdLAohS7RIY08W
 djCm4Ffhk7uFywioeGjjt1sdRP4jWputNAhfq4PZ/Q6ByuWs3gNTfDQ7WU7cjaKg
 d/gP/+S6vGWdusXE2QmAADI+XMQ/ke4ktirq1uKE2jUAHYeBpob3DgM22WcQDebk
 8DifY18zKbHx1ugnbw5PkNc0josXbM01x/TaBkSq2MFcM70KW2z63mJmFWiJnitF
 U+jiylb1dR+VeAVgFLOBODlDk43aqTPEUOSbbdpVeA7OKNh8m+kC+U8PuSaZv7yU
 KP6RN0JuGArn7plXbeyZII4KAFLjAX8OdsmpwM5pbgBK5aWporMolqcLXT8vuKBF
 khWXIo06bmqn8jpaTzFOqWAoUuqkkSJE2717R/rJch4MSO6VX2Y/Cz+zMKdriQec
 f+1gOLUwcDz0AyVTNpLTcMZN6e9Ctqnl3iMLavkQeGVQ4PHdOpUFw8UTV8OBpaPx
 qzrbBY2MjuPEu8VdUOAWxloLlUencvyyhO1++X2OUihqZ74fXi0vlZ8WBh4rzaSd
 1EYKq0FoeA==
 =4hXT
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmeI/hcACgkQYKtH/8kJ
 Uic4Ew//V1cj23JElcoQ3lDwqwRlO1NLsfsIDXGohwM9Vl0QkwJZN7B3g5wsthcz
 pBOXiS0M5luiS+o9W44tweJ0R68zkwFP4gGYZsuXH+so1mqx8CVfVF99RtbrLMmB
 aamCwp+9PgmMYLhIVpJ5Gi8q2CZ/wgl9Xx446jpMActptvXaTJPxkGz7cKxlflqa
 71/lnqzEYJ6neXRRUKSU7nntBZTHJCjbQXw1weCCX3FpbVYhsSGpE5l/OQQfkiA6
 w0rsqA3b4aW179I3AawQh/o7Kv6fWCXK51qbBB2qu/70xOe7ud4IRFOJbQgpYRyj
 h+Zgbae9T4F4CulHu/BtbNBWex3T250Dx/jhQy7Ic+TD0BHgDaDSYEe6/zOpy0vp
 cSmOVR5//oROVHvPHosc7pz6h99IcgcyC2HzUEIVehZ//73Xc1eC21snn/FzyP80
 N47sqwLmJBg3T1szB2iZ+qJJ5Q+nIOoICprQF7CzvpvJ5DBaclrWzhlBni/rhD0Y
 XgMeWzBoCVWynv3PGbBxXYmeOhjYhJbV7b0YnAPtFWwVPS/dSVP8qmlLDkAq0htO
 SglUgeZw3At7bSwkNOBqA+qC+smOQ+QVa960yyn3yld5sOYxvUAmls0eKmnsRRT1
 kNcGrEffEIt1PMRmZ0iUANrrcaish6Bk4PTUk84Ink0BO9tLHew=
 =Q7BZ
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2025-01-16 13:39:42 +01:00
commit 925477396d
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
View File

@ -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 {

2
arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
View File

@ -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 {

6
arch/arm64/boot/dts/sprd/sc2731.dtsi
View File

@ -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>;
battery-detect-gpios = <&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 {

14
arch/arm64/boot/dts/sprd/sc9863a.dtsi
View File

@ -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>;
};
@ -288,7 +288,7 @@ etf_little_out: endpoint {
};
};
in-port {
in-ports {
port {
etf_little_in: endpoint {
remote-endpoint =

9
arch/arm64/boot/dts/sprd/sp9860g-1h10.dts
View File

@ -71,8 +71,8 @@ bat: battery {
compatible = "simple-battery";
charge-full-design-microamp-hours = <1900000>;
charge-term-current-microamp = <120000>;
constant_charge_voltage_max_microvolt = <4350000>;
internal-resistance-micro-ohms = <250000>;
constant-charge-voltage-max-microvolt = <4350000>;
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>,
@ -84,6 +84,11 @@ bat: battery {
};
};
&pmic_fgu {
monitored-battery = <&bat>;
status = "okay";
};
&uart0 {
status = "okay";
};