diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-03-14 23:23:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-14 23:23:58 +0100 |
| commit | fce5759af901da184dc943e101015759a426a567 (patch) | |
| tree | be04970367a31f8220fd056504c59c96c1513015 | |
| parent | 291632e06d88c0db6d8776773fd07c1bc7b9ed1f (diff) | |
| parent | 5b90a3d6092d9292d3c4fe4eef8969282e070ae3 (diff) | |
Merge tag 'spacemit-dt-for-6.15-1' of https://github.com/spacemit-com/linux into soc/dt
RISC-V SpacemiT DT changes for 6.15
- Add Milk-V Jupiter board
- MAINTAINERS info
* tag 'spacemit-dt-for-6.15-1' of https://github.com/spacemit-com/linux:
riscv: dts: spacemit: Add Milk-V Jupiter board device tree
dt-bindings: riscv: spacemit: Add Milk-V Jupiter board compatible
MAINTAINERS: spacemit: update various info
Link: https://lore.kernel.org/r/20250312003023-GYA76989@gentoo
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | Documentation/devicetree/bindings/riscv/spacemit.yaml | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/spacemit/Makefile | 1 | ||||
| -rw-r--r-- | arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 27 |
4 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/riscv/spacemit.yaml b/Documentation/devicetree/bindings/riscv/spacemit.yaml index 52e55077af1a..077b94f10dca 100644 --- a/Documentation/devicetree/bindings/riscv/spacemit.yaml +++ b/Documentation/devicetree/bindings/riscv/spacemit.yaml @@ -21,6 +21,7 @@ properties: - items: - enum: - bananapi,bpi-f3 + - milkv,jupiter - const: spacemit,k1 additionalProperties: true diff --git a/MAINTAINERS b/MAINTAINERS index 284e9d2929c7..efe0a5e155ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20406,7 +20406,10 @@ F: drivers/perf/riscv_pmu_sbi.c RISC-V SPACEMIT SoC Support M: Yixun Lan <dlan@gentoo.org> L: linux-riscv@lists.infradead.org +L: spacemit@lists.linux.dev S: Maintained +W: https://github.com/spacemit-com/linux/wiki +C: irc://irc.libera.chat/spacemit T: git https://github.com/spacemit-com/linux F: arch/riscv/boot/dts/spacemit/ N: spacemit diff --git a/arch/riscv/boot/dts/spacemit/Makefile b/arch/riscv/boot/dts/spacemit/Makefile index ac617319a574..92e13ce1c16d 100644 --- a/arch/riscv/boot/dts/spacemit/Makefile +++ b/arch/riscv/boot/dts/spacemit/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_SPACEMIT) += k1-bananapi-f3.dtb +dtb-$(CONFIG_ARCH_SPACEMIT) += k1-milkv-jupiter.dtb diff --git a/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts b/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts new file mode 100644 index 000000000000..448319214104 --- /dev/null +++ b/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2024 Yangyu Chen <cyy@cyyself.name> + * Copyright (C) 2025 Javier Martinez Canillas <javierm@redhat.com> + */ + +#include "k1.dtsi" +#include "k1-pinctrl.dtsi" + +/ { + model = "Milk-V Jupiter (K1)"; + compatible = "milkv,jupiter", "spacemit,k1"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0"; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_2_cfg>; + status = "okay"; +}; |