From 16da27bc8af5ae610b01febee780eb93b8ca0fcf Mon Sep 17 00:00:00 2001 From: yangwei1 Date: Mon, 3 Jun 2024 19:00:03 +0800 Subject: [PATCH 044/219] fix:add label for all hwmon Changelogs: ina226,pac1934,sic451,npq8785,pvt,fan control --- arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts | 17 +++++++++-------- arch/riscv/boot/dts/eswin/eic7700-evb.dts | 17 +++++++++-------- .../boot/dts/eswin/eswin-win2030-die0-soc.dtsi | 3 +++ .../boot/dts/eswin/eswin-win2030-die1-soc.dtsi | 3 +++ .../riscv/boot/dts/eswin/hifive-premier-550.dts | 10 ++++++---- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts b/arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts index a92e182c073a..f5c4712de03e 100644 --- a/arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts +++ b/arch/riscv/boot/dts/eswin/eic7700-evb-a2.dts @@ -718,6 +718,7 @@ mpq8785@10 { reg = <0x10>; eswin,regulator_default-microvolt=<1000000>; eswin,regulator_label = "supply vdd1", "npu vdd1", "npu current1", "npu temperature1"; + label = "npu_vdd"; regulators{ npu_vcc1:npu_svcc{ regulator-name="NPU_SVCC"; @@ -786,31 +787,31 @@ &d0_aon_i2c1 { /* ina226x4 */ status = "okay"; i2c-sda-hold-time-ns = <0x40>; - vdd_cpu: ina226@45 { + ina226@45 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_cpu"; + label = "cpu_vdd"; reg = <0x45>; shunt-resistor = <1000>; }; - vdd_soc: ina226@44 { + ina226@44 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_soc"; + label = "soc_vdd"; reg = <0x44>; shunt-resistor = <1000>; }; - vdd_lpddr: ina226@41 { + ina226@41 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_lpddr"; + label = "lpddr_vdd"; reg = <0x41>; shunt-resistor = <1000>; }; - dc_in: ina226@48 { + ina226@48 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "dc_in"; + label = "dc_vdd"; reg = <0x48>; shunt-resistor = <1000>; }; diff --git a/arch/riscv/boot/dts/eswin/eic7700-evb.dts b/arch/riscv/boot/dts/eswin/eic7700-evb.dts index bec9f0b54367..e3c9de0ada5d 100644 --- a/arch/riscv/boot/dts/eswin/eic7700-evb.dts +++ b/arch/riscv/boot/dts/eswin/eic7700-evb.dts @@ -749,6 +749,7 @@ mpq8785@10 { reg = <0x10>; eswin,regulator_default-microvolt=<1000000>; eswin,regulator_label = "supply vdd1", "npu vdd1", "npu current1", "npu temperature1"; + label = "npu_vdd"; regulators{ npu_vcc1:npu_svcc{ regulator-name="NPU_SVCC"; @@ -761,31 +762,31 @@ npu_vcc1:npu_svcc{ }; }; }; - vdd_cpu: ina226@45 { + ina226@45 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_cpu"; + label = "cpu_vdd"; reg = <0x45>; shunt-resistor = <1000>; }; - vdd_soc: ina226@44 { + ina226@44 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_soc"; + label = "soc_vdd"; reg = <0x44>; shunt-resistor = <1000>; }; - vdd_lpddr: ina226@41 { + ina226@41 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "vdd_lpddr"; + label = "lpddr_vdd"; reg = <0x41>; shunt-resistor = <1000>; }; - dc_in: ina226@48 { + ina226@48 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "dc_in"; + label = "dc_vdd"; reg = <0x48>; shunt-resistor = <1000>; }; diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi index 3db50303c303..a499864a4e99 100644 --- a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi +++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi @@ -1263,6 +1263,7 @@ pvt0: pvt@0x50b00000 { interrupts = <349>; interrupt-parent = <&plic0>; status = "disabled"; + label = "pvt0"; }; pvt1: pvt@0x52360000 { compatible = "eswin,eswin-pvt-ddr"; @@ -1276,6 +1277,7 @@ pvt1: pvt@0x52360000 { interrupts = <350>; interrupt-parent = <&plic0>; status = "disabled"; + label = "pvt1"; }; fan_control: fan_control@50b50000 { @@ -1294,6 +1296,7 @@ fan_control: fan_control@50b50000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fan_tach_default>; status = "disabled"; + label = "fan_control"; }; d0_i2c0: i2c@50950000 { diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi index 2c19ffd3893e..1805c2bcdccc 100644 --- a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi +++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi @@ -674,6 +674,7 @@ d1_pvt0: pvt@0x70b00000 { interrupts = <349>; interrupt-parent = <&plic1>; status = "disabled"; + label = "d1_pvt0"; }; d1_pvt1: pvt@0x72360000 { compatible = "eswin,eswin-pvt-ddr"; @@ -687,6 +688,7 @@ d1_pvt1: pvt@0x72360000 { interrupts = <350>; interrupt-parent = <&plic1>; status = "disabled"; + label = "d1_pvt1"; }; d1_fan_control: fan_control@70b50000 { @@ -703,6 +705,7 @@ d1_fan_control: fan_control@70b50000 { pwm-minimun-period = <1000>; pwms = <&d1_pwm0 0 100000>; status = "disabled"; + label = "d1_fan_control"; }; d1_i2c0: i2c@70950000 { diff --git a/arch/riscv/boot/dts/eswin/hifive-premier-550.dts b/arch/riscv/boot/dts/eswin/hifive-premier-550.dts index 271a5881d3de..92a708552e52 100644 --- a/arch/riscv/boot/dts/eswin/hifive-premier-550.dts +++ b/arch/riscv/boot/dts/eswin/hifive-premier-550.dts @@ -662,19 +662,21 @@ &d0_aon_i2c1 { status = "okay"; eswin,syscfg = <&d0_sys_con 0x3C0 15>; iic_hold_time = <0x40>; - pac1934@10 { + pac1934:pmic@10 { compatible = "microchip,pac1934"; /*update all register data*/ update_time_ms = <1000>; eswin,chan_label = "som vdd", "soc vdd", "cpu vdd", "ddr lpvdd"; + label = "som_info"; /*The update number of times the energy accumulates*/ energy_acc_count = <0>; shunt_resistors=<4 4 4 4>; reg = <0x10>; }; - sic451@11 { + sic451:pmic@11 { compatible = "Vishay,sic451"; reg = <0x11>; + label = "npu_vdd"; regulators{ vdd_npu1:vdd_npu{ regulator-name="VDD_NPU"; @@ -749,10 +751,10 @@ LDO5 { }; }; - u71_sys: ina226@44 { + sys_power:ina226@44 { compatible = "ti,ina226"; #io-channel-cells = <1>; - label = "ina226-u71_sys"; + label = "sys_power"; reg = <0x44>; shunt-resistor = <1000>; }; -- 2.47.0