diff --git a/boards/arm/qemu_raspi3/qemu_raspi3.dts b/boards/arm/qemu_raspi3/qemu_raspi3.dts index cc643b1fb8672b837317fdc91e0094ab014e059a..d3e7259feedbecc056c970a2f02415740839369a 100644 --- a/boards/arm/qemu_raspi3/qemu_raspi3.dts +++ b/boards/arm/qemu_raspi3/qemu_raspi3.dts @@ -1,9 +1,9 @@ /* - * Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com> - * - * SPDX-License-Identifier: Apache-2.0 - * - */ +* Copyright (c) 2019 Carlo Caione <ccaione@baylibre.com> +* +* SPDX-License-Identifier: Apache-2.0 +* +*/ /dts-v1/; @@ -11,7 +11,7 @@ #include <arm/armv8-a.dtsi> / { - interrupt-parent = <&intc>; + interrupt-parent = <&intc>; cpus { #address-cells = <1>; @@ -23,7 +23,7 @@ reg = <0>; }; - cpu@1 { + cpu@1 { device_type = "cpu"; compatible = "arm,cortex-a53"; reg = <1>; @@ -43,71 +43,71 @@ }; soc { - /* https://github.com/s-matyukevich/raspberry-pi-os/blob/master/docs/lesson03/rpi-os.md#configuring-interrupt-controller */ - intc: interrupt-controller@3f00b200 { + /* https://github.com/s-matyukevich/raspberry-pi-os/blob/master/docs/lesson03/rpi-os.md#configuring-interrupt-controller */ + intc: interrupt-controller@3f00b200 { compatible = "brcm,bcm2835-armctrl-ic"; reg = <0x3f00b200 0x200>; interrupt-controller; #interrupt-cells = <3>; - label = "intc"; + label = "intc"; }; - local_intc: local_intc@40000000 { + local_intc: local_intc@40000000 { compatible = "brcm,bcm2835-l1-intc"; reg = <0x40000000 0x100>; interrupt-controller; #interrupt-cells = <3>; - label = "l1-intc"; + label = "l1-intc"; }; - timer { - compatible = "arm,arm-timer"; - interrupt-parent = <&local_intc>; - /* TODO: Is the intc nested into the local_intc? Maybe we can tell zephyr to generate the unique interrupt number for us? */ - interrupts = <72 0 0>, <73 0 0>, <75 0 0>, <74 0 0>; /* CNTPSIRQ, CNTPNSIRQ, CNTVIRQ, CNTHPIRQ */ - label = "arch_timer"; - }; + timer { + compatible = "arm,arm-timer"; + interrupt-parent = <&local_intc>; + /* TODO: Is the intc nested into the local_intc? Maybe we can tell zephyr to generate the unique interrupt number for us? */ + interrupts = <72 0 0>, <73 0 0>, <75 0 0>, <74 0 0>; /* CNTPSIRQ, CNTPNSIRQ, CNTVIRQ, CNTHPIRQ */ + label = "arch_timer"; + }; - /* https://github.com/s-matyukevich/raspberry-pi-os/blob/master/docs/lesson03/rpi-os.md#timer-initialization */ + /* https://github.com/s-matyukevich/raspberry-pi-os/blob/master/docs/lesson03/rpi-os.md#timer-initialization */ timer@3f003000 { compatible = "brcm,bcm2835-system-timer"; reg = <0x3f003000 0x20>; interrupts = <0 0 0>, <1 0 0>, <2 0 0>, <3 0 0>; /* This could be a reference to BCM2835_CLOCK_TIMER, - * but we don't have the driver using the common clock - * support yet. - */ + * but we don't have the driver using the common clock + * support yet. + */ clock-frequency = <1000000>; /* 1MHz */ }; - /* Page 196 in the "BCM2837 ARM Peripherals manual" https://github.com/raspberrypi/documentation/files/1888662/BCM2837-ARM-Peripherals.-.Revised.-.V2-1.pdf */ - /* TODO: This is likely not required. We just need timer@3f003000 for the system clock and armv7-timer for the timer ticks. */ - timer@3f00b000 { + /* Page 196 in the "BCM2837 ARM Peripherals manual" https://github.com/raspberrypi/documentation/files/1888662/BCM2837-ARM-Peripherals.-.Revised.-.V2-1.pdf */ + /* TODO: This is likely not required. We just need timer@3f003000 for the system clock and armv7-timer for the timer ticks. */ + timer@3f00b000 { compatible = "brcm,bcm2835-arm-timer"; reg = <0x3f00b000 0x1000>; interrupts = <64 0 0>; clock-frequency = <1000000>; /* 1MHz */ }; - aux: aux@3f215000 { - compatible = "arm,raspi3_mini"; + aux: aux@3f215000 { + compatible = "arm,raspi3_mini"; /* #clock-cells = <1>; */ reg = <0x3f215000 0x1000>; /* clocks = <&clocks BCM2835_CLOCK_VPU>; */ - label = "UART_1"; + label = "UART_1"; }; - /* sram: memory@80000 { */ - /* device_type = "memory"; */ - /* compatible = "mmio-sram"; */ - /* BCM2837 has 1GiB of RAM. */ - - /* 0x80000 is the memory offset to which the kerenl image is loaded by the bootloader. */ - /* If this is wrong, references to static data in the kernel image are off. */ - /* https://wiki.osdev.org/Raspberry_Pi_Bare_Bones#Pi_3.2C_4 */ - /* reg = <0x80000 1024>; */ - /* label = "sram"; */ - /* }; */ + /* sram: memory@80000 { */ + /* device_type = "memory"; */ + /* compatible = "mmio-sram"; */ + /* BCM2837 has 1GiB of RAM. */ + + /* 0x80000 is the memory offset to which the kerenl image is loaded by the bootloader. */ + /* If this is wrong, references to static data in the kernel image are off. */ + /* https://wiki.osdev.org/Raspberry_Pi_Bare_Bones#Pi_3.2C_4 */ + /* reg = <0x80000 1024>; */ + /* label = "sram"; */ + /* }; */ }; }; @@ -118,8 +118,8 @@ chosen { zephyr,console = &aux; zephyr,shell-uart = &aux; - /* TODO: why has this no effect? falls back to size 0xffffffffffff6000 */ - /* zephyr,sram = &sram; */ + /* TODO: why has this no effect? falls back to size 0xffffffffffff6000 */ + /* zephyr,sram = &sram; */ }; };