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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'riscv-dt-fixes-for-v6.6-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes

RISC-V Devicetree fixes for v6.6-rc3

Starfive:
A fix for the size of the NOR flash that was causing complaints from the
MTD subsystem during boot & two issues that a certain someone introduced
while resolving merge conflicts. Of the latter, one is a cosmetic
ordering change & the other lead to the usb controller being disabled.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

* tag 'riscv-dt-fixes-for-v6.6-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
riscv: dts: starfive: visionfive 2: Fix uart0 pins sort order
riscv: dts: starfive: visionfive 2: Enable usb0
riscv: dts: starfive: fix NOR flash reserved-data partition size

Link: https://lore.kernel.org/r/20230916-previous-oversold-9d30891ac6cf@spud
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann c374e875 7d3e4e9d

+26 -25
+26 -25
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
··· 262 262 reg = <0x100000 0x400000>; 263 263 }; 264 264 reserved-data@600000 { 265 - reg = <0x600000 0x1000000>; 265 + reg = <0x600000 0xa00000>; 266 266 }; 267 267 }; 268 268 }; ··· 440 440 }; 441 441 }; 442 442 443 - uart0_pins: uart0-0 { 444 - tx-pins { 445 - pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, 446 - GPOEN_ENABLE, 447 - GPI_NONE)>; 448 - bias-disable; 449 - drive-strength = <12>; 450 - input-disable; 451 - input-schmitt-disable; 452 - slew-rate = <0>; 453 - }; 454 - 455 - rx-pins { 456 - pinmux = <GPIOMUX(6, GPOUT_LOW, 457 - GPOEN_DISABLE, 458 - GPI_SYS_UART0_RX)>; 459 - bias-disable; /* external pull-up */ 460 - drive-strength = <2>; 461 - input-enable; 462 - input-schmitt-enable; 463 - slew-rate = <0>; 464 - }; 465 - }; 466 - 467 443 tdm_pins: tdm-0 { 468 444 tx-pins { 469 445 pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD, ··· 473 497 input-enable; 474 498 }; 475 499 }; 500 + 501 + uart0_pins: uart0-0 { 502 + tx-pins { 503 + pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX, 504 + GPOEN_ENABLE, 505 + GPI_NONE)>; 506 + bias-disable; 507 + drive-strength = <12>; 508 + input-disable; 509 + input-schmitt-disable; 510 + slew-rate = <0>; 511 + }; 512 + 513 + rx-pins { 514 + pinmux = <GPIOMUX(6, GPOUT_LOW, 515 + GPOEN_DISABLE, 516 + GPI_SYS_UART0_RX)>; 517 + bias-disable; /* external pull-up */ 518 + drive-strength = <2>; 519 + input-enable; 520 + input-schmitt-enable; 521 + slew-rate = <0>; 522 + }; 523 + }; 476 524 }; 477 525 478 526 &tdm { ··· 513 513 514 514 &usb0 { 515 515 dr_mode = "peripheral"; 516 + status = "okay"; 516 517 }; 517 518 518 519 &U74_1 {