From fb7ea71c15d2bccb8cc6383d3a08921b79713712 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 26 Mar 2017 12:22:27 +0200 Subject: kernel: update kernel 4.9 to 4.9.17 Signed-off-by: Hauke Mehrtens --- ...TS-Add-base-device-tree-for-Pistachio-SoC.patch | 8 -------- ...-DTS-img-add-device-tree-for-Marduk-board.patch | 12 ----------- ...03-MIPS-DTS-add-img-directory-to-Makefile.patch | 5 ----- ...maengine-img-mdc-Handle-early-status-read.patch | 7 +------ ...spi-img-spfi-Implement-dual-and-quad-mode.patch | 13 ++++-------- ...i-set-device-select-bits-for-SPFI-port-st.patch | 7 +------ ...i-use-device-0-configuration-for-all-devi.patch | 9 ++------- ...g-spfi-RX-maximum-burst-size-for-DMA-is-8.patch | 9 ++------- ...pi-img-spfi-finish-every-transfer-cleanly.patch | 15 +++++--------- ...-Retry-programming-min-delta-up-to-10-tim.patch | 7 +------ ...clk-pistachio-Fix-wrong-SDHost-card-speed.patch | 11 ++--------- ...S-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch | 5 ----- ...mtd-nor-support-mtd-name-from-device-tree.patch | 9 ++------- ...eck-length-of-ID-before-reading-bits-per-.patch | 7 +------ ...-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch | 11 ++--------- .../413-mtd-Introduce-SPI-NAND-framework.patch | 23 ++-------------------- .../414-mtd-spi-nand-Support-Gigadevice-GD5F.patch | 10 ---------- .../patches-4.9/701-net-micrel-Disable-PME.patch | 9 ++------- ...IPS-DTS-img-marduk-add-nor-partition-name.patch | 5 ----- ...PS-DTS-img-marduk-add-nand-device-support.patch | 5 ----- 20 files changed, 27 insertions(+), 160 deletions(-) (limited to 'target/linux/pistachio') diff --git a/target/linux/pistachio/patches-4.9/001-MIPS-DTS-Add-base-device-tree-for-Pistachio-SoC.patch b/target/linux/pistachio/patches-4.9/001-MIPS-DTS-Add-base-device-tree-for-Pistachio-SoC.patch index 54d7f86f67..35aa5536f8 100644 --- a/target/linux/pistachio/patches-4.9/001-MIPS-DTS-Add-base-device-tree-for-Pistachio-SoC.patch +++ b/target/linux/pistachio/patches-4.9/001-MIPS-DTS-Add-base-device-tree-for-Pistachio-SoC.patch @@ -43,8 +43,6 @@ Signed-off-by: Ralf Baechle 2 files changed, 925 insertions(+), 1 deletion(-) create mode 100644 arch/mips/boot/dts/img/pistachio.dtsi -diff --git a/MAINTAINERS b/MAINTAINERS -index 63cefa6..f0037c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9569,7 +9569,7 @@ L: linux-mips@linux-mips.org @@ -56,9 +54,6 @@ index 63cefa6..f0037c7 100644 F: arch/mips/configs/pistachio*_defconfig PKTCDVD DRIVER -diff --git a/arch/mips/boot/dts/img/pistachio.dtsi b/arch/mips/boot/dts/img/pistachio.dtsi -new file mode 100644 -index 0000000..57809f6 --- /dev/null +++ b/arch/mips/boot/dts/img/pistachio.dtsi @@ -0,0 +1,924 @@ @@ -986,6 +981,3 @@ index 0000000..57809f6 + clock-output-names = "xtal"; + }; +}; --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/002-MIPS-DTS-img-add-device-tree-for-Marduk-board.patch b/target/linux/pistachio/patches-4.9/002-MIPS-DTS-img-add-device-tree-for-Marduk-board.patch index 2682ac2d3d..a922ad6630 100644 --- a/target/linux/pistachio/patches-4.9/002-MIPS-DTS-img-add-device-tree-for-Marduk-board.patch +++ b/target/linux/pistachio/patches-4.9/002-MIPS-DTS-img-add-device-tree-for-Marduk-board.patch @@ -37,9 +37,6 @@ Acked-by: James Hartley create mode 100644 arch/mips/boot/dts/img/Makefile create mode 100644 arch/mips/boot/dts/img/pistachio_marduk.dts -diff --git a/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt b/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt -new file mode 100644 -index 0000000..2d5126d --- /dev/null +++ b/Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt @@ -0,0 +1,10 @@ @@ -53,9 +50,6 @@ index 0000000..2d5126d + +It is also known as Creator Ci40. Marduk is legacy name and will +be there for decades. -diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile -new file mode 100644 -index 0000000..69a65f0 --- /dev/null +++ b/arch/mips/boot/dts/img/Makefile @@ -0,0 +1,9 @@ @@ -68,9 +62,6 @@ index 0000000..69a65f0 + +always := $(dtb-y) +clean-files := *.dtb *.dtb.S -diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts -new file mode 100644 -index 0000000..cf9cebd --- /dev/null +++ b/arch/mips/boot/dts/img/pistachio_marduk.dts @@ -0,0 +1,163 @@ @@ -237,6 +228,3 @@ index 0000000..cf9cebd + status = "okay"; + clock-frequency = <400000>; +}; --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/003-MIPS-DTS-add-img-directory-to-Makefile.patch b/target/linux/pistachio/patches-4.9/003-MIPS-DTS-add-img-directory-to-Makefile.patch index 7d06f6f1c9..aaeccab161 100644 --- a/target/linux/pistachio/patches-4.9/003-MIPS-DTS-add-img-directory-to-Makefile.patch +++ b/target/linux/pistachio/patches-4.9/003-MIPS-DTS-add-img-directory-to-Makefile.patch @@ -11,8 +11,6 @@ Signed-off-by: Ian Pozella arch/mips/boot/dts/Makefile | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile -index fc7a0a9..b9db492 100644 --- a/arch/mips/boot/dts/Makefile +++ b/arch/mips/boot/dts/Makefile @@ -1,5 +1,6 @@ @@ -22,6 +20,3 @@ index fc7a0a9..b9db492 100644 dts-dirs += ingenic dts-dirs += lantiq dts-dirs += mti --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/101-dmaengine-img-mdc-Handle-early-status-read.patch b/target/linux/pistachio/patches-4.9/101-dmaengine-img-mdc-Handle-early-status-read.patch index 8d62699270..3389182176 100644 --- a/target/linux/pistachio/patches-4.9/101-dmaengine-img-mdc-Handle-early-status-read.patch +++ b/target/linux/pistachio/patches-4.9/101-dmaengine-img-mdc-Handle-early-status-read.patch @@ -14,11 +14,9 @@ Signed-off-by: Damien Horsley drivers/dma/img-mdc-dma.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) -diff --git a/drivers/dma/img-mdc-dma.c b/drivers/dma/img-mdc-dma.c -index 624f1e1..0216e2c 100644 --- a/drivers/dma/img-mdc-dma.c +++ b/drivers/dma/img-mdc-dma.c -@@ -623,25 +623,33 @@ static enum dma_status mdc_tx_status(struct dma_chan *chan, +@@ -623,25 +623,33 @@ static enum dma_status mdc_tx_status(str (MDC_CMDS_PROCESSED_CMDS_DONE_MASK + 1); /* @@ -68,6 +66,3 @@ index 624f1e1..0216e2c 100644 } } spin_unlock_irqrestore(&mchan->vc.lock, flags); --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/102-spi-img-spfi-Implement-dual-and-quad-mode.patch b/target/linux/pistachio/patches-4.9/102-spi-img-spfi-Implement-dual-and-quad-mode.patch index ee768c4623..15a5d3c806 100644 --- a/target/linux/pistachio/patches-4.9/102-spi-img-spfi-Implement-dual-and-quad-mode.patch +++ b/target/linux/pistachio/patches-4.9/102-spi-img-spfi-Implement-dual-and-quad-mode.patch @@ -26,8 +26,6 @@ Signed-off-by: Ezequiel Garcia drivers/spi/spi-img-spfi.c | 96 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 11 deletions(-) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index 7a37090..c845a50 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -40,7 +40,8 @@ @@ -68,7 +66,7 @@ index 7a37090..c845a50 100644 }; struct img_spfi_device_data { -@@ -123,9 +131,11 @@ static inline void spfi_start(struct img_spfi *spfi) +@@ -123,9 +131,11 @@ static inline void spfi_start(struct img { u32 val; @@ -83,7 +81,7 @@ index 7a37090..c845a50 100644 } static inline void spfi_reset(struct img_spfi *spfi) -@@ -138,12 +148,21 @@ static int spfi_wait_all_done(struct img_spfi *spfi) +@@ -138,12 +148,21 @@ static int spfi_wait_all_done(struct img { unsigned long timeout = jiffies + msecs_to_jiffies(50); @@ -105,7 +103,7 @@ index 7a37090..c845a50 100644 return 0; } cpu_relax(); -@@ -494,9 +513,32 @@ static void img_spfi_config(struct spi_master *master, struct spi_device *spi, +@@ -494,9 +513,32 @@ static void img_spfi_config(struct spi_m struct spi_transfer *xfer) { struct img_spfi *spfi = spi_master_get_devdata(spi->master); @@ -139,7 +137,7 @@ index 7a37090..c845a50 100644 * output = spfi_clk * (BITCLK / 512), where BITCLK must be a * power of 2 up to 128 */ -@@ -509,20 +551,52 @@ static void img_spfi_config(struct spi_master *master, struct spi_device *spi, +@@ -509,20 +551,52 @@ static void img_spfi_config(struct spi_m val |= div << SPFI_DEVICE_PARAMETER_BITCLK_SHIFT; spfi_writel(spfi, val, SPFI_DEVICE_PARAMETER(spi->chip_select)); @@ -198,6 +196,3 @@ index 7a37090..c845a50 100644 xfer->rx_nbits == SPI_NBITS_QUAD) val |= SPFI_CONTROL_TMODE_QUAD << SPFI_CONTROL_TMODE_SHIFT; val |= SPFI_CONTROL_SE; --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/103-spi-img-spfi-set-device-select-bits-for-SPFI-port-st.patch b/target/linux/pistachio/patches-4.9/103-spi-img-spfi-set-device-select-bits-for-SPFI-port-st.patch index d5bf309b4e..ba70348da9 100644 --- a/target/linux/pistachio/patches-4.9/103-spi-img-spfi-set-device-select-bits-for-SPFI-port-st.patch +++ b/target/linux/pistachio/patches-4.9/103-spi-img-spfi-set-device-select-bits-for-SPFI-port-st.patch @@ -13,11 +13,9 @@ Signed-off-by: Ionela Voinescu drivers/spi/spi-img-spfi.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index c845a50..0d73d31 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c -@@ -438,6 +438,9 @@ static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg) +@@ -438,6 +438,9 @@ static int img_spfi_prepare(struct spi_m u32 val; val = spfi_readl(spfi, SPFI_PORT_STATE); @@ -27,6 +25,3 @@ index c845a50..0d73d31 100644 if (msg->spi->mode & SPI_CPHA) val |= SPFI_PORT_STATE_CK_PHASE(msg->spi->chip_select); else --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch b/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch index 01143e2c3b..6c9e6b5a76 100644 --- a/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch +++ b/target/linux/pistachio/patches-4.9/104-spi-img-spfi-use-device-0-configuration-for-all-devi.patch @@ -13,11 +13,9 @@ Signed-off-by: Ionela Voinescu drivers/spi/spi-img-spfi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index 0d73d31..231b59c 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c -@@ -437,18 +437,23 @@ static int img_spfi_prepare(struct spi_master *master, struct spi_message *msg) +@@ -437,18 +437,23 @@ static int img_spfi_prepare(struct spi_m struct img_spfi *spfi = spi_master_get_devdata(master); u32 val; @@ -46,7 +44,7 @@ index 0d73d31..231b59c 100644 spfi_writel(spfi, val, SPFI_PORT_STATE); return 0; -@@ -548,11 +553,15 @@ static void img_spfi_config(struct spi_master *master, struct spi_device *spi, +@@ -548,11 +553,15 @@ static void img_spfi_config(struct spi_m div = DIV_ROUND_UP(clk_get_rate(spfi->spfi_clk), xfer->speed_hz); div = clamp(512 / (1 << get_count_order(div)), 1, 128); @@ -64,6 +62,3 @@ index 0d73d31..231b59c 100644 if (!list_is_last(&xfer->transfer_list, &master->cur_msg->transfers) && /* --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/105-spi-img-spfi-RX-maximum-burst-size-for-DMA-is-8.patch b/target/linux/pistachio/patches-4.9/105-spi-img-spfi-RX-maximum-burst-size-for-DMA-is-8.patch index 47fcf3c0ba..0067b0ea4a 100644 --- a/target/linux/pistachio/patches-4.9/105-spi-img-spfi-RX-maximum-burst-size-for-DMA-is-8.patch +++ b/target/linux/pistachio/patches-4.9/105-spi-img-spfi-RX-maximum-burst-size-for-DMA-is-8.patch @@ -27,11 +27,9 @@ Signed-off-by: Ionela Voinescu drivers/spi/spi-img-spfi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index 231b59c..8ad6c75 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c -@@ -346,12 +346,11 @@ static int img_spfi_start_dma(struct spi_master *master, +@@ -346,12 +346,11 @@ static int img_spfi_start_dma(struct spi if (xfer->len % 4 == 0) { rxconf.src_addr = spfi->phys + SPFI_RX_32BIT_VALID_DATA; rxconf.src_addr_width = 4; @@ -45,7 +43,7 @@ index 231b59c..8ad6c75 100644 dmaengine_slave_config(spfi->rx_ch, &rxconf); rxdesc = dmaengine_prep_slave_sg(spfi->rx_ch, xfer->rx_sg.sgl, -@@ -370,12 +369,11 @@ static int img_spfi_start_dma(struct spi_master *master, +@@ -370,12 +369,11 @@ static int img_spfi_start_dma(struct spi if (xfer->len % 4 == 0) { txconf.dst_addr = spfi->phys + SPFI_TX_32BIT_VALID_DATA; txconf.dst_addr_width = 4; @@ -59,6 +57,3 @@ index 231b59c..8ad6c75 100644 dmaengine_slave_config(spfi->tx_ch, &txconf); txdesc = dmaengine_prep_slave_sg(spfi->tx_ch, xfer->tx_sg.sgl, --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch b/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch index f75f0fbc57..0f958314e3 100644 --- a/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch +++ b/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch @@ -22,8 +22,6 @@ Signed-off-by: Ionela Voinescu drivers/spi/spi-img-spfi.c | 49 +++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index 8ad6c75..a124423 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -83,6 +83,14 @@ @@ -41,7 +39,7 @@ index 8ad6c75..a124423 100644 /* * There are four parallel FIFOs of 16 bytes each. The word buffer * (*_32BIT_VALID_DATA) accesses all four FIFOs at once, resulting in an -@@ -144,6 +152,23 @@ static inline void spfi_reset(struct img_spfi *spfi) +@@ -144,6 +152,23 @@ static inline void spfi_reset(struct img spfi_writel(spfi, 0, SPFI_CONTROL); } @@ -65,7 +63,7 @@ index 8ad6c75..a124423 100644 static int spfi_wait_all_done(struct img_spfi *spfi) { unsigned long timeout = jiffies + msecs_to_jiffies(50); -@@ -152,19 +177,9 @@ static int spfi_wait_all_done(struct img_spfi *spfi) +@@ -152,19 +177,9 @@ static int spfi_wait_all_done(struct img return 0; while (time_before(jiffies, timeout)) { @@ -87,7 +85,7 @@ index 8ad6c75..a124423 100644 cpu_relax(); } -@@ -296,6 +311,8 @@ static int img_spfi_start_pio(struct spi_master *master, +@@ -296,6 +311,8 @@ static int img_spfi_start_pio(struct spi } ret = spfi_wait_all_done(spfi); @@ -96,7 +94,7 @@ index 8ad6c75..a124423 100644 if (ret < 0) return ret; -@@ -311,8 +328,10 @@ static void img_spfi_dma_rx_cb(void *data) +@@ -311,8 +328,10 @@ static void img_spfi_dma_rx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->rx_dma_busy = false; @@ -108,7 +106,7 @@ index 8ad6c75..a124423 100644 spin_unlock_irqrestore(&spfi->lock, flags); } -@@ -325,8 +344,10 @@ static void img_spfi_dma_tx_cb(void *data) +@@ -325,8 +344,10 @@ static void img_spfi_dma_tx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->tx_dma_busy = false; @@ -120,6 +118,3 @@ index 8ad6c75..a124423 100644 spin_unlock_irqrestore(&spfi->lock, flags); } --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/107-clockevents-Retry-programming-min-delta-up-to-10-tim.patch b/target/linux/pistachio/patches-4.9/107-clockevents-Retry-programming-min-delta-up-to-10-tim.patch index 613584e33c..857823b783 100644 --- a/target/linux/pistachio/patches-4.9/107-clockevents-Retry-programming-min-delta-up-to-10-tim.patch +++ b/target/linux/pistachio/patches-4.9/107-clockevents-Retry-programming-min-delta-up-to-10-tim.patch @@ -26,11 +26,9 @@ Signed-off-by: James Hogan kernel/time/clockevents.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) -diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c -index 2c5bc77..ddd7e82 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c -@@ -281,16 +281,28 @@ static int clockevents_program_min_delta(struct clock_event_device *dev) +@@ -281,16 +281,28 @@ static int clockevents_program_min_delta { unsigned long long clc; int64_t delta; @@ -66,6 +64,3 @@ index 2c5bc77..ddd7e82 100644 } #endif /* CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST */ --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/108-clk-pistachio-Fix-wrong-SDHost-card-speed.patch b/target/linux/pistachio/patches-4.9/108-clk-pistachio-Fix-wrong-SDHost-card-speed.patch index da2a873e61..5329ad62d0 100644 --- a/target/linux/pistachio/patches-4.9/108-clk-pistachio-Fix-wrong-SDHost-card-speed.patch +++ b/target/linux/pistachio/patches-4.9/108-clk-pistachio-Fix-wrong-SDHost-card-speed.patch @@ -18,11 +18,9 @@ Signed-off-by: Govindraj Raja include/dt-bindings/clock/pistachio-clk.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/pistachio/clk-pistachio.c b/drivers/clk/pistachio/clk-pistachio.c -index c4ceb5e..1c968d9 100644 --- a/drivers/clk/pistachio/clk-pistachio.c +++ b/drivers/clk/pistachio/clk-pistachio.c -@@ -44,7 +44,7 @@ static struct pistachio_gate pistachio_gates[] __initdata = { +@@ -44,7 +44,7 @@ static struct pistachio_gate pistachio_g GATE(CLK_AUX_ADC_INTERNAL, "aux_adc_internal", "sys_internal_div", 0x104, 22), GATE(CLK_AUX_ADC, "aux_adc", "aux_adc_div", 0x104, 23), @@ -31,7 +29,7 @@ index c4ceb5e..1c968d9 100644 GATE(CLK_BT, "bt", "bt_div", 0x104, 25), GATE(CLK_BT_DIV4, "bt_div4", "bt_div4_div", 0x104, 26), GATE(CLK_BT_DIV8, "bt_div8", "bt_div8_div", 0x104, 27), -@@ -54,6 +54,7 @@ static struct pistachio_gate pistachio_gates[] __initdata = { +@@ -54,6 +54,7 @@ static struct pistachio_gate pistachio_g static struct pistachio_fixed_factor pistachio_ffs[] __initdata = { FIXED_FACTOR(CLK_WIFI_DIV4, "wifi_div4", "wifi_pll", 4), FIXED_FACTOR(CLK_WIFI_DIV8, "wifi_div8", "wifi_pll", 8), @@ -39,8 +37,6 @@ index c4ceb5e..1c968d9 100644 }; static struct pistachio_div pistachio_divs[] __initdata = { -diff --git a/include/dt-bindings/clock/pistachio-clk.h b/include/dt-bindings/clock/pistachio-clk.h -index 039f83f..77b92ae 100644 --- a/include/dt-bindings/clock/pistachio-clk.h +++ b/include/dt-bindings/clock/pistachio-clk.h @@ -21,6 +21,7 @@ @@ -51,6 +47,3 @@ index 039f83f..77b92ae 100644 /* Gate clocks */ #define CLK_MIPS 32 --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/109-MIPS-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch b/target/linux/pistachio/patches-4.9/109-MIPS-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch index 141e401fcb..22fc42b988 100644 --- a/target/linux/pistachio/patches-4.9/109-MIPS-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch +++ b/target/linux/pistachio/patches-4.9/109-MIPS-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch @@ -26,8 +26,6 @@ Signed-off-by: Ian Pozella arch/mips/boot/dts/img/pistachio_marduk.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts -index cf9cebd..7708815 100644 --- a/arch/mips/boot/dts/img/pistachio_marduk.dts +++ b/arch/mips/boot/dts/img/pistachio_marduk.dts @@ -120,7 +120,7 @@ @@ -47,6 +45,3 @@ index cf9cebd..7708815 100644 }; &pwm { --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch index 0ae92f3c86..6e3c7111e6 100644 --- a/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-4.9/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -8,11 +8,9 @@ Signed-off-by: Abhimanyu Vishwakarma drivers/mtd/spi-nor/spi-nor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c -index d0fc165..fcee697 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -1306,6 +1306,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) +@@ -1534,6 +1534,7 @@ int spi_nor_scan(struct spi_nor *nor, co struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; struct device_node *np = spi_nor_get_flash_node(nor); @@ -20,7 +18,7 @@ index d0fc165..fcee697 100644 int ret; int i; -@@ -1361,7 +1362,12 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) +@@ -1598,7 +1599,12 @@ int spi_nor_scan(struct spi_nor *nor, co spi_nor_wait_till_ready(nor); } @@ -34,6 +32,3 @@ index d0fc165..fcee697 100644 mtd->name = dev_name(dev); mtd->priv = nor; mtd->type = MTD_NORFLASH; --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/411-mtd-nand-Check-length-of-ID-before-reading-bits-per-.patch b/target/linux/pistachio/patches-4.9/411-mtd-nand-Check-length-of-ID-before-reading-bits-per-.patch index cd2f8bb123..ac5c16b563 100644 --- a/target/linux/pistachio/patches-4.9/411-mtd-nand-Check-length-of-ID-before-reading-bits-per-.patch +++ b/target/linux/pistachio/patches-4.9/411-mtd-nand-Check-length-of-ID-before-reading-bits-per-.patch @@ -19,11 +19,9 @@ Signed-off-by: Ezequiel Garcia drivers/mtd/nand/nand_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c -index 3bde96a..69b5cac 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -3964,7 +3964,8 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, +@@ -3964,7 +3964,8 @@ static bool find_full_id_nand(struct mtd mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; @@ -33,6 +31,3 @@ index 3bde96a..69b5cac 100644 chip->chipsize = (uint64_t)type->chipsize << 20; chip->options |= type->options; chip->ecc_strength_ds = NAND_ECC_STRENGTH(type); --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch index f8ebac5a1d..eceb304006 100644 --- a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch +++ b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch @@ -13,11 +13,9 @@ Signed-off-by: Ezequiel Garcia include/linux/mtd/nand.h | 1 + 2 files changed, 2 insertions(+) -diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c -index 2af9869..dc80fcd 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c -@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids[] = { +@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids {NAND_MFR_SANDISK, "SanDisk"}, {NAND_MFR_INTEL, "Intel"}, {NAND_MFR_ATO, "ATO"}, @@ -25,11 +23,9 @@ index 2af9869..dc80fcd 100644 {0x0, "Unknown"} }; -diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h -index d8905a2..3a00df7 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h -@@ -928,6 +928,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) +@@ -928,6 +928,7 @@ static inline void nand_set_controller_d #define NAND_MFR_SANDISK 0x45 #define NAND_MFR_INTEL 0x89 #define NAND_MFR_ATO 0x9b @@ -37,6 +33,3 @@ index d8905a2..3a00df7 100644 /* The maximum expected count of bytes in the NAND ID sequence */ #define NAND_MAX_ID_LEN 8 --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/413-mtd-Introduce-SPI-NAND-framework.patch b/target/linux/pistachio/patches-4.9/413-mtd-Introduce-SPI-NAND-framework.patch index d8b268164e..ab5d74ad72 100644 --- a/target/linux/pistachio/patches-4.9/413-mtd-Introduce-SPI-NAND-framework.patch +++ b/target/linux/pistachio/patches-4.9/413-mtd-Introduce-SPI-NAND-framework.patch @@ -44,11 +44,9 @@ Signed-off-by: Ian Pozella create mode 100644 drivers/mtd/spi-nand/spi-nand-base.c create mode 100644 include/linux/mtd/spi-nand.h -diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig -index e83a279..9163d7f 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -334,6 +334,8 @@ source "drivers/mtd/onenand/Kconfig" +@@ -369,6 +369,8 @@ source "drivers/mtd/onenand/Kconfig" source "drivers/mtd/lpddr/Kconfig" @@ -57,20 +55,15 @@ index e83a279..9163d7f 100644 source "drivers/mtd/spi-nor/Kconfig" source "drivers/mtd/ubi/Kconfig" -diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile -index 99bb9a1..38a4756 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -32,5 +32,6 @@ inftl-objs := inftlcore.o inftlmount.o +@@ -35,5 +35,6 @@ inftl-objs := inftlcore.o inftlmount.o obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ +obj-$(CONFIG_MTD_SPI_NAND) += spi-nand/ obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/ obj-$(CONFIG_MTD_UBI) += ubi/ -diff --git a/drivers/mtd/spi-nand/Kconfig b/drivers/mtd/spi-nand/Kconfig -new file mode 100644 -index 0000000..17b31e1 --- /dev/null +++ b/drivers/mtd/spi-nand/Kconfig @@ -0,0 +1,7 @@ @@ -81,16 +74,10 @@ index 0000000..17b31e1 + help + This is the framework for the SPI NAND. + -diff --git a/drivers/mtd/spi-nand/Makefile b/drivers/mtd/spi-nand/Makefile -new file mode 100644 -index 0000000..d454c52 --- /dev/null +++ b/drivers/mtd/spi-nand/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_MTD_SPI_NAND) += spi-nand-base.o -diff --git a/drivers/mtd/spi-nand/spi-nand-base.c b/drivers/mtd/spi-nand/spi-nand-base.c -new file mode 100644 -index 0000000..5d79f85 --- /dev/null +++ b/drivers/mtd/spi-nand/spi-nand-base.c @@ -0,0 +1,566 @@ @@ -660,9 +647,6 @@ index 0000000..5d79f85 +MODULE_AUTHOR("Ezequiel Garcia "); +MODULE_DESCRIPTION("Framework for SPI NAND"); +MODULE_LICENSE("GPL v2"); -diff --git a/include/linux/mtd/spi-nand.h b/include/linux/mtd/spi-nand.h -new file mode 100644 -index 0000000..b5cc99f --- /dev/null +++ b/include/linux/mtd/spi-nand.h @@ -0,0 +1,54 @@ @@ -720,6 +704,3 @@ index 0000000..b5cc99f +void spi_nand_unregister(struct spi_nand *snand); + +#endif --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/414-mtd-spi-nand-Support-Gigadevice-GD5F.patch b/target/linux/pistachio/patches-4.9/414-mtd-spi-nand-Support-Gigadevice-GD5F.patch index 34d2aab12b..1f1461061c 100644 --- a/target/linux/pistachio/patches-4.9/414-mtd-spi-nand-Support-Gigadevice-GD5F.patch +++ b/target/linux/pistachio/patches-4.9/414-mtd-spi-nand-Support-Gigadevice-GD5F.patch @@ -26,8 +26,6 @@ Signed-off-by: Ian Pozella 3 files changed, 483 insertions(+) create mode 100644 drivers/mtd/spi-nand/spi-nand-device.c -diff --git a/drivers/mtd/spi-nand/Kconfig b/drivers/mtd/spi-nand/Kconfig -index 17b31e1..ab6bb6c 100644 --- a/drivers/mtd/spi-nand/Kconfig +++ b/drivers/mtd/spi-nand/Kconfig @@ -5,3 +5,13 @@ menuconfig MTD_SPI_NAND @@ -44,16 +42,11 @@ index 17b31e1..ab6bb6c 100644 + Select this option if you require support for SPI NAND devices. + +endif # MTD_SPI_NAND -diff --git a/drivers/mtd/spi-nand/Makefile b/drivers/mtd/spi-nand/Makefile -index d454c52..6e460d1 100644 --- a/drivers/mtd/spi-nand/Makefile +++ b/drivers/mtd/spi-nand/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_MTD_SPI_NAND) += spi-nand-base.o +obj-$(CONFIG_MTD_SPI_NAND_DEVICES) += spi-nand-device.o -diff --git a/drivers/mtd/spi-nand/spi-nand-device.c b/drivers/mtd/spi-nand/spi-nand-device.c -new file mode 100644 -index 0000000..95db20b --- /dev/null +++ b/drivers/mtd/spi-nand/spi-nand-device.c @@ -0,0 +1,472 @@ @@ -529,6 +522,3 @@ index 0000000..95db20b +MODULE_AUTHOR("Ezequiel Garcia "); +MODULE_DESCRIPTION("SPI NAND device support"); +MODULE_LICENSE("GPL v2"); --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/701-net-micrel-Disable-PME.patch b/target/linux/pistachio/patches-4.9/701-net-micrel-Disable-PME.patch index 4274a353e2..046f00cd49 100644 --- a/target/linux/pistachio/patches-4.9/701-net-micrel-Disable-PME.patch +++ b/target/linux/pistachio/patches-4.9/701-net-micrel-Disable-PME.patch @@ -11,11 +11,9 @@ Signed-off-by: Xue Liu drivers/net/phy/micrel.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c -index ea92d52..73401fb 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c -@@ -273,6 +273,7 @@ static int kszphy_config_init(struct phy_device *phydev) +@@ -273,6 +273,7 @@ static int kszphy_config_init(struct phy struct kszphy_priv *priv = phydev->priv; const struct kszphy_type *type; int ret; @@ -23,7 +21,7 @@ index ea92d52..73401fb 100644 if (!priv) return 0; -@@ -308,6 +309,11 @@ static int kszphy_config_init(struct phy_device *phydev) +@@ -308,6 +309,11 @@ static int kszphy_config_init(struct phy return ret; } @@ -35,6 +33,3 @@ index ea92d52..73401fb 100644 return 0; } --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/901-MIPS-DTS-img-marduk-add-nor-partition-name.patch b/target/linux/pistachio/patches-4.9/901-MIPS-DTS-img-marduk-add-nor-partition-name.patch index e2ccd7af94..6af11eaa36 100644 --- a/target/linux/pistachio/patches-4.9/901-MIPS-DTS-img-marduk-add-nor-partition-name.patch +++ b/target/linux/pistachio/patches-4.9/901-MIPS-DTS-img-marduk-add-nor-partition-name.patch @@ -8,8 +8,6 @@ Signed-off-by: Ian Pozella arch/mips/boot/dts/img/pistachio_marduk.dts | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts -index 7708815..b18aa26 100644 --- a/arch/mips/boot/dts/img/pistachio_marduk.dts +++ b/arch/mips/boot/dts/img/pistachio_marduk.dts @@ -90,6 +90,7 @@ @@ -20,6 +18,3 @@ index 7708815..b18aa26 100644 }; }; --- -2.7.4 - diff --git a/target/linux/pistachio/patches-4.9/902-MIPS-DTS-img-marduk-add-nand-device-support.patch b/target/linux/pistachio/patches-4.9/902-MIPS-DTS-img-marduk-add-nand-device-support.patch index cb96753875..bd03f08126 100644 --- a/target/linux/pistachio/patches-4.9/902-MIPS-DTS-img-marduk-add-nand-device-support.patch +++ b/target/linux/pistachio/patches-4.9/902-MIPS-DTS-img-marduk-add-nand-device-support.patch @@ -8,8 +8,6 @@ Signed-off-by: Abhimanyu Vishwakarma arch/mips/boot/dts/img/pistachio_marduk.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/mips/boot/dts/img/pistachio_marduk.dts b/arch/mips/boot/dts/img/pistachio_marduk.dts -index b18aa26..ed92462 100644 --- a/arch/mips/boot/dts/img/pistachio_marduk.dts +++ b/arch/mips/boot/dts/img/pistachio_marduk.dts @@ -92,6 +92,17 @@ @@ -30,6 +28,3 @@ index b18aa26..ed92462 100644 }; &uart0 { --- -2.7.4 - -- cgit v1.2.3