diff options
Diffstat (limited to 'target/linux/mediatek')
10 files changed, 136 insertions, 95 deletions
diff --git a/target/linux/mediatek/patches-4.19/0001-arm-dts-mediatek-add-basic-support-for-MT7629-SoC.patch b/target/linux/mediatek/patches-4.19/0001-arm-dts-mediatek-add-basic-support-for-MT7629-SoC.patch index 904f44402a..a8b3f99331 100755..100644 --- a/target/linux/mediatek/patches-4.19/0001-arm-dts-mediatek-add-basic-support-for-MT7629-SoC.patch +++ b/target/linux/mediatek/patches-4.19/0001-arm-dts-mediatek-add-basic-support-for-MT7629-SoC.patch @@ -12,9 +12,6 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> 4 files changed, 704 insertions(+) create mode 100644 include/dt-bindings/reset/mt7629-resets.h -diff --git a/include/dt-bindings/reset/mt7629-resets.h b/include/dt-bindings/reset/mt7629-resets.h -new file mode 100644 -index 000000000000..6bb85734f68d --- /dev/null +++ b/include/dt-bindings/reset/mt7629-resets.h @@ -0,0 +1,71 @@ @@ -89,6 +86,3 @@ index 000000000000..6bb85734f68d +#define MT7629_ETHSYS_PPE_RST 31 + +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT7629 */ --- -2.18.0 - diff --git a/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch b/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch index c5521c416b..814f66cc4e 100644 --- a/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch +++ b/target/linux/mediatek/patches-4.19/0001-eth-sync-from-mtk-lede.patch @@ -1,7 +1,5 @@ -Index: linux-4.19.57/drivers/net/ethernet/mediatek/Kconfig -=================================================================== ---- linux-4.19.57.orig/drivers/net/ethernet/mediatek/Kconfig -+++ linux-4.19.57/drivers/net/ethernet/mediatek/Kconfig +--- a/drivers/net/ethernet/mediatek/Kconfig ++++ b/drivers/net/ethernet/mediatek/Kconfig @@ -1,6 +1,6 @@ config NET_VENDOR_MEDIATEK bool "MediaTek ethernet driver" @@ -10,10 +8,8 @@ Index: linux-4.19.57/drivers/net/ethernet/mediatek/Kconfig ---help--- If you have a Mediatek SoC with ethernet, say Y. -Index: linux-4.19.57/drivers/net/ethernet/mediatek/Makefile -=================================================================== ---- linux-4.19.57.orig/drivers/net/ethernet/mediatek/Makefile -+++ linux-4.19.57/drivers/net/ethernet/mediatek/Makefile +--- a/drivers/net/ethernet/mediatek/Makefile ++++ b/drivers/net/ethernet/mediatek/Makefile @@ -2,4 +2,5 @@ # Makefile for the Mediatek SoCs built-in ethernet macs # @@ -21,10 +17,8 @@ Index: linux-4.19.57/drivers/net/ethernet/mediatek/Makefile -obj-$(CONFIG_NET_MEDIATEK_SOC) += mtk_eth_soc.o +obj-$(CONFIG_NET_MEDIATEK_SOC) += mtk_eth_soc.o mtk_sgmii.o \ + mtk_eth_path.o -Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_path.c -=================================================================== --- /dev/null -+++ linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_path.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_path.c @@ -0,0 +1,333 @@ +/* + * Copyright (C) 2018 MediaTek Inc. @@ -359,10 +353,8 @@ Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_path.c + + return 0; +} -Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.c -=================================================================== ---- linux-4.19.57.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c -+++ linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.c +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -23,6 +23,7 @@ #include <linux/reset.h> #include <linux/tcp.h> @@ -1139,10 +1131,8 @@ Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.c {}, }; MODULE_DEVICE_TABLE(of, of_mtk_match); -Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.h -=================================================================== ---- linux-4.19.57.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h -+++ linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.h +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -15,13 +15,17 @@ #ifndef MTK_ETH_H #define MTK_ETH_H @@ -1537,10 +1527,8 @@ Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_eth_soc.h +int mtk_setup_hw_path(struct mtk_eth *eth, int mac_id, int phymode); + #endif /* MTK_ETH_H */ -Index: linux-4.19.57/drivers/net/ethernet/mediatek/mtk_sgmii.c -=================================================================== --- /dev/null -+++ linux-4.19.57/drivers/net/ethernet/mediatek/mtk_sgmii.c ++++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2018 MediaTek Inc. diff --git a/target/linux/mediatek/patches-4.19/0003-mt7531-gsw-internal_phy_calibration.patch b/target/linux/mediatek/patches-4.19/0003-mt7531-gsw-internal_phy_calibration.patch index 7ade515a7f..8e4ef2ae1b 100644 --- a/target/linux/mediatek/patches-4.19/0003-mt7531-gsw-internal_phy_calibration.patch +++ b/target/linux/mediatek/patches-4.19/0003-mt7531-gsw-internal_phy_calibration.patch @@ -1,16 +1,15 @@ --- a/drivers/net/phy/mtk/mt753x/Makefile +++ b/drivers/net/phy/mtk/mt753x/Makefile -@@ -5,6 +5,6 @@ - obj-$(CONFIG_MT753X_GSW) += mt753x.o +@@ -7,5 +7,5 @@ obj-$(CONFIG_MT753X_GSW) += mt753x.o + mt753x-$(CONFIG_SWCONFIG) += mt753x_swconfig.o mt753x-y += mt753x_mdio.o mt7530.o mt7531.o \ - mt753x_common.o mt753x_nl.o + mt753x_common.o mt753x_nl.o mt753x_phy.o - --- a/drivers/net/phy/mtk/mt753x/mt7531.c +++ b/drivers/net/phy/mtk/mt753x/mt7531.c -@@ -454,6 +454,18 @@ static void mt7531_core_pll_setup(struct gsw_mt753x *gsw) +@@ -582,6 +582,18 @@ static void mt7531_core_pll_setup(struct static int mt7531_internal_phy_calibration(struct gsw_mt753x *gsw) { @@ -31,7 +30,7 @@ --- a/drivers/net/phy/mtk/mt753x/mt753x.h +++ b/drivers/net/phy/mtk/mt753x/mt753x.h -@@ -141,6 +141,8 @@ void mt753x_mmd_ind_write(struct gsw_mt753x *gsw, int addr, int devad, u16 reg, +@@ -147,6 +147,8 @@ void mt753x_mmd_ind_write(struct gsw_mt7 void mt753x_irq_worker(struct work_struct *work); void mt753x_irq_enable(struct gsw_mt753x *gsw); @@ -990,8 +989,6 @@ + + return ret; +} -diff --git a/target/linux/generic/files/drivers/net/phy/mtk/mt753x/mt753x_phy.h b/target/linux/generic/files/drivers/net/phy/mtk/mt753x/mt753x_phy.h -new file mode 100755 --- /dev/null +++ b/drivers/net/phy/mtk/mt753x/mt753x_phy.h @@ -0,0 +1,145 @@ diff --git a/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch b/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch index 65e56e4940..096802a30e 100644 --- a/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch +++ b/target/linux/mediatek/patches-4.19/0003-switch-add-mt7531.patch @@ -1,7 +1,5 @@ -Index: linux-4.19.57/drivers/net/phy/Kconfig -=================================================================== ---- linux-4.19.57.orig/drivers/net/phy/Kconfig -+++ linux-4.19.57/drivers/net/phy/Kconfig +--- a/drivers/net/phy/Kconfig ++++ b/drivers/net/phy/Kconfig @@ -292,6 +292,8 @@ config RTL8367B_PHY endif # RTL8366_SMI @@ -11,10 +9,8 @@ Index: linux-4.19.57/drivers/net/phy/Kconfig comment "MII PHY device drivers" config SFP -Index: linux-4.19.57/drivers/net/phy/Makefile -=================================================================== ---- linux-4.19.57.orig/drivers/net/phy/Makefile -+++ linux-4.19.57/drivers/net/phy/Makefile +--- a/drivers/net/phy/Makefile ++++ b/drivers/net/phy/Makefile @@ -100,3 +100,5 @@ obj-$(CONFIG_STE10XP) += ste10Xp.o obj-$(CONFIG_TERANETICS_PHY) += teranetics.o obj-$(CONFIG_VITESSE_PHY) += vitesse.o diff --git a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch index d6e63714e3..88222908ea 100644 --- a/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch +++ b/target/linux/mediatek/patches-4.19/0227-arm-dts-Add-Unielec-U7623-DTS.patch @@ -11,10 +11,8 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi -Index: linux-4.19.57/arch/arm/boot/dts/Makefile -=================================================================== ---- linux-4.19.57.orig/arch/arm/boot/dts/Makefile -+++ linux-4.19.57/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile @@ -1193,6 +1193,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt7623a-rfb-nand.dtb \ mt7623n-rfb-emmc.dtb \ @@ -23,10 +21,8 @@ Index: linux-4.19.57/arch/arm/boot/dts/Makefile mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb -Index: linux-4.19.57/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts -=================================================================== --- /dev/null -+++ linux-4.19.57/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts ++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts @@ -0,0 +1,18 @@ +/* + * Copyright 2018 Kristian Evensen <kristian.evensen@gmail.com> @@ -46,10 +42,8 @@ Index: linux-4.19.57/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts + reg = <0 0x80000000 0 0x20000000>; + }; +}; -Index: linux-4.19.57/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi -=================================================================== --- /dev/null -+++ linux-4.19.57/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi ++++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi @@ -0,0 +1,366 @@ +/* + * Copyright 2018 Kristian Evensen <kristian.evensen@gmail.com> diff --git a/target/linux/mediatek/patches-4.19/0301-mtd-mtk-ecc-move-mtk-ecc-header-file-to-include-mtd.patch b/target/linux/mediatek/patches-4.19/0301-mtd-mtk-ecc-move-mtk-ecc-header-file-to-include-mtd.patch index fcfb3dc368..2f82a130c3 100755..100644 --- a/target/linux/mediatek/patches-4.19/0301-mtd-mtk-ecc-move-mtk-ecc-header-file-to-include-mtd.patch +++ b/target/linux/mediatek/patches-4.19/0301-mtd-mtk-ecc-move-mtk-ecc-header-file-to-include-mtd.patch @@ -12,8 +12,6 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com> 3 files changed, 2 insertions(+), 3 deletions(-) rename {drivers/mtd/nand/raw => include/linux/mtd}/mtk_ecc.h (100%) -diff --git a/drivers/mtd/nand/raw/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c -index 6432bd70c3b3..32e9784b0d4f 100644 --- a/drivers/mtd/nand/raw/mtk_ecc.c +++ b/drivers/mtd/nand/raw/mtk_ecc.c @@ -23,8 +23,7 @@ @@ -26,8 +24,6 @@ index 6432bd70c3b3..32e9784b0d4f 100644 #define ECC_IDLE_MASK BIT(0) #define ECC_IRQ_EN BIT(0) -diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c -index 57b5ed1699e3..e201f1417fba 100644 --- a/drivers/mtd/nand/raw/mtk_nand.c +++ b/drivers/mtd/nand/raw/mtk_nand.c @@ -25,7 +25,7 @@ @@ -39,10 +35,107 @@ index 57b5ed1699e3..e201f1417fba 100644 /* NAND controller register definition */ #define NFI_CNFG (0x00) -diff --git a/drivers/mtd/nand/raw/mtk_ecc.h b/include/linux/mtd/mtk_ecc.h -similarity index 100% -rename from drivers/mtd/nand/raw/mtk_ecc.h -rename to include/linux/mtd/mtk_ecc.h --- -2.20.1 - +--- a/drivers/mtd/nand/raw/mtk_ecc.h ++++ /dev/null +@@ -1,49 +0,0 @@ +-/* +- * MTK SDG1 ECC controller +- * +- * Copyright (c) 2016 Mediatek +- * Authors: Xiaolei Li <xiaolei.li@mediatek.com> +- * Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> +- * This program is free software; you can redistribute it and/or modify it +- * under the terms of the GNU General Public License version 2 as published +- * by the Free Software Foundation. +- */ +- +-#ifndef __DRIVERS_MTD_NAND_MTK_ECC_H__ +-#define __DRIVERS_MTD_NAND_MTK_ECC_H__ +- +-#include <linux/types.h> +- +-enum mtk_ecc_mode {ECC_DMA_MODE = 0, ECC_NFI_MODE = 1}; +-enum mtk_ecc_operation {ECC_ENCODE, ECC_DECODE}; +- +-struct device_node; +-struct mtk_ecc; +- +-struct mtk_ecc_stats { +- u32 corrected; +- u32 bitflips; +- u32 failed; +-}; +- +-struct mtk_ecc_config { +- enum mtk_ecc_operation op; +- enum mtk_ecc_mode mode; +- dma_addr_t addr; +- u32 strength; +- u32 sectors; +- u32 len; +-}; +- +-int mtk_ecc_encode(struct mtk_ecc *, struct mtk_ecc_config *, u8 *, u32); +-void mtk_ecc_get_stats(struct mtk_ecc *, struct mtk_ecc_stats *, int); +-int mtk_ecc_wait_done(struct mtk_ecc *, enum mtk_ecc_operation); +-int mtk_ecc_enable(struct mtk_ecc *, struct mtk_ecc_config *); +-void mtk_ecc_disable(struct mtk_ecc *); +-void mtk_ecc_adjust_strength(struct mtk_ecc *ecc, u32 *p); +-unsigned int mtk_ecc_get_parity_bits(struct mtk_ecc *ecc); +- +-struct mtk_ecc *of_mtk_ecc_get(struct device_node *); +-void mtk_ecc_release(struct mtk_ecc *); +- +-#endif +--- /dev/null ++++ b/include/linux/mtd/mtk_ecc.h +@@ -0,0 +1,49 @@ ++/* ++ * MTK SDG1 ECC controller ++ * ++ * Copyright (c) 2016 Mediatek ++ * Authors: Xiaolei Li <xiaolei.li@mediatek.com> ++ * Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org> ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 as published ++ * by the Free Software Foundation. ++ */ ++ ++#ifndef __DRIVERS_MTD_NAND_MTK_ECC_H__ ++#define __DRIVERS_MTD_NAND_MTK_ECC_H__ ++ ++#include <linux/types.h> ++ ++enum mtk_ecc_mode {ECC_DMA_MODE = 0, ECC_NFI_MODE = 1}; ++enum mtk_ecc_operation {ECC_ENCODE, ECC_DECODE}; ++ ++struct device_node; ++struct mtk_ecc; ++ ++struct mtk_ecc_stats { ++ u32 corrected; ++ u32 bitflips; ++ u32 failed; ++}; ++ ++struct mtk_ecc_config { ++ enum mtk_ecc_operation op; ++ enum mtk_ecc_mode mode; ++ dma_addr_t addr; ++ u32 strength; ++ u32 sectors; ++ u32 len; ++}; ++ ++int mtk_ecc_encode(struct mtk_ecc *, struct mtk_ecc_config *, u8 *, u32); ++void mtk_ecc_get_stats(struct mtk_ecc *, struct mtk_ecc_stats *, int); ++int mtk_ecc_wait_done(struct mtk_ecc *, enum mtk_ecc_operation); ++int mtk_ecc_enable(struct mtk_ecc *, struct mtk_ecc_config *); ++void mtk_ecc_disable(struct mtk_ecc *); ++void mtk_ecc_adjust_strength(struct mtk_ecc *ecc, u32 *p); ++unsigned int mtk_ecc_get_parity_bits(struct mtk_ecc *ecc); ++ ++struct mtk_ecc *of_mtk_ecc_get(struct device_node *); ++void mtk_ecc_release(struct mtk_ecc *); ++ ++#endif diff --git a/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch b/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch index eeb096acda..cdf214688c 100755..100644 --- a/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch +++ b/target/linux/mediatek/patches-4.19/0303-mtd-spinand-disable-on-die-ECC.patch @@ -9,11 +9,9 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com> drivers/mtd/nand/spi/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c -index 30f83649c481..3b6eac391350 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -554,7 +554,7 @@ static int spinand_mtd_read(struct mtd_info *mtd, loff_t from, +@@ -552,7 +552,7 @@ static int spinand_mtd_read(struct mtd_i int ret = 0; if (ops->mode != MTD_OPS_RAW && spinand->eccinfo.ooblayout) @@ -22,7 +20,7 @@ index 30f83649c481..3b6eac391350 100644 mutex_lock(&spinand->lock); -@@ -602,7 +602,7 @@ static int spinand_mtd_write(struct mtd_info *mtd, loff_t to, +@@ -600,7 +600,7 @@ static int spinand_mtd_write(struct mtd_ int ret = 0; if (ops->mode != MTD_OPS_RAW && mtd->ooblayout) @@ -31,6 +29,3 @@ index 30f83649c481..3b6eac391350 100644 mutex_lock(&spinand->lock); --- -2.20.1 - diff --git a/target/linux/mediatek/patches-4.19/0304-dt-bindings-ARM-MediaTek-Document-devicetree-binding.patch b/target/linux/mediatek/patches-4.19/0304-dt-bindings-ARM-MediaTek-Document-devicetree-binding.patch index a605fd1190..29c4b951e6 100755..100644 --- a/target/linux/mediatek/patches-4.19/0304-dt-bindings-ARM-MediaTek-Document-devicetree-binding.patch +++ b/target/linux/mediatek/patches-4.19/0304-dt-bindings-ARM-MediaTek-Document-devicetree-binding.patch @@ -11,9 +11,6 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com> 1 file changed, 44 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/spi-mtk-snfi.txt -diff --git a/Documentation/devicetree/bindings/spi/spi-mtk-snfi.txt b/Documentation/devicetree/bindings/spi/spi-mtk-snfi.txt -new file mode 100644 -index 000000000000..a09c476c5289 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/spi-mtk-snfi.txt @@ -0,0 +1,44 @@ @@ -61,6 +58,3 @@ index 000000000000..a09c476c5289 + reg = <0>; + }; +}; --- -2.20.1 - diff --git a/target/linux/mediatek/patches-4.19/0306-spi-spi-mem-MediaTek-Add-SPI-NAND-Flash-interface-dr.patch b/target/linux/mediatek/patches-4.19/0306-spi-spi-mem-MediaTek-Add-SPI-NAND-Flash-interface-dr.patch index c307abead9..2370925372 100644 --- a/target/linux/mediatek/patches-4.19/0306-spi-spi-mem-MediaTek-Add-SPI-NAND-Flash-interface-dr.patch +++ b/target/linux/mediatek/patches-4.19/0306-spi-spi-mem-MediaTek-Add-SPI-NAND-Flash-interface-dr.patch @@ -13,10 +13,8 @@ Signed-off-by: Xiangsheng Hou <xiangsheng.hou@mediatek.com> 3 files changed, 1193 insertions(+) create mode 100644 drivers/spi/spi-mtk-snfi.c -Index: linux-4.19.48/drivers/spi/spi-mtk-snfi.c -=================================================================== --- /dev/null -+++ linux-4.19.48/drivers/spi/spi-mtk-snfi.c ++++ b/drivers/spi/spi-mtk-snfi.c @@ -0,0 +1,1183 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -1201,10 +1199,8 @@ Index: linux-4.19.48/drivers/spi/spi-mtk-snfi.c +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Xiangsheng Hou <xiangsheng.hou@mediatek.com>"); +MODULE_DESCRIPTION("Mediatek SPI Memory Interface Driver"); -Index: linux-4.19.48/drivers/spi/Kconfig -=================================================================== ---- linux-4.19.48.orig/drivers/spi/Kconfig -+++ linux-4.19.48/drivers/spi/Kconfig +--- a/drivers/spi/Kconfig ++++ b/drivers/spi/Kconfig @@ -389,6 +389,15 @@ config SPI_MT65XX say Y or M here.If you are not sure, say N. SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs. @@ -1221,10 +1217,8 @@ Index: linux-4.19.48/drivers/spi/Kconfig config SPI_NUC900 tristate "Nuvoton NUC900 series SPI" depends on ARCH_W90X900 -Index: linux-4.19.48/drivers/spi/Makefile -=================================================================== ---- linux-4.19.48.orig/drivers/spi/Makefile -+++ linux-4.19.48/drivers/spi/Makefile +--- a/drivers/spi/Makefile ++++ b/drivers/spi/Makefile @@ -57,6 +57,7 @@ obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mp obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o diff --git a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch index ae1ef16a79..330d2a5b77 100755..100644 --- a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index ebfb0bd..2b9ba39 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h -@@ -80,6 +80,7 @@ struct serial8250_config { +@@ -80,6 +80,7 @@ struct serial8250_config { #define UART_CAP_MINI (1 << 17) /* Mini UART on BCM283X family lacks: * STOP PARITY EPAR SPAR WLEN5 WLEN6 */ @@ -10,11 +8,9 @@ index ebfb0bd..2b9ba39 100644 #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ -diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index c39482b..e4a69a0 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ static const struct serial8250_config ua .tx_loadsz = 16, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, @@ -23,7 +19,7 @@ index c39482b..e4a69a0 100644 }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2663,6 +2663,11 @@ static unsigned int serial8250_get_baud_rate(struct uart_port *port, +@@ -2644,6 +2644,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; |