tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'dt64-cleanup-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt

Minor improvements in ARM64 DTS for v6.11

Few cleanups and improvements which were missed by their maintainers:
1. Spreadtrum: correct PMU nodes - split per clusters.
2. HiSilicon: add dedicated compatible to syscon node ("syscon" alone is
not allowed).
3. APM: add dedicated compatible to syscon node (binding applied to MFD
tree).

* tag 'dt64-cleanup-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
arm64: dts: apm: Add dedicated syscon poweroff compatibles
arm64: dts: hisilicon: hi3660: add dedicated hi3660-usb3-otg-bc compatible
dt-bindings: soc: hisilicon: document hi3660-usb3-otg-bc
arm64: dts: sprd: Split PMU nodes for heterogeneous CPUs

Link: https://lore.kernel.org/r/20240702065359.7378-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 90a4146d c36a19ed

+69 -11
+46
Documentation/devicetree/bindings/soc/hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml
··· 1 + # SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/soc/hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Hisilicon Kirin 960 USB OTG Battery Charging Syscon 8 + 9 + maintainers: 10 + - Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 11 + 12 + properties: 13 + compatible: 14 + items: 15 + - const: hisilicon,hi3660-usb3-otg-bc 16 + - const: syscon 17 + - const: simple-mfd 18 + 19 + reg: 20 + maxItems: 1 21 + 22 + usb-phy: 23 + $ref: /schemas/phy/hisilicon,hi3660-usb3.yaml 24 + description: USB Phy node 25 + 26 + required: 27 + - compatible 28 + - reg 29 + - usb-phy 30 + 31 + additionalProperties: false 32 + 33 + examples: 34 + - | 35 + syscon@ff200000 { 36 + compatible = "hisilicon,hi3660-usb3-otg-bc", "syscon", "simple-mfd"; 37 + reg = <0xff200000 0x1000>; 38 + 39 + usb-phy { 40 + compatible = "hisilicon,hi3660-usb-phy"; 41 + #phy-cells = <0>; 42 + hisilicon,pericrg-syscon = <&crg_ctrl>; 43 + hisilicon,pctrl-syscon = <&pctrl>; 44 + hisilicon,eye-diagram-param = <0x22466e4>; 45 + }; 46 + };
+1 -1
arch/arm64/boot/dts/apm/apm-merlin.dts
··· 32 32 }; 33 33 34 34 poweroff_mbox: poweroff_mbox@10548000 { 35 - compatible = "syscon"; 35 + compatible = "apm,merlin-poweroff-mailbox", "syscon"; 36 36 reg = <0x0 0x10548000 0x0 0x30>; 37 37 }; 38 38
+1 -1
arch/arm64/boot/dts/apm/apm-mustang.dts
··· 32 32 }; 33 33 34 34 poweroff_mbox: poweroff_mbox@10548000 { 35 - compatible = "syscon"; 35 + compatible = "apm,mustang-poweroff-mailbox", "syscon"; 36 36 reg = <0x0 0x10548000 0x0 0x30>; 37 37 }; 38 38
+1 -1
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
··· 1161 1161 }; 1162 1162 1163 1163 usb3_otg_bc: usb3_otg_bc@ff200000 { 1164 - compatible = "syscon", "simple-mfd"; 1164 + compatible = "hisilicon,hi3660-usb3-otg-bc", "syscon", "simple-mfd"; 1165 1165 reg = <0x0 0xff200000 0x0 0x1000>; 1166 1166 1167 1167 usb_phy: usb-phy {
+10 -4
arch/arm64/boot/dts/sprd/ums512.dtsi
··· 136 136 <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; /* Hipervisor PPI */ 137 137 }; 138 138 139 - pmu { 140 - compatible = "arm,armv8-pmuv3"; 139 + pmu-a55 { 140 + compatible = "arm,cortex-a55-pmu"; 141 141 interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>, 142 142 <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, 143 143 <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>, 144 144 <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>, 145 145 <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, 146 - <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, 147 - <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, 146 + <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; 147 + interrupt-affinity = <&CPU0>, <&CPU1>, <&CPU2>, <&CPU3>, <&CPU4>, <&CPU5>; 148 + }; 149 + 150 + pmu-a75 { 151 + compatible = "arm,cortex-a75-pmu"; 152 + interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, 148 153 <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; 154 + interrupt-affinity = <&CPU6>, <&CPU7>; 149 155 }; 150 156 151 157 soc: soc {
+10 -4
arch/arm64/boot/dts/sprd/ums9620.dtsi
··· 144 144 <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; /* Hipervisor PPI */ 145 145 }; 146 146 147 - pmu { 148 - compatible = "arm,armv8-pmuv3"; 147 + pmu-a55 { 148 + compatible = "arm,cortex-a55-pmu"; 149 149 interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>, 150 150 <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>, 151 151 <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>, 152 - <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>, 153 - <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>, 152 + <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; 153 + interrupt-affinity = <&CPU0>, <&CPU1>, <&CPU2>, <&CPU3>; 154 + }; 155 + 156 + pmu-a76 { 157 + compatible = "arm,cortex-a76-pmu"; 158 + interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>, 154 159 <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>, 155 160 <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>, 156 161 <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; 162 + interrupt-affinity = <&CPU4>, <&CPU5>, <&CPU6>, <&CPU7>; 157 163 }; 158 164 159 165 soc: soc {