From 8373767b94e16652a3453e3ba2ac9ebd32d1949e Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Sat, 18 May 2024 22:39:02 +0200 Subject: [PATCH 1/3] dt-bindings: arm: arm,juno-fpga-apb-regs: document FPGA syscon Add dedicated bindings for the FPGA syscon registers on ARM Juno board, to fully document the block and also fix dtbs_check warning: juno.dtb: apbregs@10000: compatible: ['syscon', 'simple-mfd'] is too short Signed-off-by: Krzysztof Kozlowski Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/20240518203903.119608-1-krzysztof.kozlowski@linaro.org Signed-off-by: Sudeep Holla --- .../bindings/arm/arm,juno-fpga-apb-regs.yaml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml diff --git a/Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml b/Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml new file mode 100644 index 000000000000..ce5f2e1ec1ea --- /dev/null +++ b/Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/arm,juno-fpga-apb-regs.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ARM Juno FPGA APB Registers + +maintainers: + - Sudeep Holla + +properties: + compatible: + items: + - const: arm,juno-fpga-apb-regs + - const: syscon + - const: simple-mfd + + reg: + maxItems: 1 + + ranges: true + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + +patternProperties: + "^led@[0-9a-f]+,[0-9a-f]$": + $ref: /schemas/leds/register-bit-led.yaml# + +required: + - compatible + - reg + - ranges + - "#address-cells" + - "#size-cells" + +additionalProperties: false + +examples: + - | + syscon@10000 { + compatible = "arm,juno-fpga-apb-regs", "syscon", "simple-mfd"; + reg = <0x010000 0x1000>; + ranges = <0x0 0x10000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + + led@8,0 { + compatible = "register-bit-led"; + reg = <0x08 0x04>; + offset = <0x08>; + mask = <0x01>; + label = "vexpress:0"; + linux,default-trigger = "heartbeat"; + default-state = "on"; + }; + }; From 850888d2d978d6af6f170d14a029a634c2d66336 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Sat, 18 May 2024 22:39:03 +0200 Subject: [PATCH 2/3] arm64: dts: juno: add dedicated FPGA syscon compatible Each syscon node must come with a dedicated/specific compatible, which is also reported by dtbs_check: juno.dtb: apbregs@10000: compatible: ['syscon', 'simple-mfd'] is too short Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20240518203903.119608-2-krzysztof.kozlowski@linaro.org Signed-off-by: Sudeep Holla --- arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi index be42932f7e21..6ca73f41408d 100644 --- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi @@ -158,7 +158,8 @@ v2m_sysctl: sysctl@20000 { }; apbregs@10000 { - compatible = "syscon", "simple-mfd"; + compatible = "arm,juno-fpga-apb-regs", + "syscon", "simple-mfd"; reg = <0x010000 0x1000>; ranges = <0x0 0x10000 0x1000>; #address-cells = <1>; From 75895aa2bc1e0dbf062a33ec1f754ef6801d64dd Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Wed, 19 Jun 2024 16:31:37 +0100 Subject: [PATCH 3/3] arm64: dts: juno: Enable GPU Both Mali-T620 and Juno's HDLCD are now supported by upstream Mesa in recent distros, so there's little reason not to enable the GPU by default. At the very least it should offer a little extra CI coverage for Panfrost probing and wiggling SCMI. Signed-off-by: Robin Murphy Acked-by: Liviu Dudau Link: https://lore.kernel.org/r/07e45a015ff8934c4571617c8e8e90205e430eb6.1718811097.git.robin.murphy@arm.com Signed-off-by: Sudeep Holla --- arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 98ed2b329ed6..055764d0b9e5 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -663,7 +663,6 @@ gpu: gpu@2d000000 { dma-coherent; /* The SMMU is only really of interest to bare-metal hypervisors */ /* iommus = <&smmu_gpu 0>; */ - status = "disabled"; }; sram: sram@2e000000 {