diff --git a/Documentation/devicetree/bindings/cpu/apple,t8140-cpuidle.yaml b/Documentation/devicetree/bindings/cpu/apple,t8140-cpuidle.yaml index 9ffa89ece40cd..430e20dd605b4 100644 --- a/Documentation/devicetree/bindings/cpu/apple,t8140-cpuidle.yaml +++ b/Documentation/devicetree/bindings/cpu/apple,t8140-cpuidle.yaml @@ -4,26 +4,30 @@ $id: http://devicetree.org/schemas/cpu/apple,t8140-cpuidle.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Apple T6040, T8132 and T8140 CPU idle controller +title: Apple T6040, T8132, T8140 and T8152 CPU idle controller maintainers: - Ryan Murray description: - Selects the Apple CPU idle driver on T6040, T8132 and T8140 systems. On these - SoCs the hardware decides when an idle core is power-gated after WFI; - software cannot request core or cluster power-down, so WFI is the only - idle state. + Selects the Apple CPU idle driver on T6040, T8132, T8140 and T8152 systems. + On these SoCs the hardware decides when an idle core is power-gated after + WFI; software cannot request core or cluster power-down, so WFI is the only + idle state. T8152 uses the T8140 driver profile. properties: $nodename: const: cpuidle compatible: - enum: - - apple,t6041-cpuidle - - apple,t8132-cpuidle - - apple,t8140-cpuidle + oneOf: + - enum: + - apple,t6041-cpuidle + - apple,t8132-cpuidle + - apple,t8140-cpuidle + - items: + - const: apple,t8152-cpuidle + - const: apple,t8140-cpuidle required: - compatible diff --git a/arch/arm64/boot/dts/apple/t8152-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8152-peripherals.dtsi index 1cbd604c41a47..578e7730ef5f1 100644 --- a/arch/arm64/boot/dts/apple/t8152-peripherals.dtsi +++ b/arch/arm64/boot/dts/apple/t8152-peripherals.dtsi @@ -1,6 +1,19 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* Shared SoC resources; firmware ownership and enables need qualification. */ +/ { + /* + * As on T8140, the OS cannot request core power-down on T8152 (no + * writable CYC_OVRD): the hardware power-gates an idle core after WFI, + * so both of the driver's idle states are WFI. The driver must be bound + * for s2idle to freeze the tick and suspend timekeeping. Every T8152 + * board has the same cores, so the node lives here. + */ + cpuidle { + compatible = "apple,t8152-cpuidle", "apple,t8140-cpuidle"; + }; +}; + &{/soc} { pcie2_dart: iommu@38a000000 { compatible = "apple,t8152-dart", "apple,t8110-dart";