Commit 53ed1274 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-dt-fixes-for-v6.10-rc5+' of... 

Merge tag 'riscv-dt-fixes-for-v6.10-rc5+' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into arm/fixes

RISC-V Devicetree fixes for v6.10-rc5+

T-Head:
Jisheng hasn't got enough time to look after the platform, so Drew
Fustini is going to take over.

StarFive:
A fix for a regulator voltage range that prevented using low performance
SD cards.

Canaan:
Cleanup for some "over eager" aliases for serial ports that did not
exist on some boards and I/O devices disabled on boards where they were
not actually in use.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f2661062 e21de658

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -19314,7 +19314,7 @@ F: drivers/perf/riscv_pmu_legacy.c 
F:	drivers/perf/riscv_pmu_sbi.c









RISC-V THEAD SoC SUPPORT









M:	Jisheng Zhang <jszhang@kernel.org>









M:	Drew Fustini <drew@pdp7.com>









M:	Guo Ren <guoren@kernel.org>









M:	Fu Wei <wefu@redhat.com>









L:	linux-riscv@lists.infradead.org

























arch/riscv/boot/dts/canaan/canaan_kd233.dts



+6
−1






























Original line number
Diff line number
Diff line







@@ -15,6 +15,10 @@ / {







	model = "Kendryte KD233";









	compatible = "canaan,kendryte-kd233", "canaan,kendryte-k210";



















	aliases {









		serial0 = &uarths0;









	};



















	chosen {









		bootargs = "earlycon console=ttySIF0";









		stdout-path = "serial0:115200n8";








@@ -46,7 +50,6 @@ key {







&fpioa {









	pinctrl-0 = <&jtag_pinctrl>;









	pinctrl-names = "default";









	status = "okay";



















	jtag_pinctrl: jtag-pinmux {









		pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,








@@ -118,6 +121,7 @@ &i2s0 {







	#sound-dai-cells = <1>;









	pinctrl-0 = <&i2s0_pinctrl>;









	pinctrl-names = "default";









	status = "okay";









};



















&spi0 {








@@ -125,6 +129,7 @@ &spi0 {







	pinctrl-names = "default";









	num-cs = <1>;









	cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;









	status = "okay";



















	panel@0 {









		compatible = "canaan,kd233-tft", "ilitek,ili9341";
































arch/riscv/boot/dts/canaan/k210.dtsi



+16
−7






























Original line number
Diff line number
Diff line







@@ -16,13 +16,6 @@ / {







	#size-cells = <1>;









	compatible = "canaan,kendryte-k210";



















	aliases {









		serial0 = &uarths0;









		serial1 = &uart1;









		serial2 = &uart2;









		serial3 = &uart3;









	};



















	/*









	 * The K210 has an sv39 MMU following the privileged specification v1.9.









	 * Since this is a non-ratified draft specification, the kernel does not








@@ -137,6 +130,7 @@ uarths0: serial@38000000 {







			reg = <0x38000000 0x1000>;









			interrupts = <33>;









			clocks = <&sysclk K210_CLK_CPU>;









			status = "disabled";









		};



















		gpio0: gpio-controller@38001000 {








@@ -152,6 +146,7 @@ gpio0: gpio-controller@38001000 {







				     <62>, <63>, <64>, <65>;









			gpio-controller;









			ngpios = <32>;









			status = "disabled";









		};



















		dmac0: dma-controller@50000000 {








@@ -187,6 +182,7 @@ gpio1: gpio@50200000 {







					 <&sysclk K210_CLK_GPIO>;









				clock-names = "bus", "db";









				resets = <&sysrst K210_RST_GPIO>;









				status = "disabled";



















				gpio1_0: gpio-port@0 {









					#gpio-cells = <2>;








@@ -214,6 +210,7 @@ uart1: serial@50210000 {







				dsr-override;









				cts-override;









				ri-override;









				status = "disabled";









			};



















			uart2: serial@50220000 {








@@ -230,6 +227,7 @@ uart2: serial@50220000 {







				dsr-override;









				cts-override;









				ri-override;









				status = "disabled";









			};



















			uart3: serial@50230000 {








@@ -246,6 +244,7 @@ uart3: serial@50230000 {







				dsr-override;









				cts-override;









				ri-override;









				status = "disabled";









			};



















			spi2: spi@50240000 {








@@ -259,6 +258,7 @@ spi2: spi@50240000 {







					 <&sysclk K210_CLK_APB0>;









				clock-names = "ssi_clk", "pclk";









				resets = <&sysrst K210_RST_SPI2>;









				status = "disabled";









			};



















			i2s0: i2s@50250000 {








@@ -268,6 +268,7 @@ i2s0: i2s@50250000 {







				clocks = <&sysclk K210_CLK_I2S0>;









				clock-names = "i2sclk";









				resets = <&sysrst K210_RST_I2S0>;









				status = "disabled";









			};



















			i2s1: i2s@50260000 {








@@ -277,6 +278,7 @@ i2s1: i2s@50260000 {







				clocks = <&sysclk K210_CLK_I2S1>;









				clock-names = "i2sclk";









				resets = <&sysrst K210_RST_I2S1>;









				status = "disabled";









			};



















			i2s2: i2s@50270000 {








@@ -286,6 +288,7 @@ i2s2: i2s@50270000 {







				clocks = <&sysclk K210_CLK_I2S2>;









				clock-names = "i2sclk";









				resets = <&sysrst K210_RST_I2S2>;









				status = "disabled";









			};



















			i2c0: i2c@50280000 {








@@ -296,6 +299,7 @@ i2c0: i2c@50280000 {







					 <&sysclk K210_CLK_APB0>;









				clock-names = "ref", "pclk";









				resets = <&sysrst K210_RST_I2C0>;









				status = "disabled";









			};



















			i2c1: i2c@50290000 {








@@ -306,6 +310,7 @@ i2c1: i2c@50290000 {







					 <&sysclk K210_CLK_APB0>;









				clock-names = "ref", "pclk";









				resets = <&sysrst K210_RST_I2C1>;









				status = "disabled";









			};



















			i2c2: i2c@502a0000 {








@@ -316,6 +321,7 @@ i2c2: i2c@502a0000 {







					 <&sysclk K210_CLK_APB0>;









				clock-names = "ref", "pclk";









				resets = <&sysrst K210_RST_I2C2>;









				status = "disabled";









			};



















			fpioa: pinmux@502b0000 {








@@ -464,6 +470,7 @@ spi0: spi@52000000 {







				reset-names = "spi";









				num-cs = <4>;









				reg-io-width = <4>;









				status = "disabled";









			};



















			spi1: spi@53000000 {








@@ -479,6 +486,7 @@ spi1: spi@53000000 {







				reset-names = "spi";









				num-cs = <4>;









				reg-io-width = <4>;









				status = "disabled";









			};



















			spi3: spi@54000000 {








@@ -495,6 +503,7 @@ spi3: spi@54000000 {

















				num-cs = <4>;









				reg-io-width = <4>;









				status = "disabled";









			};









		};









	};
































arch/riscv/boot/dts/canaan/k210_generic.dts



+4
−1






























Original line number
Diff line number
Diff line







@@ -15,6 +15,10 @@ / {







	model = "Kendryte K210 generic";









	compatible = "canaan,kendryte-k210";



















	aliases {









		serial0 = &uarths0;









	};



















	chosen {









		bootargs = "earlycon console=ttySIF0";









		stdout-path = "serial0:115200n8";








@@ -24,7 +28,6 @@ chosen {







&fpioa {









	pinctrl-0 = <&jtag_pins>;









	pinctrl-names = "default";









	status = "okay";



















	jtag_pins: jtag-pinmux {









		pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,
































arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts



+8
−1






























Original line number
Diff line number
Diff line







@@ -17,6 +17,10 @@ / {







	compatible = "sipeed,maix-bit", "sipeed,maix-bitm",









		     "canaan,kendryte-k210";



















	aliases {









		serial0 = &uarths0;









	};



















	chosen {









		bootargs = "earlycon console=ttySIF0";









		stdout-path = "serial0:115200n8";








@@ -58,7 +62,6 @@ key-boot {







&fpioa {









	pinctrl-names = "default";









	pinctrl-0 = <&jtag_pinctrl>;









	status = "okay";



















	jtag_pinctrl: jtag-pinmux {









		pinmux = <K210_FPIOA(0, K210_PCF_JTAG_TCLK)>,








@@ -156,6 +159,7 @@ &i2s0 {







	#sound-dai-cells = <1>;









	pinctrl-0 = <&i2s0_pinctrl>;









	pinctrl-names = "default";









	status = "okay";









};



















&i2c1 {








@@ -170,6 +174,7 @@ &spi0 {







	pinctrl-names = "default";









	num-cs = <1>;









	cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;









	status = "okay";



















	panel@0 {









		compatible = "sitronix,st7789v";








@@ -199,6 +204,8 @@ mmc@0 {







};



















&spi3 {









	status = "okay";



















	flash@0 {









		compatible = "jedec,spi-nor";









		reg = <0>;