diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 18:56:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-06 18:56:53 +0200 |
| commit | 9f57c13f7ed70a94ecc135645bc764efdd378acd (patch) | |
| tree | eb1f4b7c9fbfd228c38d00e42914f1871371e0bd /drivers | |
| parent | Merge tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | bus: ixp4xx: fix IXP4XX_EXP_T1_MASK (diff) | |
| download | linux-9f57c13f7ed70a94ecc135645bc764efdd378acd.tar.xz linux-9f57c13f7ed70a94ecc135645bc764efdd378acd.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/intel-ixp4xx-eb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/intel-ixp4xx-eb.c b/drivers/bus/intel-ixp4xx-eb.c index f5ba6bee6fd8..320cf307db05 100644 --- a/drivers/bus/intel-ixp4xx-eb.c +++ b/drivers/bus/intel-ixp4xx-eb.c @@ -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 |