From 76d079204df113afa9e382a43abb5e1a2135150d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:46 +0000 Subject: 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 SVN-Revision: 45711 --- ...-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch | 7 +------ .../002-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch | 9 ++------- ...-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch | 7 +------ ...-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch | 7 +------ ...005-RTC-JZ4740-Init-the-regulator-register-on-startup.patch | 9 ++------- .../linux/xburst/patches-3.18/006-Add-ili8960-lcd-driver.patch | 10 ---------- ...-qi_lb60-Don-t-use-3-wire-spi-mode-for-the-display-fo.patch | 7 +------ 7 files changed, 8 insertions(+), 48 deletions(-) (limited to 'target/linux/xburst') diff --git a/target/linux/xburst/patches-3.18/001-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch b/target/linux/xburst/patches-3.18/001-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch index 180fa1dd9e..19eaf3af3e 100644 --- a/target/linux/xburst/patches-3.18/001-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch +++ b/target/linux/xburst/patches-3.18/001-ubi-Read-only-the-vid-header-instead-of-the-whole-pa.patch @@ -7,11 +7,9 @@ Subject: [PATCH 1/7] ubi: Read only the vid header instead of the whole page drivers/mtd/ubi/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c -index d361349..596b568 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c -@@ -1009,7 +1009,7 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum, +@@ -1009,7 +1009,7 @@ int ubi_io_read_vid_hdr(struct ubi_devic p = (char *)vid_hdr - ubi->vid_hdr_shift; read_err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset, @@ -20,6 +18,3 @@ index d361349..596b568 100644 if (read_err && read_err != UBI_IO_BITFLIPS && !mtd_is_eccerr(read_err)) return read_err; --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/002-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch b/target/linux/xburst/patches-3.18/002-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch index bba9f0bb50..046da51912 100644 --- a/target/linux/xburst/patches-3.18/002-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch +++ b/target/linux/xburst/patches-3.18/002-NAND-Optimize-NAND_ECC_HW_OOB_FIRST-read.patch @@ -8,11 +8,9 @@ Avoid sending unnecessary READ commands to the chip. drivers/mtd/nand/nand_base.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c -index 5b5c627..4c8d646 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -1360,9 +1360,16 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, +@@ -1360,9 +1360,16 @@ static int nand_read_page_hwecc_oob_firs unsigned int max_bitflips = 0; /* Read the OOB area first */ @@ -32,7 +30,7 @@ index 5b5c627..4c8d646 100644 for (i = 0; i < chip->ecc.total; i++) ecc_code[i] = chip->oob_poi[eccpos[i]]; -@@ -1575,7 +1582,9 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, +@@ -1575,7 +1582,9 @@ static int nand_do_read_ops(struct mtd_i __func__, buf); read_retry: @@ -43,6 +41,3 @@ index 5b5c627..4c8d646 100644 /* * Now read the page into the buffer. Absent an error, --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch b/target/linux/xburst/patches-3.18/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch index f3f6ca968e..974eb7a5db 100644 --- a/target/linux/xburst/patches-3.18/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch +++ b/target/linux/xburst/patches-3.18/003-NAND-Add-support-for-subpage-reads-for-NAND_ECC_HW_O.patch @@ -8,11 +8,9 @@ Subject: [PATCH 3/7] NAND: Add support for subpage reads for drivers/mtd/nand/nand_base.c | 77 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c -index 4c8d646..9809059 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -1393,6 +1393,75 @@ static int nand_read_page_hwecc_oob_first(struct mtd_info *mtd, +@@ -1393,6 +1393,75 @@ static int nand_read_page_hwecc_oob_firs } /** @@ -104,6 +102,3 @@ index 4c8d646..9809059 100644 case NAND_ECC_HW: /* Use standard hwecc read page function? */ --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch b/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch index 3de6ee0952..f2c26ade09 100644 --- a/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch +++ b/target/linux/xburst/patches-3.18/004-ASoC-JZ4740-delay-activation-of-the-DAC-to-work-arou.patch @@ -10,11 +10,9 @@ which (I hope) will be done eventually. sound/soc/codecs/jz4740.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c -index df7c01c..6939444 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c -@@ -249,12 +249,15 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec, +@@ -249,12 +249,15 @@ static int jz4740_codec_set_bias_level(s case SND_SOC_BIAS_ON: break; case SND_SOC_BIAS_PREPARE: @@ -33,6 +31,3 @@ index df7c01c..6939444 100644 break; case SND_SOC_BIAS_STANDBY: /* The only way to clear the suspend flag is to reset the codec */ --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/005-RTC-JZ4740-Init-the-regulator-register-on-startup.patch b/target/linux/xburst/patches-3.18/005-RTC-JZ4740-Init-the-regulator-register-on-startup.patch index 2dd8858d4b..f38483ab5c 100644 --- a/target/linux/xburst/patches-3.18/005-RTC-JZ4740-Init-the-regulator-register-on-startup.patch +++ b/target/linux/xburst/patches-3.18/005-RTC-JZ4740-Init-the-regulator-register-on-startup.patch @@ -13,8 +13,6 @@ Signed-off-by: Paul Cercueil drivers/rtc/rtc-jz4740.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c -index 08f5160..5f027dc 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -15,6 +15,7 @@ @@ -25,7 +23,7 @@ index 08f5160..5f027dc 100644 #include #include #include -@@ -216,6 +217,7 @@ static int jz4740_rtc_probe(struct platform_device *pdev) +@@ -216,6 +217,7 @@ static int jz4740_rtc_probe(struct platf struct jz4740_rtc *rtc; uint32_t scratchpad; struct resource *mem; @@ -33,7 +31,7 @@ index 08f5160..5f027dc 100644 rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); if (!rtc) -@@ -263,6 +265,21 @@ static int jz4740_rtc_probe(struct platform_device *pdev) +@@ -263,6 +265,21 @@ static int jz4740_rtc_probe(struct platf } } @@ -55,6 +53,3 @@ index 08f5160..5f027dc 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/006-Add-ili8960-lcd-driver.patch b/target/linux/xburst/patches-3.18/006-Add-ili8960-lcd-driver.patch index 906b9968e7..dc12d93409 100644 --- a/target/linux/xburst/patches-3.18/006-Add-ili8960-lcd-driver.patch +++ b/target/linux/xburst/patches-3.18/006-Add-ili8960-lcd-driver.patch @@ -16,8 +16,6 @@ Signed-off-by: Lars-Peter Clausen 3 files changed, 270 insertions(+) create mode 100644 drivers/video/backlight/ili8960.c -diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index 8d03924..14adcc6 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -59,6 +59,13 @@ config LCD_LTV350QV @@ -34,8 +32,6 @@ index 8d03924..14adcc6 100644 config LCD_ILI922X tristate "ILI Technology ILI9221/ILI9222 support" depends on SPI -diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index fcd50b73..1f89974 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_LCD_CLASS_DEVICE) += lcd.o @@ -46,9 +42,6 @@ index fcd50b73..1f89974 100644 obj-$(CONFIG_LCD_ILI922X) += ili922x.o obj-$(CONFIG_LCD_ILI9320) += ili9320.o obj-$(CONFIG_LCD_L4F00242T03) += l4f00242t03.o -diff --git a/drivers/video/backlight/ili8960.c b/drivers/video/backlight/ili8960.c -new file mode 100644 -index 0000000..61eb815 --- /dev/null +++ b/drivers/video/backlight/ili8960.c @@ -0,0 +1,262 @@ @@ -314,6 +307,3 @@ index 0000000..61eb815 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("LCD driver for Ilitek ili8960"); +MODULE_ALIAS("spi:ili8960"); --- -1.7.10.4 - diff --git a/target/linux/xburst/patches-3.18/007-qi_lb60-Don-t-use-3-wire-spi-mode-for-the-display-fo.patch b/target/linux/xburst/patches-3.18/007-qi_lb60-Don-t-use-3-wire-spi-mode-for-the-display-fo.patch index aa8a4769d5..b8aac66b3e 100644 --- a/target/linux/xburst/patches-3.18/007-qi_lb60-Don-t-use-3-wire-spi-mode-for-the-display-fo.patch +++ b/target/linux/xburst/patches-3.18/007-qi_lb60-Don-t-use-3-wire-spi-mode-for-the-display-fo.patch @@ -9,11 +9,9 @@ The spi_gpio driver does not support 3-wire mode. arch/mips/jz4740/board-qi_lb60.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c -index c454525..04cf890 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c -@@ -312,7 +312,6 @@ static struct spi_board_info qi_lb60_spi_board_info[] = { +@@ -312,7 +312,6 @@ static struct spi_board_info qi_lb60_spi .chip_select = 0, .bus_num = 1, .max_speed_hz = 30 * 1000, @@ -21,6 +19,3 @@ index c454525..04cf890 100644 }, }; --- -1.7.10.4 - -- cgit v1.2.3