From 399b51e9494c0cb3a3297cfc0a87845473499621 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 28 Jul 2021 19:37:39 -0700 Subject: [PATCH] main/linux-postmarketos-rockchip: enable hwmon for power/nvme/thermal (MR 2394) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows using lm_sensors to read temperature data on the pinebook pro (and probably other devices too) ❯ sensors gpu_thermal-virtual-0 Adapter: Virtual device temp1: +41.1°C (crit = +95.0°C) tcpm_source_psy_4_0022-i2c-4-22 Adapter: rk3x-i2c in0: 5.00 V (min = +5.00 V, max = +5.00 V) curr1: 2.50 A (max = +2.50 A) cw2015_battery-i2c-4-62 Adapter: rk3x-i2c in0: 4.24 V curr1: 0.00 A cpu_thermal-virtual-0 Adapter: Virtual device temp1: +47.5°C (crit = +95.0°C) nvme-pci-0100 Adapter: PCI adapter Composite: +31.9°C (low = -273.1°C, high = +80.8°C) (crit = +80.8°C) Sensor 1: +31.9°C (low = -273.1°C, high = +65261.8°C) Sensor 2: +37.9°C (low = -273.1°C, high = +65261.8°C) [ci:skip-build] Already built on CI --- main/linux-postmarketos-rockchip/APKBUILD | 4 ++-- .../config-postmarketos-rockchip.aarch64 | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/main/linux-postmarketos-rockchip/APKBUILD b/main/linux-postmarketos-rockchip/APKBUILD index e397d32a0..0a617bd37 100644 --- a/main/linux-postmarketos-rockchip/APKBUILD +++ b/main/linux-postmarketos-rockchip/APKBUILD @@ -11,7 +11,7 @@ pkgname=linux-postmarketos-rockchip pkgver=5.13.5 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel for rockchip devices" arch="aarch64" _carch="arm64" @@ -83,7 +83,7 @@ package() { sha512sums=" 887a907f5923630224d2bbadd1e60e49856460ee5fde9fd6de770d908bada5c6fe1669f9ed64418695e9101a8e5069854beb23714dc8138cdf9ea7e319b10743 linux-5.13.5.tar.xz -a9be66305434fa02d3e11f369bb06b9ac28dbfe23fc9927f967c55800ce7ad4e3cf1280fb8b6f2410fda9c7c8d3878e7a5d5625a782a0b7f33dd7c53eefba650 config-postmarketos-rockchip.aarch64 +b6a1f2e71473789974fe9e51fc8c94ce233be418a043339315067fbb72667f66cfec864ec5983354561ced72f79b50edde974c328e33a3617e5f99d1818c9a6c config-postmarketos-rockchip.aarch64 10949558a6e3316ea57497f377fd120d6704f3b81725317556e49d10b570a40edb06643b06738116abbe3096be485761d436f1a0d1861bd34fc18ea45068b6b0 0001-phy-rockchip-typec-Set-extcon-capabilities.patch b7291eecfddc7ebe9393eea864e0ee28960e8cc2f87dfc42d09426b5619f46ded97c38fb8bf26f4eea1f26bfe21396094505b3efb8676691f8751e2ffabe50ec 0003-arm64-dts-rockchip-add-typec-extcon-hack.patch 427b81472de2a473344269b2da06ac338af42e68620a281a9cb8543e545e6ed7f719acaf68c688e518b65d2132e0c66676ba5e30376ec980fd6eeaea05c2a8be 0004-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-data-role.patch diff --git a/main/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/main/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 index f527074b2..18be1f1dd 100644 --- a/main/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 +++ b/main/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 @@ -1919,6 +1919,7 @@ CONFIG_VIRTIO_BLK=m CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y # CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_HWMON=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set @@ -3336,6 +3337,7 @@ CONFIG_SYSCON_REBOOT_MODE=y # CONFIG_NVMEM_REBOOT_MODE is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_PDA_POWER is not set # CONFIG_GENERIC_ADC_BATTERY is not set # CONFIG_TEST_POWER is not set @@ -3377,7 +3379,7 @@ CONFIG_CHARGER_GPIO=y CONFIG_CHARGER_CROS_USBPD=m # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set -CONFIG_HWMON=m +CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -3575,6 +3577,7 @@ CONFIG_THERMAL=y # CONFIG_THERMAL_NETLINK is not set # CONFIG_THERMAL_STATISTICS is not set CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y