Commit 9f57c13f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "There are three small fixes that came up sincie the past week:

   - an incorrect bit offset in ixp4xx bus driver

   - a riscv randconfig regression in the thead platform I merged

   - whitespace fixes for some dts files"

* tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  bus: ixp4xx: fix IXP4XX_EXP_T1_MASK
  ARM: dts: st: add missing space before {
  RISC-V: make ARCH_THEAD preclude XIP_KERNEL
parents 0b907305 6722e465

arch/riscv/Kconfig.socs

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ config ARCH_SUNXI 


config ARCH_THEAD

	bool "T-HEAD RISC-V SoCs"

	depends on MMU && !XIP_KERNEL

	select ERRATA_THEAD

	help

	  This enables support for the RISC-V based T-HEAD SoCs.

drivers/bus/intel-ixp4xx-eb.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define IXP4XX_EXP_TIMING_STRIDE	0x04

#define IXP4XX_EXP_CS_EN		BIT(31)

#define IXP456_EXP_PAR_EN		BIT(30) /* Only on IXP45x and IXP46x */

#define IXP4XX_EXP_T1_MASK		GENMASK(28, 27)

#define IXP4XX_EXP_T1_MASK		GENMASK(29, 28)

#define IXP4XX_EXP_T1_SHIFT		28

#define IXP4XX_EXP_T2_MASK		GENMASK(27, 26)

#define IXP4XX_EXP_T2_SHIFT		26

arch/arm/boot/dts/st/spear1310.dtsi

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/spear1340.dtsi

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32f429-disco.dts

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi

+3 −3

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi

+3 −3

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi

+3 −3

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stih407-family.dtsi

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stih407-pinctrl.dtsi

+5 −5

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi

+1 −1

File changed.

Contains only whitespace changes.

arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi

+2 −2

File changed.

Contains only whitespace changes.