kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42463
This commit is contained in:
@@ -24,9 +24,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
create mode 100644 Documentation/devicetree/bindings/spi/spi-sun4i.txt
|
||||
create mode 100644 drivers/spi/spi-sun4i.c
|
||||
|
||||
diff --git a/Documentation/devicetree/bindings/spi/spi-sun4i.txt b/Documentation/devicetree/bindings/spi/spi-sun4i.txt
|
||||
new file mode 100644
|
||||
index 0000000..de827f5
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/spi/spi-sun4i.txt
|
||||
@@ -0,0 +1,24 @@
|
||||
@@ -54,11 +51,9 @@ index 0000000..de827f5
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+};
|
||||
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
|
||||
index 58530d3..78adfae 100644
|
||||
--- a/drivers/spi/Kconfig
|
||||
+++ b/drivers/spi/Kconfig
|
||||
@@ -446,6 +446,12 @@ config SPI_SIRF
|
||||
@@ -455,6 +455,12 @@ config SPI_SIRF
|
||||
help
|
||||
SPI driver for CSR SiRFprimaII SoCs
|
||||
|
||||
@@ -71,11 +66,9 @@ index 58530d3..78adfae 100644
|
||||
config SPI_SUN6I
|
||||
tristate "Allwinner A31 SPI controller"
|
||||
depends on ARCH_SUNXI || COMPILE_TEST
|
||||
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
|
||||
index 13b6ccf9..65f4993 100644
|
||||
--- a/drivers/spi/Makefile
|
||||
+++ b/drivers/spi/Makefile
|
||||
@@ -70,6 +70,7 @@ obj-$(CONFIG_SPI_SH_HSPI) += spi-sh-hspi.o
|
||||
@@ -71,6 +71,7 @@ obj-$(CONFIG_SPI_SH_HSPI) += spi-sh-hsp
|
||||
obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o
|
||||
obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o
|
||||
obj-$(CONFIG_SPI_SIRF) += spi-sirf.o
|
||||
@@ -83,9 +76,6 @@ index 13b6ccf9..65f4993 100644
|
||||
obj-$(CONFIG_SPI_SUN6I) += spi-sun6i.o
|
||||
obj-$(CONFIG_SPI_TEGRA114) += spi-tegra114.o
|
||||
obj-$(CONFIG_SPI_TEGRA20_SFLASH) += spi-tegra20-sflash.o
|
||||
diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
|
||||
new file mode 100644
|
||||
index 0000000..3f82705
|
||||
--- /dev/null
|
||||
+++ b/drivers/spi/spi-sun4i.c
|
||||
@@ -0,0 +1,477 @@
|
||||
@@ -566,6 +556,3 @@ index 0000000..3f82705
|
||||
+MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
|
||||
+MODULE_DESCRIPTION("Allwinner A1X/A20 SPI controller driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.0.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user