[PATCH] arm64: dts: add support for S4 based Amlogic AQ222
xianwei.zhao
xianwei.zhao at amlogic.com
Tue Dec 7 22:00:54 PST 2021
Hi Neil,
I will modify those lines and update the patch later.
Thanks!
Best regards,
xianwei.zhao
On 2021/12/6 下午6:57, Neil Armstrong wrote:
> Hi,
>
> On 06/12/2021 11:02, xianwei.zhao wrote:
>> Add basic support for the Amlogic S4 based Amlogic AQ222 board:
>> which describe components as follows: CPU, GIC, IRQ, Timer, UART.
>> It's capable of booting up into the serial console.
>>
>> Signed-off-by: xianwei.zhao <xianwei.zhao at amlogic.com>
>> ---
>> arch/arm64/boot/dts/amlogic/Makefile | 1 +
>> .../dts/amlogic/meson-s4-s805x2-aq222.dts | 30 ++++++
>> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 98 +++++++++++++++++++
>> 3 files changed, 129 insertions(+)
>> create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
>> create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
>> index 5148cd9e5146..faea74a45994 100644
>> --- a/arch/arm64/boot/dts/amlogic/Makefile
>> +++ b/arch/arm64/boot/dts/amlogic/Makefile
>> @@ -57,3 +57,4 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb
>> dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb
>> dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb
>> dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb
>> +dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
>> new file mode 100644
>> index 000000000000..6b6ecb40be4a
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
>> @@ -0,0 +1,30 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2021 Amlogic, Inc. All rights reserved.
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "meson-s4.dtsi"
>> +
>> +/ {
>> + model = "Amlogic";
>
> Please change to something like "Amlogic Meson S4 AQ222 Development Board"
>
>> + compatible = "amlogic, aq222";
>
> Drop the space after amlogic, and add "amlogic,aq222" to the Documentation/devicetree/bindings/arm/amlogic.yaml bindings.
>
> You will probably need to add a new "amlogic,s4" family compatibla aswell.
>
>> + interrupt-parent = <&gic>;
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> +
>> + aliases {
>> + serial0 = &uart_B;
>> + };
>> +
>> + memory at 00000000 {
>> + device_type = "memory";
>> + linux,usable-memory = <0x0 0x0 0x0 0x40000000>;
>
> Drop linux,usable-memory in favor or reg
>
>> + };
>> +
>> +};
>> +
>> +&uart_B {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> new file mode 100644
>> index 000000000000..b66f62701063
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
>> @@ -0,0 +1,98 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2021 Amlogic, Inc. All rights reserved.
>> + */
>> +
>> +#include <dt-bindings/interrupt-controller/irq.h>
>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>
> Add blank line hiere
>
>> +/ {
>> + cpus:cpus {
>> + #address-cells = <2>;
>> + #size-cells = <0>;
>> +
>> + CPU0:cpu at 0 {
>> + device_type = "cpu";
>> + compatible = "arm,cortex-a35","arm,armv8";
>> + reg = <0x0 0x0>;
>> + enable-method = "psci";
>> + };
>> +
>> + CPU1:cpu at 1 {
>> + device_type = "cpu";
>> + compatible = "arm,cortex-a35","arm,armv8";
>> + reg = <0x0 0x1>;
>> + enable-method = "psci";
>> + };
>> +
>> + CPU2:cpu at 2 {
>> + device_type = "cpu";
>> + compatible = "arm,cortex-a35","arm,armv8";
>> + reg = <0x0 0x2>;
>> + enable-method = "psci";
>> + };
>> +
>> + CPU3:cpu at 3 {
>> + device_type = "cpu";
>> + compatible = "arm,cortex-a35","arm,armv8";
>> + reg = <0x0 0x3>;
>> + enable-method = "psci";
>> + };
>> + };
>> +
>> + timer {
>> + compatible = "arm,armv8-timer";
>> + interrupts = <GIC_PPI 13 0xff08>,
>> + <GIC_PPI 14 0xff08>,
>> + <GIC_PPI 11 0xff08>,
>> + <GIC_PPI 10 0xff08>;
>> + };
>> +
>> + psci {
>> + compatible = "arm,psci-1.0";
>> + method = "smc";
>> + };
>> +
>> + xtal: xtal-clk {
>> + compatible = "fixed-clock";
>> + clock-frequency = <24000000>;
>> + clock-output-names = "xtal";
>> + #clock-cells = <0>;
>> + };
>> +
>> + soc {
>> + compatible = "simple-bus";
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> + ranges;
>> +
>> + gic: interrupt-controller at fff01000 {
>> + compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
>> + #interrupt-cells = <3>;
>> + #address-cells = <0>;
>> + interrupt-controller;
>> + reg = <0x0 0xfff01000 0 0x1000>,
>> + <0x0 0xfff02000 0 0x0100>;
>> + interrupts = <GIC_PPI 9 0xf04>;
>> + };
>> +
>> + apb4: apb4 at fe000000 {
>> + compatible = "simple-bus";
>> + reg = <0x0 0xfe000000 0x0 0x480000>;
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> + ranges = <0x0 0x0 0x0 0xfe000000 0x0 0x480000>;
>> +
>> + uart_B: serial at 7a000 {
>> + compatible = "amlogic,meson-gx-uart",
>> + "amlogic,meson-ao-uart";
>
> use the proper compatibles for s4
>
>
>> + reg = <0x0 0x7a000 0x0 0x18>;
>> + interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;
>> + status = "disabled";
>> + clocks = <&xtal>, <&xtal>, <&xtal>;
>> + clock-names = "xtal", "pclk", "baud";
>> + xtal_tick_en = <1>;
>
> Drop this property
>
>> + fifo-size = <64>;
>
> No need to specify if 64
>
>> + };
>> + };
>> + };
>> +};
>>
>> base-commit: c5468e3c930d4d2937d3a842a85df0f74e95e152
>>
>
> Thanks,
> Neil
>
> .
>
More information about the linux-amlogic
mailing list