| Message ID | 20230315010920.2473206-1-danielwa@cisco.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | arm64: dts: cisco: add device tree for Cisco CrayAr Argos. | expand |
On 15/03/2023 02:09, Daniel Walker wrote: > From: Marcin Wierzbicki <mawierzb@cisco.com> > > This adds device tree include file for Cisco CrayAR SoC and > device tree file for Cisco CrayAR Argos EVB board. > > Cc: xe-linux-external@cisco.com > Signed-off-by: Marcin Wierzbicki <mawierzb@cisco.com> > Signed-off-by: Daniel Walker <danielwa@cisco.com> > --- > .../devicetree/bindings/arm/cisco/crayar.yaml | 27 ++ > MAINTAINERS | 5 + > arch/arm64/Kconfig.platforms | 5 + > arch/arm64/boot/dts/Makefile | 1 + > arch/arm64/boot/dts/cisco/Makefile | 2 + > arch/arm64/boot/dts/cisco/crayar.dtsi | 326 ++++++++++++++++++ > arch/arm64/boot/dts/cisco/crayar_argos.dts | 32 ++ > 7 files changed, 398 insertions(+) > create mode 100644 Documentation/devicetree/bindings/arm/cisco/crayar.yaml > create mode 100644 arch/arm64/boot/dts/cisco/Makefile > create mode 100644 arch/arm64/boot/dts/cisco/crayar.dtsi > create mode 100644 arch/arm64/boot/dts/cisco/crayar_argos.dts > > diff --git a/Documentation/devicetree/bindings/arm/cisco/crayar.yaml b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml > new file mode 100644 > index 000000000000..3975ca4fd07a > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml Bindings are separate patches, always, split them. > @@ -0,0 +1,27 @@ > +# SPDX-License-Identifier: GPL-2.0 Dual license. Checkpatch should complain. > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/arm/cisco/crayar.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Cisco CrayAR based Platforms Device Tree Bindings Drio "Device Tree Bindings" > + > +maintainers: > + - xe-linux-external@cisco.com > + > +description: | Drop '|' > + Cisco CrayAR boards with CrayAR SOC > + > +properties: > + $nodename: > + const: '/' > + compatible: > + oneOf: > + - description: Cisco CrayAR Argos evaluation board > + items: > + - const: cisco,crayar-argos > + - const: cisco,crayar > + > +additionalProperties: true > + > +... > diff --git a/MAINTAINERS b/MAINTAINERS > index ec57c42ed544..f94d769c6f88 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -4793,6 +4793,11 @@ X: drivers/char/ipmi/ > X: drivers/char/random.c > X: drivers/char/tpm/ > > +CISCO ARM64 DEVICE TREE SUPPORT > +M: xe-linux-external@cisco.com > +S: Supported > +F: arch/arm64/boot/dts/cisco/ > + > CHECKPATCH > M: Andy Whitcroft <apw@canonical.com> > M: Joe Perches <joe@perches.com> > diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms > index 89a0b13b058d..740099c56382 100644 > --- a/arch/arm64/Kconfig.platforms > +++ b/arch/arm64/Kconfig.platforms > @@ -94,6 +94,11 @@ config ARCH_BITMAIN > help > This enables support for the Bitmain SoC Family. > > +config ARCH_CISCO_CRAYAR_ARGOS > + bool "Cisco Argos Platform" > + help > + This enables support for the Cisco Argos Platform. > + > config ARCH_EXYNOS > bool "Samsung Exynos SoC family" > select COMMON_CLK_SAMSUNG > diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile > index 7b107fa7414b..3f83583f9996 100644 > --- a/arch/arm64/boot/dts/Makefile > +++ b/arch/arm64/boot/dts/Makefile > @@ -11,6 +11,7 @@ subdir-y += arm > subdir-y += bitmain > subdir-y += broadcom > subdir-y += cavium > +subdir-y += cisco > subdir-y += exynos > subdir-y += freescale > subdir-y += hisilicon > diff --git a/arch/arm64/boot/dts/cisco/Makefile b/arch/arm64/boot/dts/cisco/Makefile > new file mode 100644 > index 000000000000..b1d4220df2f4 > --- /dev/null > +++ b/arch/arm64/boot/dts/cisco/Makefile > @@ -0,0 +1,2 @@ > +# SPDX-License-Identifier: GPL-2.0 > +dtb-$(CONFIG_ARCH_CISCO_CRAYAR_ARGOS) += crayar_argos.dtb > diff --git a/arch/arm64/boot/dts/cisco/crayar.dtsi b/arch/arm64/boot/dts/cisco/crayar.dtsi > new file mode 100644 > index 000000000000..22579406e65c > --- /dev/null > +++ b/arch/arm64/boot/dts/cisco/crayar.dtsi > @@ -0,0 +1,326 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Device Tree Include file for Cisco CrayAR family SoC. > + * > + * Copyright (C) 2022 Cisco > + */ > + > +#include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + compatible = "cisco,crayar"; > + interrupt-parent = <&gic>; > + #address-cells = <0x2>; > + #size-cells = <0x2>; > + > + base_clk: base-clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <500000000>; > + }; > + > + cpus { > + #address-cells = <0x1>; > + #size-cells = <0x0>; > + > + cpu0: cpu@0 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00000>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_0>; > + }; > + > + cpu1: cpu@100 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00100>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_1>; > + }; > + > + cpu2: cpu@200 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00200>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_2>; > + }; > + > + cpu3: cpu@300 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00300>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_3>; > + }; > + > + cpu4: cpu@10000 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10000>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_4>; > + }; > + > + cpu5: cpu@10100 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10100>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_5>; > + }; > + > + cpu6: cpu@10200 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10200>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_6>; > + }; > + > + cpu7: cpu@10300 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10300>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_7>; > + }; > + > + cpu-map { > + cluster0 { > + core0 { > + cpu = <&cpu0>; > + }; > + core1 { > + cpu = <&cpu1>; > + }; > + core2 { > + cpu = <&cpu2>; > + }; > + core3 { > + cpu = <&cpu3>; > + }; > + }; > + cluster1 { > + core0 { > + cpu = <&cpu4>; > + }; > + core1 { > + cpu = <&cpu5>; > + }; > + core2 { > + cpu = <&cpu6>; > + }; > + core3 { > + cpu = <&cpu7>; > + }; > + }; > + }; > + > + l2_0: l2-cache0 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_1: l2-cache1 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_2: l2-cache2 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_3: l2-cache3 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_4: l2-cache4 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_5: l2-cache5 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_6: l2-cache6 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_7: l2-cache7 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l3_0: l3-cache0 { > + compatible = "cache"; > + }; > + > + l3_1: l3-cache1 { > + compatible = "cache"; > + }; > + }; > + > + cci: cci@2E000000 { Lowercase hex, everywhere > + compatible = "arm,cci-550"; > + #address-cells = <0x1>; > + #size-cells = <0x1>; > + reg = <0x0 0x2E000000 0x0 0x1000>; reg is second property > + ranges = <0x0 0x0 0x2E000000 0x6000>; ranges third, and fix case everywhere > + > + secondary-if@1000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x1000 0x1000>; > + }; > + > + secondary-if@2000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x2000 0x1000>; > + }; > + > + secondary-if@3000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x3000 0x1000>; > + }; > + > + secondary-if@4000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x4000 0x1000>; > + }; > + > + secondary-if@5000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x5000 0x1000>; > + }; > + > + secondary-if@6000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x6000 0x1000>; > + }; > + > + secondary-if@7000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x6000 0x1000>; > + }; > + > + pm-cntr@10000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x10000 0x10000>; > + }; > + > + pm-cntr@20000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x20000 0x10000>; > + }; > + > + pm-cntr@30000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x30000 0x10000>; > + }; > + > + pm-cntr@40000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x40000 0x10000>; > + }; > + > + pm-cntr@50000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x50000 0x10000>; > + }; > + > + pm-cntr@60000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x60000 0x10000>; > + }; > + > + pm-cntr@70000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x70000 0x10000>; > + }; > + > + pm-cntr@80000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x80000 0x10000>; > + }; > + }; > + > + timer: timer { > + compatible = "arm,armv8-timer"; > + interrupt-parent = <&gic>; > + interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + gic: interrupt-controller@20000000 { > + compatible = "arm,gic-v3"; > + #interrupt-cells = <3>; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + interrupt-controller; > + reg = <0x0 0x20000000 0x0 0x10000>, /* GICD */ > + <0x0 0x20060000 0x0 0x100000>; /* GICR */ Same problems. > + > + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; > + > + its: its@20040000 { > + compatible = "arm,gic-v3-its"; > + msi-controller; > + mbi-ranges = <256 224>; > + reg = <0x0 0x20040000 0x0 0x10000>; > + }; > + }; Best regards, Krzysztof
On 15/03/2023 02:09, Daniel Walker wrote: > From: Marcin Wierzbicki <mawierzb@cisco.com> Also few nits: subject: drop full stop. > > This adds device tree include file for Cisco CrayAR SoC and Do not use "This commit/patch", but imperative mood. See: https://elixir.bootlin.com/linux/v5.17.1/source/Documentation/process/submitting-patches.rst#L95 > device tree file for Cisco CrayAR Argos EVB board. > > Cc: xe-linux-external@cisco.com > Signed-off-by: Marcin Wierzbicki <mawierzb@cisco.com> > Signed-off-by: Daniel Walker <danielwa@cisco.com> Best regards, Krzysztof
On Wed, Mar 15, 2023 at 07:38:52AM +0100, Krzysztof Kozlowski wrote: > On 15/03/2023 02:09, Daniel Walker wrote: > > From: Marcin Wierzbicki <mawierzb@cisco.com> > > Also few nits: subject: drop full stop. I don't know what your asking here. > > > > This adds device tree include file for Cisco CrayAR SoC and > > Do not use "This commit/patch", but imperative mood. See: > https://elixir.bootlin.com/linux/v5.17.1/source/Documentation/process/submitting-patches.rst#L95 Ok, I'll consider it. Daniel
On 15/03/2023 15:46, Daniel Walker (danielwa) wrote: > On Wed, Mar 15, 2023 at 07:38:52AM +0100, Krzysztof Kozlowski wrote: >> On 15/03/2023 02:09, Daniel Walker wrote: >>> From: Marcin Wierzbicki <mawierzb@cisco.com> >> >> Also few nits: subject: drop full stop. > > I don't know what your asking here. I am asking to drop full stop from Subject. > >>> >>> This adds device tree include file for Cisco CrayAR SoC and >> >> Do not use "This commit/patch", but imperative mood. See: >> https://elixir.bootlin.com/linux/v5.17.1/source/Documentation/process/submitting-patches.rst#L95 > > Ok, I'll consider it. Use Linux coding style, not your own. Best regards, Krzysztof
On Wed, Mar 15, 2023 at 04:30:51PM +0100, Krzysztof Kozlowski wrote: > On 15/03/2023 15:46, Daniel Walker (danielwa) wrote: > > On Wed, Mar 15, 2023 at 07:38:52AM +0100, Krzysztof Kozlowski wrote: > >> On 15/03/2023 02:09, Daniel Walker wrote: > >>> From: Marcin Wierzbicki <mawierzb@cisco.com> > >> > >> Also few nits: subject: drop full stop. > > > > I don't know what your asking here. > > I am asking to drop full stop from Subject. Do you mean the period at the end of the line ? Daniel
On 15/03/2023 16:53, Daniel Walker (danielwa) wrote: > On Wed, Mar 15, 2023 at 04:30:51PM +0100, Krzysztof Kozlowski wrote: >> On 15/03/2023 15:46, Daniel Walker (danielwa) wrote: >>> On Wed, Mar 15, 2023 at 07:38:52AM +0100, Krzysztof Kozlowski wrote: >>>> On 15/03/2023 02:09, Daniel Walker wrote: >>>>> From: Marcin Wierzbicki <mawierzb@cisco.com> >>>> >>>> Also few nits: subject: drop full stop. >>> >>> I don't know what your asking here. >> >> I am asking to drop full stop from Subject. > > Do you mean the period at the end of the line ? Yes. Subject is not a full sentence. https://en.wiktionary.org/wiki/full_stop Best regards, Krzysztof
On Tue, Mar 14, 2023 at 8:12 PM Daniel Walker <danielwa@cisco.com> wrote: > > From: Marcin Wierzbicki <mawierzb@cisco.com> > > This adds device tree include file for Cisco CrayAR SoC and > device tree file for Cisco CrayAR Argos EVB board. Run dtbs_check on your platform and fix all the errors. Some examples below... > > Cc: xe-linux-external@cisco.com > Signed-off-by: Marcin Wierzbicki <mawierzb@cisco.com> > Signed-off-by: Daniel Walker <danielwa@cisco.com> > --- > .../devicetree/bindings/arm/cisco/crayar.yaml | 27 ++ > MAINTAINERS | 5 + > arch/arm64/Kconfig.platforms | 5 + > arch/arm64/boot/dts/Makefile | 1 + > arch/arm64/boot/dts/cisco/Makefile | 2 + > arch/arm64/boot/dts/cisco/crayar.dtsi | 326 ++++++++++++++++++ > arch/arm64/boot/dts/cisco/crayar_argos.dts | 32 ++ > 7 files changed, 398 insertions(+) > create mode 100644 Documentation/devicetree/bindings/arm/cisco/crayar.yaml > create mode 100644 arch/arm64/boot/dts/cisco/Makefile > create mode 100644 arch/arm64/boot/dts/cisco/crayar.dtsi > create mode 100644 arch/arm64/boot/dts/cisco/crayar_argos.dts > > diff --git a/Documentation/devicetree/bindings/arm/cisco/crayar.yaml b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml > new file mode 100644 > index 000000000000..3975ca4fd07a > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml > @@ -0,0 +1,27 @@ > +# SPDX-License-Identifier: GPL-2.0 > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/arm/cisco/crayar.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Cisco CrayAR based Platforms Device Tree Bindings > + > +maintainers: > + - xe-linux-external@cisco.com > + > +description: | > + Cisco CrayAR boards with CrayAR SOC > + > +properties: > + $nodename: > + const: '/' > + compatible: > + oneOf: > + - description: Cisco CrayAR Argos evaluation board > + items: > + - const: cisco,crayar-argos > + - const: cisco,crayar > + > +additionalProperties: true > + > +... > diff --git a/MAINTAINERS b/MAINTAINERS > index ec57c42ed544..f94d769c6f88 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -4793,6 +4793,11 @@ X: drivers/char/ipmi/ > X: drivers/char/random.c > X: drivers/char/tpm/ > > +CISCO ARM64 DEVICE TREE SUPPORT > +M: xe-linux-external@cisco.com > +S: Supported > +F: arch/arm64/boot/dts/cisco/ > + > CHECKPATCH > M: Andy Whitcroft <apw@canonical.com> > M: Joe Perches <joe@perches.com> > diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms > index 89a0b13b058d..740099c56382 100644 > --- a/arch/arm64/Kconfig.platforms > +++ b/arch/arm64/Kconfig.platforms > @@ -94,6 +94,11 @@ config ARCH_BITMAIN > help > This enables support for the Bitmain SoC Family. > > +config ARCH_CISCO_CRAYAR_ARGOS > + bool "Cisco Argos Platform" > + help > + This enables support for the Cisco Argos Platform. > + > config ARCH_EXYNOS > bool "Samsung Exynos SoC family" > select COMMON_CLK_SAMSUNG > diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile > index 7b107fa7414b..3f83583f9996 100644 > --- a/arch/arm64/boot/dts/Makefile > +++ b/arch/arm64/boot/dts/Makefile > @@ -11,6 +11,7 @@ subdir-y += arm > subdir-y += bitmain > subdir-y += broadcom > subdir-y += cavium > +subdir-y += cisco > subdir-y += exynos > subdir-y += freescale > subdir-y += hisilicon > diff --git a/arch/arm64/boot/dts/cisco/Makefile b/arch/arm64/boot/dts/cisco/Makefile > new file mode 100644 > index 000000000000..b1d4220df2f4 > --- /dev/null > +++ b/arch/arm64/boot/dts/cisco/Makefile > @@ -0,0 +1,2 @@ > +# SPDX-License-Identifier: GPL-2.0 > +dtb-$(CONFIG_ARCH_CISCO_CRAYAR_ARGOS) += crayar_argos.dtb > diff --git a/arch/arm64/boot/dts/cisco/crayar.dtsi b/arch/arm64/boot/dts/cisco/crayar.dtsi > new file mode 100644 > index 000000000000..22579406e65c > --- /dev/null > +++ b/arch/arm64/boot/dts/cisco/crayar.dtsi > @@ -0,0 +1,326 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Device Tree Include file for Cisco CrayAR family SoC. > + * > + * Copyright (C) 2022 Cisco > + */ > + > +#include <dt-bindings/interrupt-controller/arm-gic.h> > +#include <dt-bindings/interrupt-controller/irq.h> > + > +/ { > + compatible = "cisco,crayar"; > + interrupt-parent = <&gic>; > + #address-cells = <0x2>; > + #size-cells = <0x2>; > + > + base_clk: base-clk { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <500000000>; > + }; > + > + cpus { > + #address-cells = <0x1>; Should be 2. > + #size-cells = <0x0>; > + > + cpu0: cpu@0 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; "arm,armv8" is only for s/w emulators. > + reg = <0x00000>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_0>; > + }; > + > + cpu1: cpu@100 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00100>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_1>; > + }; > + > + cpu2: cpu@200 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00200>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_2>; > + }; > + > + cpu3: cpu@300 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x00300>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_3>; > + }; > + > + cpu4: cpu@10000 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10000>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_4>; > + }; > + > + cpu5: cpu@10100 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10100>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_5>; > + }; > + > + cpu6: cpu@10200 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10200>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_6>; > + }; > + > + cpu7: cpu@10300 { > + device_type = "cpu"; > + compatible = "arm,cortex-a75", "arm,armv8"; > + reg = <0x10300>; > + enable-method = "spin-table"; > + cpu-release-addr = <0x0 0x7003FFF8>; > + next-level-cache = <&l2_7>; > + }; > + > + cpu-map { > + cluster0 { > + core0 { > + cpu = <&cpu0>; > + }; > + core1 { > + cpu = <&cpu1>; > + }; > + core2 { > + cpu = <&cpu2>; > + }; > + core3 { > + cpu = <&cpu3>; > + }; > + }; > + cluster1 { > + core0 { > + cpu = <&cpu4>; > + }; > + core1 { > + cpu = <&cpu5>; > + }; > + core2 { > + cpu = <&cpu6>; > + }; > + core3 { > + cpu = <&cpu7>; > + }; > + }; > + }; > + > + l2_0: l2-cache0 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; Missing properties. > + }; > + > + l2_1: l2-cache1 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_2: l2-cache2 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_3: l2-cache3 { > + compatible = "cache"; > + next-level-cache = <&l3_0>; > + }; > + > + l2_4: l2-cache4 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_5: l2-cache5 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_6: l2-cache6 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l2_7: l2-cache7 { > + compatible = "cache"; > + next-level-cache = <&l3_1>; > + }; > + > + l3_0: l3-cache0 { > + compatible = "cache"; > + }; > + > + l3_1: l3-cache1 { > + compatible = "cache"; > + }; > + }; > + > + cci: cci@2E000000 { > + compatible = "arm,cci-550"; > + #address-cells = <0x1>; > + #size-cells = <0x1>; > + reg = <0x0 0x2E000000 0x0 0x1000>; > + ranges = <0x0 0x0 0x2E000000 0x6000>; > + > + secondary-if@1000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x1000 0x1000>; > + }; > + > + secondary-if@2000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x2000 0x1000>; > + }; > + > + secondary-if@3000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace-lite"; > + reg = <0x3000 0x1000>; > + }; > + > + secondary-if@4000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x4000 0x1000>; > + }; > + > + secondary-if@5000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x5000 0x1000>; > + }; > + > + secondary-if@6000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x6000 0x1000>; > + }; > + > + secondary-if@7000 { > + compatible = "arm,cci-550-ctrl-if"; > + interface-type = "ace"; > + reg = <0x6000 0x1000>; > + }; > + > + pm-cntr@10000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x10000 0x10000>; > + }; > + > + pm-cntr@20000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x20000 0x10000>; > + }; > + > + pm-cntr@30000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x30000 0x10000>; > + }; > + > + pm-cntr@40000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x40000 0x10000>; > + }; > + > + pm-cntr@50000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x50000 0x10000>; > + }; > + > + pm-cntr@60000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x60000 0x10000>; > + }; > + > + pm-cntr@70000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x70000 0x10000>; > + }; > + > + pm-cntr@80000 { > + compatible = "arm,cci-550-pmu"; > + reg = <0x80000 0x10000>; > + }; > + }; > + > + timer: timer { > + compatible = "arm,armv8-timer"; > + interrupt-parent = <&gic>; > + interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; > + }; > + > + gic: interrupt-controller@20000000 { > + compatible = "arm,gic-v3"; > + #interrupt-cells = <3>; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + interrupt-controller; > + reg = <0x0 0x20000000 0x0 0x10000>, /* GICD */ > + <0x0 0x20060000 0x0 0x100000>; /* GICR */ > + > + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; > + > + its: its@20040000 { msi-controller@... > + compatible = "arm,gic-v3-its"; > + msi-controller; > + mbi-ranges = <256 224>; > + reg = <0x0 0x20040000 0x0 0x10000>; > + }; > + }; > + > + soc { > + compatible = "simple-bus"; > + #address-cells = <0x2>; > + #size-cells = <0x2>; > + ranges = <0x0 0x0 0x0 0x0 0x100 0x0>; > + > + uart0: serial@23f80000 { > + compatible = "ns16550a"; > + reg = <0x0 0x23f80000 0x0 0x100>; > + interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>; > + reg-shift = <0x2>; > + reg-io-width = <0x4>; > + clocks = <&base_clk>; > + current-speed = <9600>; > + status = "disabled"; > + }; > + > + uart1: serial@23fc0000 { > + compatible = "ns16550a"; > + reg = <0x0 0x23fc0000 0x0 0x100>; > + interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; > + reg-shift = <0x2>; > + reg-io-width = <0x4>; > + clocks = <&base_clk>; > + current-speed = <9600>; > + status = "disabled"; > + }; > + }; > +}; > diff --git a/arch/arm64/boot/dts/cisco/crayar_argos.dts b/arch/arm64/boot/dts/cisco/crayar_argos.dts > new file mode 100644 > index 000000000000..d415427c145f > --- /dev/null > +++ b/arch/arm64/boot/dts/cisco/crayar_argos.dts > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Device Tree file for Cisco CrayAR Argos EVB board. > + * > + * Copyright (C) 2022 Cisco > + */ > + > +/dts-v1/; > +#include "crayar.dtsi" > + > +/ { > + compatible = "cisco,crayar-argos", "cisco,crayar"; > + model = "Cisco CrayAr Argos EVB"; > + version = <0x00000001>; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:9600n8"; > + }; > + > + memory { Needs unit-address. > + device_type = "memory"; > + reg = <0x0 0x80000000 0x0 0x80000000>; > + }; > +}; > + > +&uart0 { > + status = "okay"; > +}; > -- > 2.25.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/Documentation/devicetree/bindings/arm/cisco/crayar.yaml b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml new file mode 100644 index 000000000000..3975ca4fd07a --- /dev/null +++ b/Documentation/devicetree/bindings/arm/cisco/crayar.yaml @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/cisco/crayar.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cisco CrayAR based Platforms Device Tree Bindings + +maintainers: + - xe-linux-external@cisco.com + +description: | + Cisco CrayAR boards with CrayAR SOC + +properties: + $nodename: + const: '/' + compatible: + oneOf: + - description: Cisco CrayAR Argos evaluation board + items: + - const: cisco,crayar-argos + - const: cisco,crayar + +additionalProperties: true + +... diff --git a/MAINTAINERS b/MAINTAINERS index ec57c42ed544..f94d769c6f88 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4793,6 +4793,11 @@ X: drivers/char/ipmi/ X: drivers/char/random.c X: drivers/char/tpm/ +CISCO ARM64 DEVICE TREE SUPPORT +M: xe-linux-external@cisco.com +S: Supported +F: arch/arm64/boot/dts/cisco/ + CHECKPATCH M: Andy Whitcroft <apw@canonical.com> M: Joe Perches <joe@perches.com> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 89a0b13b058d..740099c56382 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -94,6 +94,11 @@ config ARCH_BITMAIN help This enables support for the Bitmain SoC Family. +config ARCH_CISCO_CRAYAR_ARGOS + bool "Cisco Argos Platform" + help + This enables support for the Cisco Argos Platform. + config ARCH_EXYNOS bool "Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index 7b107fa7414b..3f83583f9996 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -11,6 +11,7 @@ subdir-y += arm subdir-y += bitmain subdir-y += broadcom subdir-y += cavium +subdir-y += cisco subdir-y += exynos subdir-y += freescale subdir-y += hisilicon diff --git a/arch/arm64/boot/dts/cisco/Makefile b/arch/arm64/boot/dts/cisco/Makefile new file mode 100644 index 000000000000..b1d4220df2f4 --- /dev/null +++ b/arch/arm64/boot/dts/cisco/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +dtb-$(CONFIG_ARCH_CISCO_CRAYAR_ARGOS) += crayar_argos.dtb diff --git a/arch/arm64/boot/dts/cisco/crayar.dtsi b/arch/arm64/boot/dts/cisco/crayar.dtsi new file mode 100644 index 000000000000..22579406e65c --- /dev/null +++ b/arch/arm64/boot/dts/cisco/crayar.dtsi @@ -0,0 +1,326 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Include file for Cisco CrayAR family SoC. + * + * Copyright (C) 2022 Cisco + */ + +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + compatible = "cisco,crayar"; + interrupt-parent = <&gic>; + #address-cells = <0x2>; + #size-cells = <0x2>; + + base_clk: base-clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <500000000>; + }; + + cpus { + #address-cells = <0x1>; + #size-cells = <0x0>; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x00000>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_0>; + }; + + cpu1: cpu@100 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x00100>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_1>; + }; + + cpu2: cpu@200 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x00200>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_2>; + }; + + cpu3: cpu@300 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x00300>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_3>; + }; + + cpu4: cpu@10000 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x10000>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_4>; + }; + + cpu5: cpu@10100 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x10100>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_5>; + }; + + cpu6: cpu@10200 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x10200>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_6>; + }; + + cpu7: cpu@10300 { + device_type = "cpu"; + compatible = "arm,cortex-a75", "arm,armv8"; + reg = <0x10300>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x7003FFF8>; + next-level-cache = <&l2_7>; + }; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + core1 { + cpu = <&cpu1>; + }; + core2 { + cpu = <&cpu2>; + }; + core3 { + cpu = <&cpu3>; + }; + }; + cluster1 { + core0 { + cpu = <&cpu4>; + }; + core1 { + cpu = <&cpu5>; + }; + core2 { + cpu = <&cpu6>; + }; + core3 { + cpu = <&cpu7>; + }; + }; + }; + + l2_0: l2-cache0 { + compatible = "cache"; + next-level-cache = <&l3_0>; + }; + + l2_1: l2-cache1 { + compatible = "cache"; + next-level-cache = <&l3_0>; + }; + + l2_2: l2-cache2 { + compatible = "cache"; + next-level-cache = <&l3_0>; + }; + + l2_3: l2-cache3 { + compatible = "cache"; + next-level-cache = <&l3_0>; + }; + + l2_4: l2-cache4 { + compatible = "cache"; + next-level-cache = <&l3_1>; + }; + + l2_5: l2-cache5 { + compatible = "cache"; + next-level-cache = <&l3_1>; + }; + + l2_6: l2-cache6 { + compatible = "cache"; + next-level-cache = <&l3_1>; + }; + + l2_7: l2-cache7 { + compatible = "cache"; + next-level-cache = <&l3_1>; + }; + + l3_0: l3-cache0 { + compatible = "cache"; + }; + + l3_1: l3-cache1 { + compatible = "cache"; + }; + }; + + cci: cci@2E000000 { + compatible = "arm,cci-550"; + #address-cells = <0x1>; + #size-cells = <0x1>; + reg = <0x0 0x2E000000 0x0 0x1000>; + ranges = <0x0 0x0 0x2E000000 0x6000>; + + secondary-if@1000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace-lite"; + reg = <0x1000 0x1000>; + }; + + secondary-if@2000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace-lite"; + reg = <0x2000 0x1000>; + }; + + secondary-if@3000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace-lite"; + reg = <0x3000 0x1000>; + }; + + secondary-if@4000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace"; + reg = <0x4000 0x1000>; + }; + + secondary-if@5000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace"; + reg = <0x5000 0x1000>; + }; + + secondary-if@6000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace"; + reg = <0x6000 0x1000>; + }; + + secondary-if@7000 { + compatible = "arm,cci-550-ctrl-if"; + interface-type = "ace"; + reg = <0x6000 0x1000>; + }; + + pm-cntr@10000 { + compatible = "arm,cci-550-pmu"; + reg = <0x10000 0x10000>; + }; + + pm-cntr@20000 { + compatible = "arm,cci-550-pmu"; + reg = <0x20000 0x10000>; + }; + + pm-cntr@30000 { + compatible = "arm,cci-550-pmu"; + reg = <0x30000 0x10000>; + }; + + pm-cntr@40000 { + compatible = "arm,cci-550-pmu"; + reg = <0x40000 0x10000>; + }; + + pm-cntr@50000 { + compatible = "arm,cci-550-pmu"; + reg = <0x50000 0x10000>; + }; + + pm-cntr@60000 { + compatible = "arm,cci-550-pmu"; + reg = <0x60000 0x10000>; + }; + + pm-cntr@70000 { + compatible = "arm,cci-550-pmu"; + reg = <0x70000 0x10000>; + }; + + pm-cntr@80000 { + compatible = "arm,cci-550-pmu"; + reg = <0x80000 0x10000>; + }; + }; + + timer: timer { + compatible = "arm,armv8-timer"; + interrupt-parent = <&gic>; + interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>, + <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>; + }; + + gic: interrupt-controller@20000000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <3>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + interrupt-controller; + reg = <0x0 0x20000000 0x0 0x10000>, /* GICD */ + <0x0 0x20060000 0x0 0x100000>; /* GICR */ + + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; + + its: its@20040000 { + compatible = "arm,gic-v3-its"; + msi-controller; + mbi-ranges = <256 224>; + reg = <0x0 0x20040000 0x0 0x10000>; + }; + }; + + soc { + compatible = "simple-bus"; + #address-cells = <0x2>; + #size-cells = <0x2>; + ranges = <0x0 0x0 0x0 0x0 0x100 0x0>; + + uart0: serial@23f80000 { + compatible = "ns16550a"; + reg = <0x0 0x23f80000 0x0 0x100>; + interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <0x2>; + reg-io-width = <0x4>; + clocks = <&base_clk>; + current-speed = <9600>; + status = "disabled"; + }; + + uart1: serial@23fc0000 { + compatible = "ns16550a"; + reg = <0x0 0x23fc0000 0x0 0x100>; + interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; + reg-shift = <0x2>; + reg-io-width = <0x4>; + clocks = <&base_clk>; + current-speed = <9600>; + status = "disabled"; + }; + }; +}; diff --git a/arch/arm64/boot/dts/cisco/crayar_argos.dts b/arch/arm64/boot/dts/cisco/crayar_argos.dts new file mode 100644 index 000000000000..d415427c145f --- /dev/null +++ b/arch/arm64/boot/dts/cisco/crayar_argos.dts @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree file for Cisco CrayAR Argos EVB board. + * + * Copyright (C) 2022 Cisco + */ + +/dts-v1/; +#include "crayar.dtsi" + +/ { + compatible = "cisco,crayar-argos", "cisco,crayar"; + model = "Cisco CrayAr Argos EVB"; + version = <0x00000001>; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:9600n8"; + }; + + memory { + device_type = "memory"; + reg = <0x0 0x80000000 0x0 0x80000000>; + }; +}; + +&uart0 { + status = "okay"; +};