aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-03-04 15:32:51 +0000
committerMark Brown <broonie@kernel.org>2019-03-04 15:32:51 +0000
commit14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2 (patch)
treef79fb71b6206ef40aa34c52649053a2aaa493a3c /arch/mips
parentMerge branch 'spi-5.0' into spi-linus (diff)
parentspi: sh-msiof: Restrict bits per word to 8/16/24/32 on R-Car Gen2/3 (diff)
downloadlinux-dev-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.tar.xz
linux-dev-14dbfb417bd80c96ec700c7a8414bb6f5db7ecd2.zip
Merge branch 'spi-5.1' into spi-next
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ath79/dev-spi.h2
-rw-r--r--arch/mips/include/asm/mach-ath79/ath79_spi_platform.h19
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/mips/ath79/dev-spi.h b/arch/mips/ath79/dev-spi.h
index d732565ca736..6e15bc8651be 100644
--- a/arch/mips/ath79/dev-spi.h
+++ b/arch/mips/ath79/dev-spi.h
@@ -13,7 +13,7 @@
#define _ATH79_DEV_SPI_H
#include <linux/spi/spi.h>
-#include <asm/mach-ath79/ath79_spi_platform.h>
+#include <linux/platform_data/spi-ath79.h>
void ath79_register_spi(struct ath79_spi_platform_data *pdata,
struct spi_board_info const *info,
diff --git a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h b/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
deleted file mode 100644
index aa71216edf99..000000000000
--- a/arch/mips/include/asm/mach-ath79/ath79_spi_platform.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Platform data definition for Atheros AR71XX/AR724X/AR913X SPI controller
- *
- * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-
-#ifndef _ATH79_SPI_PLATFORM_H
-#define _ATH79_SPI_PLATFORM_H
-
-struct ath79_spi_platform_data {
- unsigned bus_num;
- unsigned num_chipselect;
-};
-
-#endif /* _ATH79_SPI_PLATFORM_H */