Unverified Commit f18f0ac5 authored by Rosen Penev's avatar Rosen Penev Committed by Mark Brown
Browse files

spi: rb4xx: add COMPILE_TEST support 



Copy macros from ath79 SPI driver to allow compilation on all platforms
and remove ath79 specific header.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Message-ID: <20250826212413.15065-3-rosenp@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c73c378d

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -916,7 +916,7 @@ config SPI_ROCKCHIP_SFC 


config SPI_RB4XX

	tristate "Mikrotik RB4XX SPI master"

	depends on SPI_MASTER && ATH79

	depends on SPI_MASTER && (ATH79 || COMPILE_TEST)

	depends on OF

	help

	  SPI controller driver for the Mikrotik RB4xx series boards.

drivers/spi/spi-rb4xx.c

+14 −5
Original line number Diff line number Diff line
@@ -16,7 +16,16 @@ 
#include <linux/spi/spi.h>

#include <linux/of.h>



#include <asm/mach-ath79/ar71xx_regs.h>

#define AR71XX_SPI_REG_FS		0x00	/* Function Select */

#define AR71XX_SPI_REG_CTRL		0x04	/* SPI Control */

#define AR71XX_SPI_REG_IOC		0x08	/* SPI I/O Control */

#define AR71XX_SPI_REG_RDS		0x0c	/* Read Data Shift */



#define AR71XX_SPI_FS_GPIO		BIT(0)	/* Enable GPIO mode */



#define AR71XX_SPI_IOC_DO		BIT(0)	/* Data Out pin */

#define AR71XX_SPI_IOC_CLK		BIT(8)	/* CLK pin */

#define AR71XX_SPI_IOC_CS(n)		BIT(16 + (n))



struct rb4xx_spi {

	void __iomem *base;
@@ -63,7 +72,7 @@ static inline void do_spi_clk_two(struct rb4xx_spi *rbspi, u32 spi_ioc, 
	if (value & BIT(1))

		regval |= AR71XX_SPI_IOC_DO;

	if (value & BIT(0))

		regval |= AR71XX_SPI_IOC_CS2;

		regval |= AR71XX_SPI_IOC_CS(2);



	rb4xx_write(rbspi, AR71XX_SPI_REG_IOC, regval);

	rb4xx_write(rbspi, AR71XX_SPI_REG_IOC, regval | AR71XX_SPI_IOC_CLK);
@@ -89,7 +98,7 @@ static void rb4xx_set_cs(struct spi_device *spi, bool enable) 
	 */

	if (enable)

		rb4xx_write(rbspi, AR71XX_SPI_REG_IOC,

			    AR71XX_SPI_IOC_CS0 | AR71XX_SPI_IOC_CS1);

			    AR71XX_SPI_IOC_CS(0) | AR71XX_SPI_IOC_CS(1));

}



static int rb4xx_transfer_one(struct spi_controller *host,
@@ -109,10 +118,10 @@ static int rb4xx_transfer_one(struct spi_controller *host, 
	 */

	if (spi_get_chipselect(spi, 0) == 2)

		/* MMC */

		spi_ioc = AR71XX_SPI_IOC_CS0;

		spi_ioc = AR71XX_SPI_IOC_CS(0);

	else

		/* Boot flash and CPLD */

		spi_ioc = AR71XX_SPI_IOC_CS1;

		spi_ioc = AR71XX_SPI_IOC_CS(1);



	tx_buf = t->tx_buf;

	rx_buf = t->rx_buf;