summaryrefslogtreecommitdiff
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-12-06 23:51:31 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-12-07 01:41:09 +0200
commitf9974786551750ea47cd1faf1e739d6a39ec2dc7 (patch)
tree6fe2f55dbba4fd5770307280c98d1d7f3544a15e /target/linux/layerscape
parent79a19e5d27db21d2fe9a5c14f8fad365fca9b831 (diff)
downloadmtk-20170518-f9974786551750ea47cd1faf1e739d6a39ec2dc7.zip
mtk-20170518-f9974786551750ea47cd1faf1e739d6a39ec2dc7.tar.gz
mtk-20170518-f9974786551750ea47cd1faf1e739d6a39ec2dc7.tar.bz2
kernel: bump 4.9 to 4.9.67
Refresh patches. Remove upstreamed patches: - generic/190-1-5-e1000e-Fix-error-path-in-link-detection.patch - generic/190-3-5-e1000e-Fix-return-value-test.patch - generic/190-4-5-e1000e-Separate-signaling-for-link-check-link-up.patch - generic/190-5-5-e1000e-Avoid-receiver-overrun-interrupt-bursts.patch - ramips/0102-MIPS-ralink-Fix-MT7628-pinmux.patch - ramips/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function Update patches that no longer apply: - layerscape/815-spi-support-layerscape.patch - ramips/0099-pci-mt7620.patch Compile-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Runtime-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch2
-rw-r--r--target/linux/layerscape/patches-4.9/815-spi-support-layerscape.patch10
2 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch b/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch
index 66860a0..7216933 100644
--- a/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/301-arch-support-layerscape.patch
@@ -310,7 +310,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#define PROT_SECT_NORMAL (PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL))
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
-@@ -356,6 +356,11 @@ static inline int pmd_protnone(pmd_t pmd
+@@ -370,6 +370,11 @@ static inline int pmd_protnone(pmd_t pmd
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
#define pgprot_writecombine(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
diff --git a/target/linux/layerscape/patches-4.9/815-spi-support-layerscape.patch b/target/linux/layerscape/patches-4.9/815-spi-support-layerscape.patch
index b9c5316..7616809 100644
--- a/target/linux/layerscape/patches-4.9/815-spi-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/815-spi-support-layerscape.patch
@@ -15,16 +15,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
drivers/spi/spi-fsl-dspi.c | 309 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 305 insertions(+), 5 deletions(-)
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -365,6 +365,7 @@ config SPI_FSL_SPI
- config SPI_FSL_DSPI
- tristate "Freescale DSPI controller"
- select REGMAP_MMIO
-+ depends on HAS_DMA
- depends on SOC_VF610 || SOC_LS1021A || ARCH_LAYERSCAPE || COMPILE_TEST
- help
- This enables support for the Freescale DSPI controller in master
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -15,6 +15,8 @@