diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 12:46:31 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 12:46:31 +0300 |
| commit | b62800736f61521547d50fd8cc332cf9b74cbaff (patch) | |
| tree | 449c24496fcdfe96ad57f714ff318bf380733f15 /drivers/memory/renesas-rpc-if.c | |
| parent | 13e87440bf0fd8a45c939bfbb355f0b792113789 (diff) | |
| parent | 32960b4f25c248f13758b8bbe6cc4260828442a1 (diff) | |
| download | linux-b62800736f61521547d50fd8cc332cf9b74cbaff.tar.xz | |
Merge tag 'memory-controller-drv-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers
Memory controller drivers for v6.12, part two
1. Renesas RPC-IF: adjust default setting for pins to accommodate
different flash devices, which should fix 4-bit flash writes with
Renesas AT25QL128A flash.
2. Simplify a bit probe() in PL172 and PL353-SMC.
* tag 'memory-controller-drv-6.12-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
memory: pl353-smc: simplify with scoped for each OF child loop
memory: pl172: simplify releasing AMBA regions with devm
memory: renesas-rpc-if: Use Hi-Z state as the default setting for IOVF pins
Link: https://lore.kernel.org/r/20240906140859.71712-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/memory/renesas-rpc-if.c')
| -rw-r--r-- | drivers/memory/renesas-rpc-if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c index 3167826b236a..7fbd36fa1a1b 100644 --- a/drivers/memory/renesas-rpc-if.c +++ b/drivers/memory/renesas-rpc-if.c @@ -367,7 +367,7 @@ int rpcif_hw_init(struct device *dev, bool hyperflash) regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MOIIO(3) | RPCIF_CMNCR_IOFV(3) | RPCIF_CMNCR_BSZ(3), - RPCIF_CMNCR_MOIIO(1) | RPCIF_CMNCR_IOFV(2) | + RPCIF_CMNCR_MOIIO(1) | RPCIF_CMNCR_IOFV(3) | RPCIF_CMNCR_BSZ(hyperflash ? 1 : 0)); else regmap_update_bits(rpc->regmap, RPCIF_CMNCR, |