Skip to content

Commit 4ec8959

Browse files
committed
Merge tag 'spacemit-dt-for-6.17-1' of https://github.com/spacemit-com/linux into soc/dt
RISC-V SpacemiT DT changes for 6.17 - Add DMA translation buses - Add PWM support - Add Reset support - Add eMMC node * tag 'spacemit-dt-for-6.17-1' of https://github.com/spacemit-com/linux: riscv: dts: spacemit: Move eMMC under storage-bus for K1 riscv: dts: spacemit: Move UARTs under dma-bus for K1 riscv: dts: spacemit: Add DMA translation buses for K1 riscv: dts: spacemit: add pwm14_1 pinctrl setting riscv: dts: spacemit: add PWM support for K1 SoC riscv: dts: spacemit: add reset support for the K1 SoC dt-bindings: soc: spacemit: define spacemit,k1-ccu resets riscv: dts: spacemit: enable eMMC for K1 SoC Link: https://lore.kernel.org/r/20250715014214-GYA540030@gentoo Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 99cb440 + 57fa4ba commit 4ec8959

File tree

5 files changed

+558
-113
lines changed

5 files changed

+558
-113
lines changed

Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ properties:
1919
- spacemit,k1-syscon-apbc
2020
- spacemit,k1-syscon-apmu
2121
- spacemit,k1-syscon-mpmu
22+
- spacemit,k1-syscon-rcpu
23+
- spacemit,k1-syscon-rcpu2
24+
- spacemit,k1-syscon-apbc2
2225

2326
reg:
2427
maxItems: 1
@@ -47,23 +50,35 @@ properties:
4750
required:
4851
- compatible
4952
- reg
50-
- clocks
51-
- clock-names
52-
- "#clock-cells"
5353
- "#reset-cells"
5454

5555
allOf:
5656
- if:
5757
properties:
5858
compatible:
5959
contains:
60-
const: spacemit,k1-syscon-apbc
60+
enum:
61+
- spacemit,k1-syscon-apmu
62+
- spacemit,k1-syscon-mpmu
6163
then:
64+
required:
65+
- "#power-domain-cells"
66+
else:
6267
properties:
6368
"#power-domain-cells": false
64-
else:
69+
- if:
70+
properties:
71+
compatible:
72+
contains:
73+
enum:
74+
- spacemit,k1-syscon-apbc
75+
- spacemit,k1-syscon-apmu
76+
- spacemit,k1-syscon-mpmu
77+
then:
6578
required:
66-
- "#power-domain-cells"
79+
- clocks
80+
- clock-names
81+
- "#clock-cells"
6782

6883
additionalProperties: false
6984

arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@
3030
};
3131
};
3232

33+
&emmc {
34+
bus-width = <8>;
35+
mmc-hs400-1_8v;
36+
mmc-hs400-enhanced-strobe;
37+
non-removable;
38+
no-sd;
39+
no-sdio;
40+
status = "okay";
41+
};
42+
3343
&uart0 {
3444
pinctrl-names = "default";
3545
pinctrl-0 = <&uart0_2_cfg>;

arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,12 @@
2020
drive-strength = <32>;
2121
};
2222
};
23+
24+
pwm14_1_cfg: pwm14-1-cfg {
25+
pwm14-1-pins {
26+
pinmux = <K1_PADCONF(44, 4)>;
27+
bias-pull-up = <0>;
28+
drive-strength = <32>;
29+
};
30+
};
2331
};

0 commit comments

Comments
 (0)