From 1846efcaaf2944c799f512d9fa8c81479eca3ace Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 27 Nov 2014 18:26:17 +0000 Subject: [PATCH] mpc85xx: refresh linux 3.14 patches Signed-off-by: Felix Fietkau SVN-Revision: 43412 --- ...85xx-add-gpio-keys-to-of-match-table.patch | 2 +- .../patches-3.14/100-fix_mpc8568e_mds.patch | 2 -- .../patches-3.14/110-fix_mpc8548_cds.patch | 2 -- ...0-powerpc-85xx-tl-wdr4900-v1-support.patch | 24 ++----------------- ...pi-fsl-espi-preallocate-local-buffer.patch | 17 ++++--------- 5 files changed, 8 insertions(+), 39 deletions(-) diff --git a/target/linux/mpc85xx/patches-3.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch b/target/linux/mpc85xx/patches-3.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch index da88cedc8c..a46e88b42c 100644 --- a/target/linux/mpc85xx/patches-3.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch +++ b/target/linux/mpc85xx/patches-3.14/001-powerpc-85xx-add-gpio-keys-to-of-match-table.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c -@@ -30,6 +30,7 @@ static struct of_device_id __initdata mpc85xx_common_ids[] = { +@@ -30,6 +30,7 @@ static struct of_device_id __initdata mp { .compatible = "fsl,mpc8548-guts", }, /* Probably unnecessary? */ { .compatible = "gpio-leds", }, diff --git a/target/linux/mpc85xx/patches-3.14/100-fix_mpc8568e_mds.patch b/target/linux/mpc85xx/patches-3.14/100-fix_mpc8568e_mds.patch index 4d06dcba92..993b5f71c3 100644 --- a/target/linux/mpc85xx/patches-3.14/100-fix_mpc8568e_mds.patch +++ b/target/linux/mpc85xx/patches-3.14/100-fix_mpc8568e_mds.patch @@ -18,8 +18,6 @@ L2: l2-cache-controller@20000 { compatible = "fsl,mpc8568-l2-cache-controller"; reg = <0x20000 0x1000>; -diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts -index bead2b6..99ffa57 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts @@ -309,6 +309,9 @@ diff --git a/target/linux/mpc85xx/patches-3.14/110-fix_mpc8548_cds.patch b/target/linux/mpc85xx/patches-3.14/110-fix_mpc8548_cds.patch index 460a94bc19..b6dbd0d1b4 100644 --- a/target/linux/mpc85xx/patches-3.14/110-fix_mpc8548_cds.patch +++ b/target/linux/mpc85xx/patches-3.14/110-fix_mpc8548_cds.patch @@ -26,8 +26,6 @@ L2: l2-cache-controller@20000 { compatible = "fsl,mpc8548-l2-cache-controller"; -diff --git a/arch/powerpc/boot/dts/mpc8548cds_32b.dts b/arch/powerpc/boot/dts/mpc8548cds_32b.dts -index 6fd6316..375ed8b 100644 --- a/arch/powerpc/boot/dts/mpc8548cds_32b.dts +++ b/arch/powerpc/boot/dts/mpc8548cds_32b.dts @@ -75,6 +75,9 @@ diff --git a/target/linux/mpc85xx/patches-3.14/140-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-3.14/140-powerpc-85xx-tl-wdr4900-v1-support.patch index 5cefaa9203..fa6458019f 100644 --- a/target/linux/mpc85xx/patches-3.14/140-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-3.14/140-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -22,11 +22,9 @@ Signed-off-by: Gabor Juhos create mode 100644 arch/powerpc/boot/dts/tl-wdr4900-v1.dts create mode 100644 arch/powerpc/platforms/85xx/tl_wdr4900_v1.c -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index 90e9d95..663fd31 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile -@@ -99,6 +99,8 @@ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \ +@@ -99,6 +99,8 @@ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c @@ -35,7 +33,7 @@ index 90e9d95..663fd31 100644 src-wlib := $(sort $(src-wlib-y)) src-plat := $(sort $(src-plat-y)) -@@ -279,6 +281,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm8555 +@@ -279,6 +281,7 @@ image-$(CONFIG_TQM8555) += cuImage.tqm image-$(CONFIG_TQM8560) += cuImage.tqm8560 image-$(CONFIG_SBC8548) += cuImage.sbc8548 image-$(CONFIG_KSI8560) += cuImage.ksi8560 @@ -43,9 +41,6 @@ index 90e9d95..663fd31 100644 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig image-$(CONFIG_STORCENTER) += cuImage.storcenter -diff --git a/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c b/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c -new file mode 100644 -index 0000000..095e777 --- /dev/null +++ b/arch/powerpc/boot/cuboot-tl-wdr4900-v1.c @@ -0,0 +1,164 @@ @@ -213,9 +208,6 @@ index 0000000..095e777 + + platform_ops.fixups = platform_fixups; +} -diff --git a/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/arch/powerpc/boot/dts/tl-wdr4900-v1.dts -new file mode 100644 -index 0000000..49e516c --- /dev/null +++ b/arch/powerpc/boot/dts/tl-wdr4900-v1.dts @@ -0,0 +1,212 @@ @@ -431,8 +423,6 @@ index 0000000..49e516c +}; + +/include/ "fsl/p1010si-post.dtsi" -diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper -index d27a255..4b43e41 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -205,6 +205,10 @@ cuboot*) @@ -446,8 +436,6 @@ index d27a255..4b43e41 100755 *-amigaone) link_address='0x800000' ;; -diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig -index c17aae8..ead6513 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig @@ -159,6 +159,17 @@ config STX_GP3 @@ -468,8 +456,6 @@ index c17aae8..ead6513 100644 config TQM8540 bool "TQ Components TQM8540" help -diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile -index 25cebe7..14ca496 100644 --- a/arch/powerpc/platforms/85xx/Makefile +++ b/arch/powerpc/platforms/85xx/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_TWR_P102x) += twr_p102x.o @@ -480,9 +466,6 @@ index 25cebe7..14ca496 100644 obj-$(CONFIG_SBC8548) += sbc8548.o obj-$(CONFIG_PPA8548) += ppa8548.o obj-$(CONFIG_SOCRATES) += socrates.o socrates_fpga_pic.o -diff --git a/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c b/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c -new file mode 100644 -index 0000000..95afa4d --- /dev/null +++ b/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c @@ -0,0 +1,145 @@ @@ -631,6 +614,3 @@ index 0000000..95afa4d + .calibrate_decr = generic_calibrate_decr, + .progress = udbg_progress, +}; --- -2.1.3 - diff --git a/target/linux/mpc85xx/patches-3.14/210-spi-fsl-espi-preallocate-local-buffer.patch b/target/linux/mpc85xx/patches-3.14/210-spi-fsl-espi-preallocate-local-buffer.patch index c095510d44..2cbb693ce4 100644 --- a/target/linux/mpc85xx/patches-3.14/210-spi-fsl-espi-preallocate-local-buffer.patch +++ b/target/linux/mpc85xx/patches-3.14/210-spi-fsl-espi-preallocate-local-buffer.patch @@ -36,11 +36,9 @@ Signed-off-by: Gabor Juhos drivers/spi/spi-fsl-lib.h | 1 + 2 files changed, 17 insertions(+), 18 deletions(-) -diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c -index 428dc7a..5207176 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c -@@ -334,17 +334,13 @@ static void fsl_espi_do_trans(struct spi_message *m, +@@ -334,17 +334,13 @@ static void fsl_espi_do_trans(struct spi static void fsl_espi_cmd_trans(struct spi_message *m, struct fsl_espi_transfer *trans, u8 *rx_buff) { @@ -61,7 +59,7 @@ index 428dc7a..5207176 100644 list_for_each_entry(t, &m->transfers, transfer_list) { if (t->tx_buf) { memcpy(local_buf + i, t->tx_buf, t->len); -@@ -357,28 +353,23 @@ static void fsl_espi_cmd_trans(struct spi_message *m, +@@ -357,28 +353,23 @@ static void fsl_espi_cmd_trans(struct sp fsl_espi_do_trans(m, espi_trans); espi_trans->actual_length = espi_trans->len; @@ -93,7 +91,7 @@ index 428dc7a..5207176 100644 for (pos = 0, loop = 0; pos < n_rx; pos += trans_len, loop++) { trans_len = n_rx - pos; if (trans_len > SPCOM_TRANLEN_MAX - n_tx) -@@ -412,8 +403,6 @@ static void fsl_espi_rw_trans(struct spi_message *m, +@@ -412,8 +403,6 @@ static void fsl_espi_rw_trans(struct spi else espi_trans->actual_length += espi_trans->len; } @@ -102,7 +100,7 @@ index 428dc7a..5207176 100644 } static void fsl_espi_do_one_msg(struct spi_message *m) -@@ -581,6 +570,7 @@ static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) +@@ -581,6 +570,7 @@ static irqreturn_t fsl_espi_irq(s32 irq, static void fsl_espi_remove(struct mpc8xxx_spi *mspi) { iounmap(mspi->reg_base); @@ -110,7 +108,7 @@ index 428dc7a..5207176 100644 } static struct spi_master * fsl_espi_probe(struct device *dev, -@@ -612,10 +602,16 @@ static struct spi_master * fsl_espi_probe(struct device *dev, +@@ -612,10 +602,16 @@ static struct spi_master * fsl_espi_prob mpc8xxx_spi->spi_do_one_msg = fsl_espi_do_one_msg; mpc8xxx_spi->spi_remove = fsl_espi_remove; @@ -137,8 +135,6 @@ index 428dc7a..5207176 100644 err_probe: spi_master_put(master); err: -diff --git a/drivers/spi/spi-fsl-lib.h b/drivers/spi/spi-fsl-lib.h -index 52db693..8dda68b 100644 --- a/drivers/spi/spi-fsl-lib.h +++ b/drivers/spi/spi-fsl-lib.h @@ -30,6 +30,7 @@ struct mpc8xxx_spi { @@ -149,6 +145,3 @@ index 52db693..8dda68b 100644 #endif int subblock; --- -2.1.3 - -- 2.30.2