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

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

RISC-V Devicetree fix for v6.14-rc6

A single fix for an incorrect define in the jh7110 pinctrl header.

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

* tag 'riscv-dt-fixes-for-v6.14-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions

Link: https://lore.kernel.org/r/20250305-sip-unable-d56ef7dbf86b@spud
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+1 -1
+1 -1
arch/riscv/boot/dts/starfive/jh7110-pinfunc.h
··· 89 89 #define GPOUT_SYS_SDIO1_DATA1 59 90 90 #define GPOUT_SYS_SDIO1_DATA2 60 91 91 #define GPOUT_SYS_SDIO1_DATA3 61 92 - #define GPOUT_SYS_SDIO1_DATA4 63 92 + #define GPOUT_SYS_SDIO1_DATA4 62 93 93 #define GPOUT_SYS_SDIO1_DATA5 63 94 94 #define GPOUT_SYS_SDIO1_DATA6 64 95 95 #define GPOUT_SYS_SDIO1_DATA7 65