Marvell Berlin4CT is a SoC based on 64bit ARMv8 architecture. It contains
quad CA53 cores.
This SoC shares many HW IP with BG2Q and other berlin series. This patchset
was tested on Berlin4CT DMP board, and boot to shell ok.
Since v4:
- rebased on the latest next tree
- adopt Sebastian suggestions such as: move osc out of "/soc" node, use
"Marvell BG4CT DMP board" as model, etc.
- use correct memory size for BG4CT DMP. The total DDR size is 2GB, we start
from 0x01000000, so the avaiable linux memory should be 0x7f000000.
Since v3:
- remove bootargs. follow the same behavior as other arm64 SoCs.
Since v2:
- remove the memreserve which isn't removed by mistake
- add earlycon to enable earlyconsole, inspired by Sudeep
Since v1:
- remove "earlyprintk" bootargs which doesn't work on arm64
- fix GICC_DIR size as pointed out by Mark
- define memory start address instead of memory reservation as suggested by Mark
- add interrupt-affinity to pmu node as pointed out by Sudeep
Jisheng Zhang (2):
arm64: dts: Add dts files for Marvell Berlin4CT SoC
arm64: Enable Marvell Berlin SoC family in Kconfig and defconfig
arch/arm64/Kconfig.platforms | 6 +
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/marvell/Makefile | 5 +
arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 +++++++++++
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++++++++++++++++++++++++++
arch/arm64/configs/defconfig | 1 +
6 files changed, 243 insertions(+)
create mode 100644 arch/arm64/boot/dts/marvell/Makefile
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
--
2.5.0
Add initial dtsi file to support Marvell Berlin4CT SoC with
quad Cortex-A53 CPUs.
It also adds dts file for Marvell Berlin4CT DMP board which is
based on Berlin4CT SoC.
Signed-off-by: Jisheng Zhang <[email protected]>
---
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/marvell/Makefile | 5 +
arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 +++++++++++
arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++++++++++++++++++++++++++
4 files changed, 236 insertions(+)
create mode 100644 arch/arm64/boot/dts/marvell/Makefile
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 1560478..d9f8833 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -6,6 +6,7 @@ dts-dirs += cavium
dts-dirs += exynos
dts-dirs += freescale
dts-dirs += hisilicon
+dts-dirs += marvell
dts-dirs += mediatek
dts-dirs += qcom
dts-dirs += rockchip
diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
new file mode 100644
index 0000000..e2f6afa
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/Makefile
@@ -0,0 +1,5 @@
+dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-dmp.dtb
+
+always := $(dtb-y)
+subdir-y := $(dts-dirs)
+clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts b/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
new file mode 100644
index 0000000..0d70d39
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015 Marvell Technology Group Ltd.
+ *
+ * Author: Jisheng Zhang <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPLv2 or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include "berlin4ct.dtsi"
+
+/ {
+ model = "Marvell BG4CT DMP board";
+ compatible = "marvell,berlin4ct-dmp", "marvell,berlin4ct", "marvell,berlin";
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ device_type = "memory";
+ /* the first 16MB is for firmwares' usage */
+ reg = <0 0x01000000 0 0x7f000000>;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
new file mode 100644
index 0000000..dd4a10d
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2015 Marvell Technology Group Ltd.
+ *
+ * Author: Jisheng Zhang <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPLv2 or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+ compatible = "marvell,berlin4ct", "marvell,berlin";
+ interrupt-parent = <&gic>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ psci {
+ compatible = "arm,psci-0.2";
+ method = "smc";
+ };
+
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu0: cpu@0 {
+ compatible = "arm,cortex-a53", "arm,armv8";
+ device_type = "cpu";
+ reg = <0x0>;
+ enable-method = "psci";
+ };
+
+ cpu1: cpu@1 {
+ compatible = "arm,cortex-a53", "arm,armv8";
+ device_type = "cpu";
+ reg = <0x1>;
+ enable-method = "psci";
+ };
+
+ cpu2: cpu@2 {
+ compatible = "arm,cortex-a53", "arm,armv8";
+ device_type = "cpu";
+ reg = <0x2>;
+ enable-method = "psci";
+ };
+
+ cpu3: cpu@3 {
+ compatible = "arm,cortex-a53", "arm,armv8";
+ device_type = "cpu";
+ reg = <0x3>;
+ enable-method = "psci";
+ };
+ };
+
+ osc: osc {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <25000000>;
+ };
+
+ pmu {
+ compatible = "arm,armv8-pmuv3";
+ interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-affinity = <&cpu0>,
+ <&cpu1>,
+ <&cpu2>,
+ <&cpu3>;
+ };
+
+ timer {
+ compatible = "arm,armv8-timer";
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
+ };
+
+ soc {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0 0xf7000000 0x1000000>;
+
+ gic: interrupt-controller@901000 {
+ compatible = "arm,gic-400";
+ #interrupt-cells = <3>;
+ interrupt-controller;
+ reg = <0x901000 0x1000>,
+ <0x902000 0x2000>,
+ <0x904000 0x2000>,
+ <0x906000 0x2000>;
+ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+ };
+
+ apb@fc0000 {
+ compatible = "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0 0xfc0000 0x10000>;
+ interrupt-parent = <&sic>;
+
+ sic: interrupt-controller@1000 {
+ compatible = "snps,dw-apb-ictl";
+ reg = <0x1000 0x30>;
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ uart0: uart@d000 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0xd000 0x100>;
+ interrupts = <8>;
+ clocks = <&osc>;
+ reg-shift = <2>;
+ status = "disabled";
+ };
+ };
+ };
+};
--
2.5.0
This patch introduces ARCH_BERLIN to enable Marvell Berlin SoC family in
Kconfig and defconfig.
Signed-off-by: Jisheng Zhang <[email protected]>
---
arch/arm64/Kconfig.platforms | 6 ++++++
arch/arm64/configs/defconfig | 1 +
2 files changed, 7 insertions(+)
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index e2deb18..23800a1 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -5,6 +5,12 @@ config ARCH_BCM_IPROC
help
This enables support for Broadcom iProc based SoCs
+config ARCH_BERLIN
+ bool "Marvell Berlin SoC Family"
+ select DW_APB_ICTL
+ help
+ This enables support for Marvell Berlin SoC Family
+
config ARCH_EXYNOS
bool
help
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 913f121..34d71dd 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -32,6 +32,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_BCM_IPROC=y
+CONFIG_ARCH_BERLIN=y
CONFIG_ARCH_EXYNOS7=y
CONFIG_ARCH_FSL_LS2085A=y
CONFIG_ARCH_HISI=y
--
2.5.0
On 07/30/2015 11:35 AM, Jisheng Zhang wrote:
> Marvell Berlin4CT is a SoC based on 64bit ARMv8 architecture. It contains
> quad CA53 cores.
>
> This SoC shares many HW IP with BG2Q and other berlin series. This patchset
> was tested on Berlin4CT DMP board, and boot to shell ok.
>
> Since v4:
> - rebased on the latest next tree
Jisheng,
some git basics, so you get a better idea of the merge process:
Please do not base your patches on linux-next. It is not a stable branch
I can refer to. Also, if there was any dependency with another feature
that your patches require, you should mention that dependency by
pointing out either a floating patch set or even better a _stable_
topic branch of the feature that will be added in the same cycle you
expect your patches to be merged.
AFAIKS, there is no dependency at all so please just base them on -rc1
(No need to resend, I can take care of it).
Anyway, I am fine with the series and it has been out for a while now.
I pick it up, let is set on linux-next for a while and send out a
topic PR at the end of the week.
Thanks!
Sebastian
> - adopt Sebastian suggestions such as: move osc out of "/soc" node, use
> "Marvell BG4CT DMP board" as model, etc.
> - use correct memory size for BG4CT DMP. The total DDR size is 2GB, we start
> from 0x01000000, so the avaiable linux memory should be 0x7f000000.
>
> Since v3:
> - remove bootargs. follow the same behavior as other arm64 SoCs.
>
> Since v2:
> - remove the memreserve which isn't removed by mistake
> - add earlycon to enable earlyconsole, inspired by Sudeep
>
> Since v1:
> - remove "earlyprintk" bootargs which doesn't work on arm64
> - fix GICC_DIR size as pointed out by Mark
> - define memory start address instead of memory reservation as suggested by Mark
> - add interrupt-affinity to pmu node as pointed out by Sudeep
>
> Jisheng Zhang (2):
> arm64: dts: Add dts files for Marvell Berlin4CT SoC
> arm64: Enable Marvell Berlin SoC family in Kconfig and defconfig
>
> arch/arm64/Kconfig.platforms | 6 +
> arch/arm64/boot/dts/Makefile | 1 +
> arch/arm64/boot/dts/marvell/Makefile | 5 +
> arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 +++++++++++
> arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++++++++++++++++++++++++++
> arch/arm64/configs/defconfig | 1 +
> 6 files changed, 243 insertions(+)
> create mode 100644 arch/arm64/boot/dts/marvell/Makefile
> create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
> create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
>
Hi Sebastian,
On Thu, 30 Jul 2015 11:57:27 +0200
Sebastian Hesselbarth <[email protected]> wrote:
> On 07/30/2015 11:35 AM, Jisheng Zhang wrote:
> > Marvell Berlin4CT is a SoC based on 64bit ARMv8 architecture. It contains
> > quad CA53 cores.
> >
> > This SoC shares many HW IP with BG2Q and other berlin series. This patchset
> > was tested on Berlin4CT DMP board, and boot to shell ok.
> >
> > Since v4:
> > - rebased on the latest next tree
>
> Jisheng,
>
> some git basics, so you get a better idea of the merge process:
>
> Please do not base your patches on linux-next. It is not a stable branch
> I can refer to. Also, if there was any dependency with another feature
> that your patches require, you should mention that dependency by
> pointing out either a floating patch set or even better a _stable_
> topic branch of the feature that will be added in the same cycle you
> expect your patches to be merged.
Got it. Thanks for the kindly remind. There's only one dependency:
"arm64: Split out platform options to separate Kconfig" from Olof.
>
> AFAIKS, there is no dependency at all so please just base them on -rc1
I'd like to learn more to avoid future inconvenience. This means it's better
to rebase on 4.2-rc, right?
Another question is: could patches be based on arm-soc tree if necessary?
for example: if I need the "arm64: Split out platform options to separate
Kconfig" commit.
> (No need to resend, I can take care of it).
>
> Anyway, I am fine with the series and it has been out for a while now.
> I pick it up, let is set on linux-next for a while and send out a
> topic PR at the end of the week.
Thanks a lot,
Jisheng
>
> Thanks!
>
> Sebastian
>
> > - adopt Sebastian suggestions such as: move osc out of "/soc" node, use
> > "Marvell BG4CT DMP board" as model, etc.
> > - use correct memory size for BG4CT DMP. The total DDR size is 2GB, we start
> > from 0x01000000, so the avaiable linux memory should be 0x7f000000.
> >
> > Since v3:
> > - remove bootargs. follow the same behavior as other arm64 SoCs.
> >
> > Since v2:
> > - remove the memreserve which isn't removed by mistake
> > - add earlycon to enable earlyconsole, inspired by Sudeep
> >
> > Since v1:
> > - remove "earlyprintk" bootargs which doesn't work on arm64
> > - fix GICC_DIR size as pointed out by Mark
> > - define memory start address instead of memory reservation as suggested by Mark
> > - add interrupt-affinity to pmu node as pointed out by Sudeep
> >
> > Jisheng Zhang (2):
> > arm64: dts: Add dts files for Marvell Berlin4CT SoC
> > arm64: Enable Marvell Berlin SoC family in Kconfig and defconfig
> >
> > arch/arm64/Kconfig.platforms | 6 +
> > arch/arm64/boot/dts/Makefile | 1 +
> > arch/arm64/boot/dts/marvell/Makefile | 5 +
> > arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 +++++++++++
> > arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 164 ++++++++++++++++++++++++++
> > arch/arm64/configs/defconfig | 1 +
> > 6 files changed, 243 insertions(+)
> > create mode 100644 arch/arm64/boot/dts/marvell/Makefile
> > create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts
> > create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct.dtsi
> >
On 07/30/2015 01:13 PM, Jisheng Zhang wrote:
> On Thu, 30 Jul 2015 11:57:27 +0200
> Sebastian Hesselbarth <[email protected]> wrote:
>
>> On 07/30/2015 11:35 AM, Jisheng Zhang wrote:
>>> Marvell Berlin4CT is a SoC based on 64bit ARMv8 architecture. It contains
>>> quad CA53 cores.
>>>
>>> This SoC shares many HW IP with BG2Q and other berlin series. This patchset
>>> was tested on Berlin4CT DMP board, and boot to shell ok.
>>>
>>> Since v4:
>>> - rebased on the latest next tree
>>
>> Jisheng,
>>
>> some git basics, so you get a better idea of the merge process:
>>
>> Please do not base your patches on linux-next. It is not a stable branch
>> I can refer to. Also, if there was any dependency with another feature
>> that your patches require, you should mention that dependency by
>> pointing out either a floating patch set or even better a _stable_
>> topic branch of the feature that will be added in the same cycle you
>> expect your patches to be merged.
>
> Got it. Thanks for the kindly remind. There's only one dependency:
> "arm64: Split out platform options to separate Kconfig" from Olof.
AFAIKS, the patch in question has been applied by Olof for the next
cycle and after 4.2-rc2. You just name the patch, while Olof and I
will have to work it out:
@Olof: Any specific branch you want me to base a potential PR for
the initial Berlin4CT patches on? If you prefer to pick up the
two patches directly, feel free to add my
Acked-by: Sebastian Hesselbarth <[email protected]>
>> AFAIKS, there is no dependency at all so please just base them on -rc1
>
> I'd like to learn more to avoid future inconvenience. This means it's better
> to rebase on 4.2-rc, right?
You can rebase on anything that is considered stable, i.e. my
berlin/foo-for-4.x-n branches become stable as soon as I send out a PR
to arm-soc. Before stable I can reorder/squash/fixup any patches
in there (or anything that will change the commit hash). Once I
declare it stable and anything needs to be changed, I'll have to
apply proper patches or even apply revert patches.
> Another question is: could patches be based on arm-soc tree if necessary?
> for example: if I need the "arm64: Split out platform options to separate
> Kconfig" commit.
Not directly, arm-soc by itself has no stable branches I know of. But
there may be stable topic branches that can be referred to but that
will be worked out on single topics by arm-soc/subsystem maintainers
and patch authors. Likely cross-subsystem patch sets or large patch
sets will end up in topic branches.
Sebastian