Unverified Commit 87a14a96 authored by James Clark's avatar James Clark Committed by Mark Brown
Browse files

spi: spi-fsl-dspi: Re-use one volatile regmap for both device types 



max_register overrides anything in the volatile ranges, so we can get
away with sharing the same one for both types. In a later commit we'll
add more devices so this avoids adding even more duplication. Also
replace the max_register magic numbers with their register definitions
so it's clearer what's going on.

No functional changes.

Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarJames Clark <james.clark@linaro.org>
Link: https://patch.msgid.link/20250522-james-nxp-spi-v2-4-bea884630cfb@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 19272b37

drivers/spi/spi-fsl-dspi.c

+4 −15
Original line number Diff line number Diff line
@@ -1209,6 +1209,7 @@ static const struct regmap_range dspi_volatile_ranges[] = { 
	regmap_reg_range(SPI_MCR, SPI_TCR),

	regmap_reg_range(SPI_SR, SPI_SR),

	regmap_reg_range(SPI_PUSHR, SPI_RXFR3),

	regmap_reg_range(SPI_SREX, SPI_SREX),

};



static const struct regmap_access_table dspi_volatile_table = {
@@ -1220,31 +1221,19 @@ static const struct regmap_config dspi_regmap_config = { 
	.reg_bits	= 32,

	.val_bits	= 32,

	.reg_stride	= 4,

	.max_register	= 0x88,

	.max_register	= SPI_RXFR3,

	.volatile_table	= &dspi_volatile_table,

	.rd_table	= &dspi_access_table,

	.wr_table	= &dspi_access_table,

};



static const struct regmap_range dspi_xspi_volatile_ranges[] = {

	regmap_reg_range(SPI_MCR, SPI_TCR),

	regmap_reg_range(SPI_SR, SPI_SR),

	regmap_reg_range(SPI_PUSHR, SPI_RXFR3),

	regmap_reg_range(SPI_SREX, SPI_SREX),

};



static const struct regmap_access_table dspi_xspi_volatile_table = {

	.yes_ranges	= dspi_xspi_volatile_ranges,

	.n_yes_ranges	= ARRAY_SIZE(dspi_xspi_volatile_ranges),

};



static const struct regmap_config dspi_xspi_regmap_config[] = {

	{

		.reg_bits	= 32,

		.val_bits	= 32,

		.reg_stride	= 4,

		.max_register	= 0x13c,

		.volatile_table	= &dspi_xspi_volatile_table,

		.max_register	= SPI_SREX,

		.volatile_table	= &dspi_volatile_table,

		.rd_table	= &dspi_access_table,

		.wr_table	= &dspi_access_table,

	},