Unverified Commit 2a451669 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: pxa2xx: Move contents of linux/spi/pxa2xx_spi.h to a local one 



There is no user of the linux/spi/pxa2xx_spi.h. Move its contents
to the drivers/spi/spi-pxa2xx.h.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240417110334.2671228-4-andriy.shevchenko@linux.intel.com


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

drivers/spi/spi-pxa2xx-dma.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/scatterlist.h>

#include <linux/sizes.h>



#include <linux/spi/pxa2xx_spi.h>

#include <linux/spi/spi.h>



#include "spi-pxa2xx.h"

drivers/spi/spi-pxa2xx-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
#include <linux/pci.h>

#include <linux/platform_device.h>



#include <linux/spi/pxa2xx_spi.h>



#include <linux/dmaengine.h>

#include <linux/platform_data/dma-dw.h>



#include "spi-pxa2xx.h"



#define PCI_DEVICE_ID_INTEL_QUARK_X1000		0x0935

#define PCI_DEVICE_ID_INTEL_BYT			0x0f0e

#define PCI_DEVICE_ID_INTEL_MRFLD		0x1194

drivers/spi/spi-pxa2xx.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <linux/property.h>

#include <linux/slab.h>



#include <linux/spi/pxa2xx_spi.h>

#include <linux/spi/spi.h>



#include "spi-pxa2xx.h"

drivers/spi/spi-pxa2xx.h

+35 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef SPI_PXA2XX_H

#define SPI_PXA2XX_H



#include <linux/dmaengine.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/types.h>
@@ -15,7 +16,40 @@ 
#include <linux/pxa2xx_ssp.h>



struct gpio_desc;

struct pxa2xx_spi_controller;



/*

 * The platform data for SSP controller devices

 * (resides in device.platform_data).

 */

struct pxa2xx_spi_controller {

	u8 num_chipselect;

	u8 enable_dma;

	u8 dma_burst_size;

	bool is_target;



	/* DMA engine specific config */

	dma_filter_fn dma_filter;

	void *tx_param;

	void *rx_param;



	/* For non-PXA arches */

	struct ssp_device ssp;

};



/*

 * The controller specific data for SPI target devices

 * (resides in spi_board_info.controller_data),

 * copied to spi_device.platform_data ... mostly for

 * DMA tuning.

 */

struct pxa2xx_spi_chip {

	u8 tx_threshold;

	u8 tx_hi_threshold;

	u8 rx_threshold;

	u8 dma_burst_size;

	u32 timeout;

};



struct spi_controller;

struct spi_device;

struct spi_transfer;

include/linux/spi/pxa2xx_spi.h

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright (C) 2005 Stephen Street / StreetFire Sound Labs

 */

#ifndef __LINUX_SPI_PXA2XX_SPI_H

#define __LINUX_SPI_PXA2XX_SPI_H



#include <linux/dmaengine.h>

#include <linux/types.h>



#include <linux/pxa2xx_ssp.h>



struct dma_chan;



/*

 * The platform data for SSP controller devices

 * (resides in device.platform_data).

 */

struct pxa2xx_spi_controller {

	u8 num_chipselect;

	u8 enable_dma;

	u8 dma_burst_size;

	bool is_target;



	/* DMA engine specific config */

	dma_filter_fn dma_filter;

	void *tx_param;

	void *rx_param;



	/* For non-PXA arches */

	struct ssp_device ssp;

};



/*

 * The controller specific data for SPI target devices

 * (resides in spi_board_info.controller_data),

 * copied to spi_device.platform_data ... mostly for

 * DMA tuning.

 */

struct pxa2xx_spi_chip {

	u8 tx_threshold;

	u8 tx_hi_threshold;

	u8 rx_threshold;

	u8 dma_burst_size;

	u32 timeout;

};



#endif	/* __LINUX_SPI_PXA2XX_SPI_H */