OSDN Git Service

spi: lantiq: Move interrupt control register offesets to SoC specific data structure
authorDilip Kota <eswara.kota@linux.intel.com>
Fri, 17 Jul 2020 06:27:52 +0000 (14:27 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 22 Jul 2020 00:55:55 +0000 (01:55 +0100)
Address of Interrupt control registers are different on new chipsets.
So move them to SoC specific data structure.

Signed-off-by: Dilip Kota <eswara.kota@linux.intel.com>
Link: https://lore.kernel.org/r/f0f9723a30ea9c2ee48d2199f7512af9e15803b0.1594957019.git.eswara.kota@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-lantiq-ssc.c

index 2ffe303..78c6b13 100644 (file)
@@ -49,8 +49,6 @@
 #define LTQ_SPI_RXCNT          0x84
 #define LTQ_SPI_DMACON         0xec
 #define LTQ_SPI_IRNEN          0xf4
-#define LTQ_SPI_IRNICR         0xf8
-#define LTQ_SPI_IRNCR          0xfc
 
 #define LTQ_SPI_CLC_SMC_S      16      /* Clock divider for sleep mode */
 #define LTQ_SPI_CLC_SMC_M      (0xFF << LTQ_SPI_CLC_SMC_S)
 #define LTQ_SPI_IRNEN_ALL      0x1F
 
 struct lantiq_ssc_hwcfg {
-       unsigned int irnen_r;
-       unsigned int irnen_t;
+       unsigned int    irnen_r;
+       unsigned int    irnen_t;
+       unsigned int    irncr;
+       unsigned int    irnicr;
 };
 
 struct lantiq_ssc_spi {
@@ -792,13 +792,17 @@ static int lantiq_ssc_transfer_one(struct spi_master *master,
 }
 
 static const struct lantiq_ssc_hwcfg lantiq_ssc_xway = {
-       .irnen_r = LTQ_SPI_IRNEN_R_XWAY,
-       .irnen_t = LTQ_SPI_IRNEN_T_XWAY,
+       .irnen_r        = LTQ_SPI_IRNEN_R_XWAY,
+       .irnen_t        = LTQ_SPI_IRNEN_T_XWAY,
+       .irnicr         = 0xF8,
+       .irncr          = 0xFC,
 };
 
 static const struct lantiq_ssc_hwcfg lantiq_ssc_xrx = {
-       .irnen_r = LTQ_SPI_IRNEN_R_XRX,
-       .irnen_t = LTQ_SPI_IRNEN_T_XRX,
+       .irnen_r        = LTQ_SPI_IRNEN_R_XRX,
+       .irnen_t        = LTQ_SPI_IRNEN_T_XRX,
+       .irnicr         = 0xF8,
+       .irncr          = 0xFC,
 };
 
 static const struct of_device_id lantiq_ssc_match[] = {