diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
| commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
| tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch | |
| parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
| download | upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip | |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch')
| -rw-r--r-- | target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch b/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch index f2e3b5841c..599d4e2364 100644 --- a/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch +++ b/target/linux/octeon/patches-3.18/150-mmc-octeon-add-host-driver-for-octeon-mmc-controller.patch @@ -1,6 +1,3 @@ -diff --git a/Documentation/devicetree/bindings/mmc/octeon-mmc.txt b/Documentation/devicetree/bindings/mmc/octeon-mmc.txt -new file mode 100644 -index 0000000..40dd7f1 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/octeon-mmc.txt @@ -0,0 +1,69 @@ @@ -73,11 +70,9 @@ index 0000000..40dd7f1 + power-gpios = <&gpio 8 0>; + }; + }; -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 2d6fbdd..5077dfa 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig -@@ -338,6 +338,16 @@ +@@ -405,6 +405,16 @@ config MMC_MXS If unsure, say N. @@ -94,11 +89,9 @@ index 2d6fbdd..5077dfa 100644 config MMC_TIFM_SD tristate "TI Flash Media MMC/SD Interface support" depends on PCI -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index f7b0a77..448bbc9 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -19,6 +19,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o +@@ -19,6 +19,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o @@ -106,9 +99,6 @@ index f7b0a77..448bbc9 100644 obj-$(CONFIG_MMC_OMAP) += omap.o obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o -diff --git a/drivers/mmc/host/octeon_mmc.c b/drivers/mmc/host/octeon_mmc.c -new file mode 100644 -index 0000000..baba5a0 --- /dev/null +++ b/drivers/mmc/host/octeon_mmc.c @@ -0,0 +1,1518 @@ |