Skip to content

Commit 437c99c

Browse files
committed
Merge tag 'riscv-dt-fixes-for-v6.7-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
RISC-V Devicetree fixes for v6.7-rc4 Two fixes, both rather minor. The first fixes some dtbs_check warnings introduced after an update to the bindings, that returns the architecture to being clean of dtbs_check issues. The second relocates a soc-specific property to the appropriate location in $soc.dtsi, and hopefully avoids the same mistake being copy-pasted into more devicetrees. Signed-off-by: Conor Dooley <[email protected]> * tag 'riscv-dt-fixes-for-v6.7-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux: riscv: dts: microchip: move timebase-frequency to mpfs.dtsi riscv: dts: sophgo: remove address-cells from intc node Link: https://lore.kernel.org/r/20231130-maternity-majestic-dd29f0170050@spud Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 1133ae1 + 79997ed commit 437c99c

File tree

7 files changed

+1
-36
lines changed

7 files changed

+1
-36
lines changed

arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
#include <dt-bindings/gpio/gpio.h>
99
#include <dt-bindings/leds/common.h>
1010

11-
/* Clock frequency (in Hz) of the rtcclk */
12-
#define RTCCLK_FREQ 1000000
13-
1411
/ {
1512
model = "Microchip PolarFire-SoC Icicle Kit";
1613
compatible = "microchip,mpfs-icicle-reference-rtlv2210", "microchip,mpfs-icicle-kit",
@@ -29,10 +26,6 @@
2926
stdout-path = "serial1:115200n8";
3027
};
3128

32-
cpus {
33-
timebase-frequency = <RTCCLK_FREQ>;
34-
};
35-
3629
leds {
3730
compatible = "gpio-leds";
3831

arch/riscv/boot/dts/microchip/mpfs-m100pfsevp.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#include "mpfs.dtsi"
1111
#include "mpfs-m100pfs-fabric.dtsi"
1212

13-
/* Clock frequency (in Hz) of the rtcclk */
14-
#define MTIMER_FREQ 1000000
15-
1613
/ {
1714
model = "Aries Embedded M100PFEVPS";
1815
compatible = "aries,m100pfsevp", "microchip,mpfs";
@@ -33,10 +30,6 @@
3330
stdout-path = "serial1:115200n8";
3431
};
3532

36-
cpus {
37-
timebase-frequency = <MTIMER_FREQ>;
38-
};
39-
4033
ddrc_cache_lo: memory@80000000 {
4134
device_type = "memory";
4235
reg = <0x0 0x80000000 0x0 0x40000000>;

arch/riscv/boot/dts/microchip/mpfs-polarberry.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
#include "mpfs.dtsi"
77
#include "mpfs-polarberry-fabric.dtsi"
88

9-
/* Clock frequency (in Hz) of the rtcclk */
10-
#define MTIMER_FREQ 1000000
11-
129
/ {
1310
model = "Sundance PolarBerry";
1411
compatible = "sundance,polarberry", "microchip,mpfs";
@@ -22,10 +19,6 @@
2219
stdout-path = "serial0:115200n8";
2320
};
2421

25-
cpus {
26-
timebase-frequency = <MTIMER_FREQ>;
27-
};
28-
2922
ddrc_cache_lo: memory@80000000 {
3023
device_type = "memory";
3124
reg = <0x0 0x80000000 0x0 0x2e000000>;

arch/riscv/boot/dts/microchip/mpfs-sev-kit.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
#include "mpfs.dtsi"
77
#include "mpfs-sev-kit-fabric.dtsi"
88

9-
/* Clock frequency (in Hz) of the rtcclk */
10-
#define MTIMER_FREQ 1000000
11-
129
/ {
1310
#address-cells = <2>;
1411
#size-cells = <2>;
@@ -28,10 +25,6 @@
2825
stdout-path = "serial1:115200n8";
2926
};
3027

31-
cpus {
32-
timebase-frequency = <MTIMER_FREQ>;
33-
};
34-
3528
reserved-memory {
3629
#address-cells = <2>;
3730
#size-cells = <2>;

arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#include "mpfs.dtsi"
1212
#include "mpfs-tysom-m-fabric.dtsi"
1313

14-
/* Clock frequency (in Hz) of the rtcclk */
15-
#define MTIMER_FREQ 1000000
16-
1714
/ {
1815
model = "Aldec TySOM-M-MPFS250T-REV2";
1916
compatible = "aldec,tysom-m-mpfs250t-rev2", "microchip,mpfs";
@@ -34,10 +31,6 @@
3431
stdout-path = "serial1:115200n8";
3532
};
3633

37-
cpus {
38-
timebase-frequency = <MTIMER_FREQ>;
39-
};
40-
4134
ddrc_cache_lo: memory@80000000 {
4235
device_type = "memory";
4336
reg = <0x0 0x80000000 0x0 0x30000000>;

arch/riscv/boot/dts/microchip/mpfs.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
cpus {
1414
#address-cells = <1>;
1515
#size-cells = <0>;
16+
timebase-frequency = <1000000>;
1617

1718
cpu0: cpu@0 {
1819
compatible = "sifive,e51", "sifive,rocket0", "riscv";

arch/riscv/boot/dts/sophgo/cv1800b.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
cpu0_intc: interrupt-controller {
3535
compatible = "riscv,cpu-intc";
3636
interrupt-controller;
37-
#address-cells = <0>;
3837
#interrupt-cells = <1>;
3938
};
4039
};

0 commit comments

Comments
 (0)