Unverified Commit e084a305 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-dt-for-v6.6-final' of... 

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

 into soc/dt

RISC-V Devicetrees for v6.6-final

A single fix for the Starfive VisionFive 2 platform so that chip select
for SPI matches the vendor documentation.

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

* tag 'riscv-dt-for-v6.6-final' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: dts: starfive: visionfive 2: correct spi's ss pin
  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/20231015-outmatch-tragedy-228f91d396b5@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 37d01395 cf98fe6b

arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi

+27 −26
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ uboot@100000 { 
				reg = <0x100000 0x400000>;

			};

			reserved-data@600000 {

				reg = <0x600000 0x1000000>;

				reg = <0x600000 0xa00000>;

			};

		};

	};
@@ -431,7 +431,7 @@ GPOEN_ENABLE, 
		};



		ss-pins {

			pinmux = <GPIOMUX(48, GPOUT_SYS_SPI0_FSS,

			pinmux = <GPIOMUX(49, GPOUT_SYS_SPI0_FSS,

					      GPOEN_ENABLE,

					      GPI_SYS_SPI0_FSS)>;

			bias-disable;
@@ -440,30 +440,6 @@ GPOEN_ENABLE, 
		};

	};



	uart0_pins: uart0-0 {

		tx-pins {

			pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX,

					     GPOEN_ENABLE,

					     GPI_NONE)>;

			bias-disable;

			drive-strength = <12>;

			input-disable;

			input-schmitt-disable;

			slew-rate = <0>;

		};



		rx-pins {

			pinmux = <GPIOMUX(6, GPOUT_LOW,

					     GPOEN_DISABLE,

					     GPI_SYS_UART0_RX)>;

			bias-disable; /* external pull-up */

			drive-strength = <2>;

			input-enable;

			input-schmitt-enable;

			slew-rate = <0>;

		};

	};



	tdm_pins: tdm-0 {

		tx-pins {

			pinmux = <GPIOMUX(44, GPOUT_SYS_TDM_TXD,
@@ -497,6 +473,30 @@ GPOEN_DISABLE, 
			input-enable;

		};

	};



	uart0_pins: uart0-0 {

		tx-pins {

			pinmux = <GPIOMUX(5, GPOUT_SYS_UART0_TX,

					     GPOEN_ENABLE,

					     GPI_NONE)>;

			bias-disable;

			drive-strength = <12>;

			input-disable;

			input-schmitt-disable;

			slew-rate = <0>;

		};



		rx-pins {

			pinmux = <GPIOMUX(6, GPOUT_LOW,

					     GPOEN_DISABLE,

					     GPI_SYS_UART0_RX)>;

			bias-disable; /* external pull-up */

			drive-strength = <2>;

			input-enable;

			input-schmitt-enable;

			slew-rate = <0>;

		};

	};

};



&tdm {
@@ -513,6 +513,7 @@ &uart0 { 


&usb0 {

	dr_mode = "peripheral";

	status = "okay";

};



&U74_1 {