projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0493692)
riscv: dts: Change the macro name of prci in each device node
authorZong Li <zong.li@sifive.com>
Fri, 4 Mar 2022 10:03:19 +0000 (18:03 +0800)
committerStephen Boyd <sboyd@kernel.org>
Tue, 15 Mar 2022 22:56:28 +0000 (15:56 -0700)
We currently change the macro name for fu540 and fu740 by adding the
prefix respectively, these marcos are referenced by some device nodes,
they should be modified as well.

Signed-off-by: Zong Li <zong.li@sifive.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Link: https://lore.kernel.org/r/db92d209fa700f7da8bc8028083476fcc138d80e.1646388139.git.zong.li@sifive.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
arch/riscv/boot/dts/sifive/fu540-c000.dtsi patch | blob | history
arch/riscv/boot/dts/sifive/fu740-c000.dtsi patch | blob | history

diff --git a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
index 3eef52b..aad45d7 100644 (file)
--- a/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu540-c000.dtsi
@@ -164,7 +164,7 @@
                        reg = <0x0 0x10010000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <4>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        status = "disabled";
                };
                dma: dma@3000000 {
@@ -180,7 +180,7 @@
                        reg = <0x0 0x10011000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <5>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        status = "disabled";
                };
                i2c0: i2c@10030000 {
@@ -188,7 +188,7 @@
                        reg = <0x0 0x10030000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <50>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        reg-shift = <2>;
                        reg-io-width = <1>;
                        #address-cells = <1>;
@@ -201,7 +201,7 @@
                              <0x0 0x20000000 0x0 0x10000000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <51>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -212,7 +212,7 @@
                              <0x0 0x30000000 0x0 0x10000000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <52>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -222,7 +222,7 @@
                        reg = <0x0 0x10050000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <6>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -235,8 +235,8 @@
                              <0x0 0x100a0000 0x0 0x1000>;
                        local-mac-address = [00 00 00 00 00 00];
                        clock-names = "pclk", "hclk";
-                       clocks = <&prci PRCI_CLK_GEMGXLPLL>,
-                                <&prci PRCI_CLK_GEMGXLPLL>;
+                       clocks = <&prci FU540_PRCI_CLK_GEMGXLPLL>,
+                                <&prci FU540_PRCI_CLK_GEMGXLPLL>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -246,7 +246,7 @@
                        reg = <0x0 0x10020000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <42>, <43>, <44>, <45>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        #pwm-cells = <3>;
                        status = "disabled";
                };
@@ -255,7 +255,7 @@
                        reg = <0x0 0x10021000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <46>, <47>, <48>, <49>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        #pwm-cells = <3>;
                        status = "disabled";
                };
@@ -281,7 +281,7 @@
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
-                       clocks = <&prci PRCI_CLK_TLCLK>;
+                       clocks = <&prci FU540_PRCI_CLK_TLCLK>;
                        status = "disabled";
                };
        };
diff --git a/arch/riscv/boot/dts/sifive/fu740-c000.dtsi b/arch/riscv/boot/dts/sifive/fu740-c000.dtsi
index 8464b0e..7b77c13 100644 (file)
--- a/arch/riscv/boot/dts/sifive/fu740-c000.dtsi
+++ b/arch/riscv/boot/dts/sifive/fu740-c000.dtsi
@@ -166,7 +166,7 @@
                        reg = <0x0 0x10010000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <39>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        status = "disabled";
                };
                uart1: serial@10011000 {
@@ -174,7 +174,7 @@
                        reg = <0x0 0x10011000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <40>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        status = "disabled";
                };
                i2c0: i2c@10030000 {
@@ -182,7 +182,7 @@
                        reg = <0x0 0x10030000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <52>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        reg-shift = <2>;
                        reg-io-width = <1>;
                        #address-cells = <1>;
@@ -194,7 +194,7 @@
                        reg = <0x0 0x10031000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <53>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        reg-shift = <2>;
                        reg-io-width = <1>;
                        #address-cells = <1>;
@@ -207,7 +207,7 @@
                              <0x0 0x20000000 0x0 0x10000000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <41>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -218,7 +218,7 @@
                              <0x0 0x30000000 0x0 0x10000000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <42>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -228,7 +228,7 @@
                        reg = <0x0 0x10050000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <43>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -241,8 +241,8 @@
                              <0x0 0x100a0000 0x0 0x1000>;
                        local-mac-address = [00 00 00 00 00 00];
                        clock-names = "pclk", "hclk";
-                       clocks = <&prci PRCI_CLK_GEMGXLPLL>,
-                                <&prci PRCI_CLK_GEMGXLPLL>;
+                       clocks = <&prci FU740_PRCI_CLK_GEMGXLPLL>,
+                                <&prci FU740_PRCI_CLK_GEMGXLPLL>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
@@ -252,7 +252,7 @@
                        reg = <0x0 0x10020000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <44>, <45>, <46>, <47>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        #pwm-cells = <3>;
                        status = "disabled";
                };
@@ -261,7 +261,7 @@
                        reg = <0x0 0x10021000 0x0 0x1000>;
                        interrupt-parent = <&plic0>;
                        interrupts = <48>, <49>, <50>, <51>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        #pwm-cells = <3>;
                        status = "disabled";
                };
@@ -287,7 +287,7 @@
                        #gpio-cells = <2>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
-                       clocks = <&prci PRCI_CLK_PCLK>;
+                       clocks = <&prci FU740_PRCI_CLK_PCLK>;
                        status = "disabled";
                };
                pcie@e00000000 {
@@ -316,7 +316,7 @@
                                        <0x0 0x0 0x0 0x3 &plic0 59>,
                                        <0x0 0x0 0x0 0x4 &plic0 60>;
                        clock-names = "pcie_aux";
-                       clocks = <&prci PRCI_CLK_PCIE_AUX>;
+                       clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>;
                        pwren-gpios = <&gpio 5 0>;
                        reset-gpios = <&gpio 8 0>;
                        resets = <&prci 4>;
Domain: System / Kernel;