diff options
Diffstat (limited to 'queue-6.6/arm64-dts-mediatek-mt7986-drop-invalid-thermal-block.patch')
| -rw-r--r-- | queue-6.6/arm64-dts-mediatek-mt7986-drop-invalid-thermal-block.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/queue-6.6/arm64-dts-mediatek-mt7986-drop-invalid-thermal-block.patch b/queue-6.6/arm64-dts-mediatek-mt7986-drop-invalid-thermal-block.patch new file mode 100644 index 0000000000..e2a2c206e6 --- /dev/null +++ b/queue-6.6/arm64-dts-mediatek-mt7986-drop-invalid-thermal-block.patch @@ -0,0 +1,55 @@ +From 73fc55080c8c29c4f7e0d98a03945426c55737a0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sashal@kernel.org> +Date: Tue, 13 Feb 2024 06:37:39 +0100 +Subject: arm64: dts: mediatek: mt7986: drop invalid thermal block clock +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki <rafal@milecki.pl> + +[ Upstream commit 970f8b01bd7719a22e577ba6c78e27f9ccf22783 ] + +Thermal block uses only two clocks. Its binding doesn't document or +allow "adc_32k". Also Linux driver doesn't support it. + +It has been additionally verified by Angelo by his detailed research on +MT7981 / MT7986 clocks (thanks!). + +This fixes: +arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtb: thermal@1100c800: clocks: [[4, 27], [4, 44], [4, 45]] is too long + from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml# +arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtb: thermal@1100c800: clock-names: ['therm', 'auxadc', 'adc_32k'] is too long + from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml# + +Fixes: 0a9615d58d04 ("arm64: dts: mt7986: add thermal and efuse") +Cc: Daniel Golle <daniel@makrotopia.org> +Link: https://lore.kernel.org/linux-devicetree/17d143aa-576e-4d67-a0ea-b79f3518b81c@collabora.com/ +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> +Link: https://lore.kernel.org/r/20240213053739.14387-3-zajec5@gmail.com +Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> +Signed-off-by: Sasha Levin <sashal@kernel.org> +--- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +index f3a2a89fada41..559990dcd1d17 100644 +--- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi ++++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +@@ -332,9 +332,8 @@ + reg = <0 0x1100c800 0 0x800>; + interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&infracfg CLK_INFRA_THERM_CK>, +- <&infracfg CLK_INFRA_ADC_26M_CK>, +- <&infracfg CLK_INFRA_ADC_FRC_CK>; +- clock-names = "therm", "auxadc", "adc_32k"; ++ <&infracfg CLK_INFRA_ADC_26M_CK>; ++ clock-names = "therm", "auxadc"; + nvmem-cells = <&thermal_calibration>; + nvmem-cell-names = "calibration-data"; + #thermal-sensor-cells = <1>; +-- +2.43.0 + |