tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

riscv: dts: Change the macro name of prci in each device node

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>

authored by Zong Li and committed by Stephen Boyd 990d627f 0493692b

+24 -24
unified split
+11 -11
arch/riscv/boot/dts/sifive/fu540-c000.dtsi
··· 164 164 reg = <0x0 0x10010000 0x0 0x1000>; 165 165 interrupt-parent = <&plic0>; 166 166 interrupts = <4>; 167 - clocks = <&prci PRCI_CLK_TLCLK>; 167 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 168 168 status = "disabled"; 169 169 }; 170 170 dma: dma@3000000 { ··· 180 180 reg = <0x0 0x10011000 0x0 0x1000>; 181 181 interrupt-parent = <&plic0>; 182 182 interrupts = <5>; 183 - clocks = <&prci PRCI_CLK_TLCLK>; 183 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 184 184 status = "disabled"; 185 185 }; 186 186 i2c0: i2c@10030000 { ··· 188 188 reg = <0x0 0x10030000 0x0 0x1000>; 189 189 interrupt-parent = <&plic0>; 190 190 interrupts = <50>; 191 - clocks = <&prci PRCI_CLK_TLCLK>; 191 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 192 192 reg-shift = <2>; 193 193 reg-io-width = <1>; 194 194 #address-cells = <1>; ··· 201 201 <0x0 0x20000000 0x0 0x10000000>; 202 202 interrupt-parent = <&plic0>; 203 203 interrupts = <51>; 204 - clocks = <&prci PRCI_CLK_TLCLK>; 204 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 205 205 #address-cells = <1>; 206 206 #size-cells = <0>; 207 207 status = "disabled"; ··· 212 212 <0x0 0x30000000 0x0 0x10000000>; 213 213 interrupt-parent = <&plic0>; 214 214 interrupts = <52>; 215 - clocks = <&prci PRCI_CLK_TLCLK>; 215 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 216 216 #address-cells = <1>; 217 217 #size-cells = <0>; 218 218 status = "disabled"; ··· 222 222 reg = <0x0 0x10050000 0x0 0x1000>; 223 223 interrupt-parent = <&plic0>; 224 224 interrupts = <6>; 225 - clocks = <&prci PRCI_CLK_TLCLK>; 225 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 226 226 #address-cells = <1>; 227 227 #size-cells = <0>; 228 228 status = "disabled"; ··· 235 235 <0x0 0x100a0000 0x0 0x1000>; 236 236 local-mac-address = [00 00 00 00 00 00]; 237 237 clock-names = "pclk", "hclk"; 238 - clocks = <&prci PRCI_CLK_GEMGXLPLL>, 239 - <&prci PRCI_CLK_GEMGXLPLL>; 238 + clocks = <&prci FU540_PRCI_CLK_GEMGXLPLL>, 239 + <&prci FU540_PRCI_CLK_GEMGXLPLL>; 240 240 #address-cells = <1>; 241 241 #size-cells = <0>; 242 242 status = "disabled"; ··· 246 246 reg = <0x0 0x10020000 0x0 0x1000>; 247 247 interrupt-parent = <&plic0>; 248 248 interrupts = <42>, <43>, <44>, <45>; 249 - clocks = <&prci PRCI_CLK_TLCLK>; 249 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 250 250 #pwm-cells = <3>; 251 251 status = "disabled"; 252 252 }; ··· 255 255 reg = <0x0 0x10021000 0x0 0x1000>; 256 256 interrupt-parent = <&plic0>; 257 257 interrupts = <46>, <47>, <48>, <49>; 258 - clocks = <&prci PRCI_CLK_TLCLK>; 258 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 259 259 #pwm-cells = <3>; 260 260 status = "disabled"; 261 261 }; ··· 281 281 #gpio-cells = <2>; 282 282 interrupt-controller; 283 283 #interrupt-cells = <2>; 284 - clocks = <&prci PRCI_CLK_TLCLK>; 284 + clocks = <&prci FU540_PRCI_CLK_TLCLK>; 285 285 status = "disabled"; 286 286 }; 287 287 };
+13 -13
arch/riscv/boot/dts/sifive/fu740-c000.dtsi
··· 166 166 reg = <0x0 0x10010000 0x0 0x1000>; 167 167 interrupt-parent = <&plic0>; 168 168 interrupts = <39>; 169 - clocks = <&prci PRCI_CLK_PCLK>; 169 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 170 170 status = "disabled"; 171 171 }; 172 172 uart1: serial@10011000 { ··· 174 174 reg = <0x0 0x10011000 0x0 0x1000>; 175 175 interrupt-parent = <&plic0>; 176 176 interrupts = <40>; 177 - clocks = <&prci PRCI_CLK_PCLK>; 177 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 178 178 status = "disabled"; 179 179 }; 180 180 i2c0: i2c@10030000 { ··· 182 182 reg = <0x0 0x10030000 0x0 0x1000>; 183 183 interrupt-parent = <&plic0>; 184 184 interrupts = <52>; 185 - clocks = <&prci PRCI_CLK_PCLK>; 185 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 186 186 reg-shift = <2>; 187 187 reg-io-width = <1>; 188 188 #address-cells = <1>; ··· 194 194 reg = <0x0 0x10031000 0x0 0x1000>; 195 195 interrupt-parent = <&plic0>; 196 196 interrupts = <53>; 197 - clocks = <&prci PRCI_CLK_PCLK>; 197 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 198 198 reg-shift = <2>; 199 199 reg-io-width = <1>; 200 200 #address-cells = <1>; ··· 207 207 <0x0 0x20000000 0x0 0x10000000>; 208 208 interrupt-parent = <&plic0>; 209 209 interrupts = <41>; 210 - clocks = <&prci PRCI_CLK_PCLK>; 210 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 211 211 #address-cells = <1>; 212 212 #size-cells = <0>; 213 213 status = "disabled"; ··· 218 218 <0x0 0x30000000 0x0 0x10000000>; 219 219 interrupt-parent = <&plic0>; 220 220 interrupts = <42>; 221 - clocks = <&prci PRCI_CLK_PCLK>; 221 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 222 222 #address-cells = <1>; 223 223 #size-cells = <0>; 224 224 status = "disabled"; ··· 228 228 reg = <0x0 0x10050000 0x0 0x1000>; 229 229 interrupt-parent = <&plic0>; 230 230 interrupts = <43>; 231 - clocks = <&prci PRCI_CLK_PCLK>; 231 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 232 232 #address-cells = <1>; 233 233 #size-cells = <0>; 234 234 status = "disabled"; ··· 241 241 <0x0 0x100a0000 0x0 0x1000>; 242 242 local-mac-address = [00 00 00 00 00 00]; 243 243 clock-names = "pclk", "hclk"; 244 - clocks = <&prci PRCI_CLK_GEMGXLPLL>, 245 - <&prci PRCI_CLK_GEMGXLPLL>; 244 + clocks = <&prci FU740_PRCI_CLK_GEMGXLPLL>, 245 + <&prci FU740_PRCI_CLK_GEMGXLPLL>; 246 246 #address-cells = <1>; 247 247 #size-cells = <0>; 248 248 status = "disabled"; ··· 252 252 reg = <0x0 0x10020000 0x0 0x1000>; 253 253 interrupt-parent = <&plic0>; 254 254 interrupts = <44>, <45>, <46>, <47>; 255 - clocks = <&prci PRCI_CLK_PCLK>; 255 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 256 256 #pwm-cells = <3>; 257 257 status = "disabled"; 258 258 }; ··· 261 261 reg = <0x0 0x10021000 0x0 0x1000>; 262 262 interrupt-parent = <&plic0>; 263 263 interrupts = <48>, <49>, <50>, <51>; 264 - clocks = <&prci PRCI_CLK_PCLK>; 264 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 265 265 #pwm-cells = <3>; 266 266 status = "disabled"; 267 267 }; ··· 287 287 #gpio-cells = <2>; 288 288 interrupt-controller; 289 289 #interrupt-cells = <2>; 290 - clocks = <&prci PRCI_CLK_PCLK>; 290 + clocks = <&prci FU740_PRCI_CLK_PCLK>; 291 291 status = "disabled"; 292 292 }; 293 293 pcie@e00000000 { ··· 316 316 <0x0 0x0 0x0 0x3 &plic0 59>, 317 317 <0x0 0x0 0x0 0x4 &plic0 60>; 318 318 clock-names = "pcie_aux"; 319 - clocks = <&prci PRCI_CLK_PCIE_AUX>; 319 + clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>; 320 320 pwren-gpios = <&gpio 5 0>; 321 321 reset-gpios = <&gpio 8 0>; 322 322 resets = <&prci 4>;