kernel: bump 4.9 to 4.9.67
This commit is contained in:
parent
7185e1ceb2
commit
0150df166a
@ -4,11 +4,11 @@ LINUX_RELEASE?=1
|
|||||||
|
|
||||||
LINUX_VERSION-3.18 = .71
|
LINUX_VERSION-3.18 = .71
|
||||||
LINUX_VERSION-4.4 = .100
|
LINUX_VERSION-4.4 = .100
|
||||||
LINUX_VERSION-4.9 = .65
|
LINUX_VERSION-4.9 = .67
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
|
||||||
LINUX_KERNEL_HASH-4.4.100 = 9936cd99c4bd35f6bc6962c9acdd1fa2ac8999e07a9be6a94a03b5492f1bd14f
|
LINUX_KERNEL_HASH-4.4.100 = 9936cd99c4bd35f6bc6962c9acdd1fa2ac8999e07a9be6a94a03b5492f1bd14f
|
||||||
LINUX_KERNEL_HASH-4.9.65 = 24ba70877549a3cf25dc5f12efd260d3e957bce64c087de98baf8968ee514895
|
LINUX_KERNEL_HASH-4.9.67 = 7fbaa7dcc17877dfa0c96fb9a7d2f4ffed20ceeb13cbbeb18d77213c6cf75f7d
|
||||||
|
|
||||||
ifdef KERNEL_PATCHVER
|
ifdef KERNEL_PATCHVER
|
||||||
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
|
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -533,6 +533,12 @@ config SPI_QUP
|
@@ -534,6 +534,12 @@ config SPI_QUP
|
||||||
This driver can also be built as a module. If so, the module
|
This driver can also be built as a module. If so, the module
|
||||||
will be called spi_qup.
|
will be called spi_qup.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -761,6 +761,13 @@ config SPI_TLE62X0
|
@@ -762,6 +762,13 @@ config SPI_TLE62X0
|
||||||
sysfs interface, with each line presented as a kind of GPIO
|
sysfs interface, with each line presented as a kind of GPIO
|
||||||
exposing both switch control and diagnostic feedback.
|
exposing both switch control and diagnostic feedback.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -768,6 +768,11 @@ config SPI_RB4XX_CPLD
|
@@ -769,6 +769,11 @@ config SPI_RB4XX_CPLD
|
||||||
SPI driver for the Xilinx CPLD chip present on the
|
SPI driver for the Xilinx CPLD chip present on the
|
||||||
MikroTik RB4xx boards.
|
MikroTik RB4xx boards.
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/pci/probe.c
|
--- a/drivers/pci/probe.c
|
||||||
+++ b/drivers/pci/probe.c
|
+++ b/drivers/pci/probe.c
|
||||||
@@ -2003,7 +2003,8 @@ static void pcie_write_mrrs(struct pci_d
|
@@ -2014,7 +2014,8 @@ static void pcie_write_mrrs(struct pci_d
|
||||||
/* In the "safe" case, do not configure the MRRS. There appear to be
|
/* In the "safe" case, do not configure the MRRS. There appear to be
|
||||||
* issues with setting MRRS to 0 on a number of devices.
|
* issues with setting MRRS to 0 on a number of devices.
|
||||||
*/
|
*/
|
||||||
|
@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -2171,6 +2171,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -2170,6 +2170,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,43 @@
|
|||||||
|
From patchwork Fri Jul 21 18:36:24 2017
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Transfer-Encoding: 7bit
|
||||||
|
Subject: [2/5] e1000e: Fix wrong comment related to link detection
|
||||||
|
From: Benjamin Poirier <bpoirier@suse.com>
|
||||||
|
X-Patchwork-Id: 9857489
|
||||||
|
Message-Id: <20170721183627.13373-2-bpoirier@suse.com>
|
||||||
|
To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
|
||||||
|
Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca>,
|
||||||
|
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
|
||||||
|
linux-kernel@vger.kernel.org
|
||||||
|
Date: Fri, 21 Jul 2017 11:36:24 -0700
|
||||||
|
|
||||||
|
Reading e1000e_check_for_copper_link() shows that get_link_status is set to
|
||||||
|
false after link has been detected. Therefore, it stays TRUE until then.
|
||||||
|
|
||||||
|
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
|
||||||
|
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
|
||||||
|
---
|
||||||
|
drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
|
||||||
|
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
|
||||||
|
@@ -5066,7 +5066,7 @@ static bool e1000e_has_link(struct e1000
|
||||||
|
|
||||||
|
/* get_link_status is set on LSC (link status) interrupt or
|
||||||
|
* Rx sequence error interrupt. get_link_status will stay
|
||||||
|
- * false until the check_for_link establishes link
|
||||||
|
+ * true until the check_for_link establishes link
|
||||||
|
* for copper adapters ONLY
|
||||||
|
*/
|
||||||
|
switch (hw->phy.media_type) {
|
||||||
|
@@ -5084,7 +5084,7 @@ static bool e1000e_has_link(struct e1000
|
||||||
|
break;
|
||||||
|
case e1000_media_type_internal_serdes:
|
||||||
|
ret_val = hw->mac.ops.check_for_link(hw);
|
||||||
|
- link_active = adapter->hw.mac.serdes_has_link;
|
||||||
|
+ link_active = hw->mac.serdes_has_link;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
case e1000_media_type_unknown:
|
@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
||||||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
||||||
#endif
|
#endif
|
||||||
@@ -3714,6 +3753,17 @@ static int __net_init ip6_route_net_init
|
@@ -3718,6 +3757,17 @@ static int __net_init ip6_route_net_init
|
||||||
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
||||||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
||||||
ip6_template_metrics, true);
|
ip6_template_metrics, true);
|
||||||
@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
net->ipv6.sysctl.flush_delay = 0;
|
net->ipv6.sysctl.flush_delay = 0;
|
||||||
@@ -3732,6 +3782,8 @@ out:
|
@@ -3736,6 +3786,8 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
out_ip6_prohibit_entry:
|
out_ip6_prohibit_entry:
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
kfree(net->ipv6.ip6_prohibit_entry);
|
||||||
out_ip6_null_entry:
|
out_ip6_null_entry:
|
||||||
@@ -3749,6 +3801,7 @@ static void __net_exit ip6_route_net_exi
|
@@ -3753,6 +3805,7 @@ static void __net_exit ip6_route_net_exi
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
kfree(net->ipv6.ip6_prohibit_entry);
|
||||||
kfree(net->ipv6.ip6_blk_hole_entry);
|
kfree(net->ipv6.ip6_blk_hole_entry);
|
||||||
@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
#endif
|
#endif
|
||||||
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
||||||
}
|
}
|
||||||
@@ -3822,6 +3875,9 @@ void __init ip6_route_init_special_entri
|
@@ -3826,6 +3879,9 @@ void __init ip6_route_init_special_entri
|
||||||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
||||||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Matthew McClintock <mmcclint@qca.qualcomm.com>
|
|||||||
|
|
||||||
--- a/drivers/clk/qcom/gcc-ipq4019.c
|
--- a/drivers/clk/qcom/gcc-ipq4019.c
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq4019.c
|
+++ b/drivers/clk/qcom/gcc-ipq4019.c
|
||||||
@@ -1317,12 +1317,12 @@ static int gcc_ipq4019_probe(struct plat
|
@@ -1327,12 +1327,12 @@ static int gcc_ipq4019_probe(struct plat
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
+};
|
+};
|
||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -403,6 +403,14 @@ config SPI_NUC900
|
@@ -404,6 +404,14 @@ config SPI_NUC900
|
||||||
help
|
help
|
||||||
SPI driver for Nuvoton NUC900 series ARM SoCs
|
SPI driver for Nuvoton NUC900 series ARM SoCs
|
||||||
|
|
||||||
|
@ -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))
|
#define PROT_SECT_NORMAL (PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL))
|
||||||
--- a/arch/arm64/include/asm/pgtable.h
|
--- a/arch/arm64/include/asm/pgtable.h
|
||||||
+++ b/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)
|
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
|
||||||
#define pgprot_writecombine(prot) \
|
#define pgprot_writecombine(prot) \
|
||||||
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
|
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)
|
||||||
|
@ -15,16 +15,6 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|||||||
drivers/spi/spi-fsl-dspi.c | 309 ++++++++++++++++++++++++++++++++++++++++++++-
|
drivers/spi/spi-fsl-dspi.c | 309 ++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
2 files changed, 305 insertions(+), 5 deletions(-)
|
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
|
--- a/drivers/spi/spi-fsl-dspi.c
|
||||||
+++ b/drivers/spi/spi-fsl-dspi.c
|
+++ b/drivers/spi/spi-fsl-dspi.c
|
||||||
@@ -15,6 +15,8 @@
|
@@ -15,6 +15,8 @@
|
||||||
|
@ -21,7 +21,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
|
|||||||
|
|
||||||
--- a/drivers/mtd/nand/nand_base.c
|
--- a/drivers/mtd/nand/nand_base.c
|
||||||
+++ b/drivers/mtd/nand/nand_base.c
|
+++ b/drivers/mtd/nand/nand_base.c
|
||||||
@@ -4040,7 +4040,8 @@ static bool find_full_id_nand(struct mtd
|
@@ -4043,7 +4043,8 @@ static bool find_full_id_nand(struct mtd
|
||||||
mtd->erasesize = type->erasesize;
|
mtd->erasesize = type->erasesize;
|
||||||
mtd->oobsize = type->oobsize;
|
mtd->oobsize = type->oobsize;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (use_bufpoi)
|
if (use_bufpoi)
|
||||||
/* Invalidate page cache */
|
/* Invalidate page cache */
|
||||||
@@ -3203,8 +3207,11 @@ int nand_erase_nand(struct mtd_info *mtd
|
@@ -3206,8 +3210,11 @@ int nand_erase_nand(struct mtd_info *mtd
|
||||||
(page + pages_per_block))
|
(page + pages_per_block))
|
||||||
chip->pagebuf = -1;
|
chip->pagebuf = -1;
|
||||||
|
|
||||||
@ -31,7 +31,7 @@
|
|||||||
/*
|
/*
|
||||||
* See if operation failed and additional status checks are
|
* See if operation failed and additional status checks are
|
||||||
* available
|
* available
|
||||||
@@ -4398,6 +4405,7 @@ int nand_scan_ident(struct mtd_info *mtd
|
@@ -4401,6 +4408,7 @@ int nand_scan_ident(struct mtd_info *mtd
|
||||||
* cmdfunc() both expect cmd_ctrl() to be populated,
|
* cmdfunc() both expect cmd_ctrl() to be populated,
|
||||||
* so we need to check that that's the case
|
* so we need to check that that's the case
|
||||||
*/
|
*/
|
||||||
|
@ -16,7 +16,7 @@ Acked-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -533,6 +533,12 @@ config SPI_QUP
|
@@ -534,6 +534,12 @@ config SPI_QUP
|
||||||
This driver can also be built as a module. If so, the module
|
This driver can also be built as a module. If so, the module
|
||||||
will be called spi_qup.
|
will be called spi_qup.
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/spi/Kconfig
|
--- a/drivers/spi/Kconfig
|
||||||
+++ b/drivers/spi/Kconfig
|
+++ b/drivers/spi/Kconfig
|
||||||
@@ -539,6 +539,12 @@ config SPI_RT2880
|
@@ -540,6 +540,12 @@ config SPI_RT2880
|
||||||
help
|
help
|
||||||
This selects a driver for the Ralink RT288x/RT305x SPI Controller.
|
This selects a driver for the Ralink RT288x/RT305x SPI Controller.
|
||||||
|
|
||||||
|
@ -8,12 +8,3 @@
|
|||||||
|
|
||||||
#define PPLL_DRV 0xa0
|
#define PPLL_DRV 0xa0
|
||||||
#define PDRV_SW_SET (1<<31)
|
#define PDRV_SW_SET (1<<31)
|
||||||
@@ -121,7 +120,7 @@ static int wait_pciephy_busy(void)
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
if (retry++ > WAITRETRY_MAX) {
|
|
||||||
- printk(KERN_WARN "PCIE-PHY retry failed.\n");
|
|
||||||
+ pr_warn("PCIE-PHY retry failed.\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,33 +0,0 @@
|
|||||||
From 8ef4b43cd3794d63052d85898e42424fd3b14d24 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mathias Kresin <dev@kresin.me>
|
|
||||||
Date: Thu, 11 May 2017 08:11:14 +0200
|
|
||||||
Subject: [PATCH 1/2] MIPS: ralink: Fix MT7628 pinmux
|
|
||||||
|
|
||||||
According to the datasheet the REFCLK pin is shared with GPIO#37 and
|
|
||||||
the PERST pin is shared with GPIO#36.
|
|
||||||
|
|
||||||
Fixes: 53263a1c6852 ("MIPS: ralink: add mt7628an support")
|
|
||||||
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
|
||||||
Acked-by: John Crispin <john@phrozen.org>
|
|
||||||
Cc: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: <stable@vger.kernel.org> # 3.19+
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/16046/
|
|
||||||
Signed-off-by: James Hogan <jhogan@kernel.org>
|
|
||||||
---
|
|
||||||
arch/mips/ralink/mt7620.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/ralink/mt7620.c
|
|
||||||
+++ b/arch/mips/ralink/mt7620.c
|
|
||||||
@@ -141,8 +141,8 @@ static struct rt2880_pmx_func i2c_grp_mt
|
|
||||||
FUNC("i2c", 0, 4, 2),
|
|
||||||
};
|
|
||||||
|
|
||||||
-static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };
|
|
||||||
-static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };
|
|
||||||
+static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 37, 1) };
|
|
||||||
+static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 36, 1) };
|
|
||||||
static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
|
|
||||||
static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
|||||||
From 05a67cc258e75ac9758e6f13d26337b8be51162a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mathias Kresin <dev@kresin.me>
|
|
||||||
Date: Thu, 11 May 2017 08:11:15 +0200
|
|
||||||
Subject: [PATCH 2/2] MIPS: ralink: Fix typo in mt7628 pinmux function
|
|
||||||
|
|
||||||
There is a typo inside the pinmux setup code. The function is called
|
|
||||||
refclk and not reclk.
|
|
||||||
|
|
||||||
Fixes: 53263a1c6852 ("MIPS: ralink: add mt7628an support")
|
|
||||||
Signed-off-by: Mathias Kresin <dev@kresin.me>
|
|
||||||
Acked-by: John Crispin <john@phrozen.org>
|
|
||||||
Cc: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: <stable@vger.kernel.org> # 3.19+
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/16047/
|
|
||||||
Signed-off-by: James Hogan <jhogan@kernel.org>
|
|
||||||
---
|
|
||||||
arch/mips/ralink/mt7620.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/ralink/mt7620.c
|
|
||||||
+++ b/arch/mips/ralink/mt7620.c
|
|
||||||
@@ -141,7 +141,7 @@ static struct rt2880_pmx_func i2c_grp_mt
|
|
||||||
FUNC("i2c", 0, 4, 2),
|
|
||||||
};
|
|
||||||
|
|
||||||
-static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 37, 1) };
|
|
||||||
+static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("refclk", 0, 37, 1) };
|
|
||||||
static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 36, 1) };
|
|
||||||
static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
|
|
||||||
static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
|
|
@ -13,7 +13,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
|
|||||||
|
|
||||||
--- a/drivers/mtd/nand/nand_base.c
|
--- a/drivers/mtd/nand/nand_base.c
|
||||||
+++ b/drivers/mtd/nand/nand_base.c
|
+++ b/drivers/mtd/nand/nand_base.c
|
||||||
@@ -3850,6 +3850,7 @@ static void nand_decode_ext_id(struct mt
|
@@ -3853,6 +3853,7 @@ static void nand_decode_ext_id(struct mt
|
||||||
/*
|
/*
|
||||||
* Field definitions are in the following datasheets:
|
* Field definitions are in the following datasheets:
|
||||||
* Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32)
|
* Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32)
|
||||||
@ -21,7 +21,7 @@ Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
|
|||||||
* New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44)
|
* New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44)
|
||||||
* Hynix MLC (6 byte ID): Hynix H27UBG8T2B (p.22)
|
* Hynix MLC (6 byte ID): Hynix H27UBG8T2B (p.22)
|
||||||
*
|
*
|
||||||
@@ -3947,6 +3948,19 @@ static void nand_decode_ext_id(struct mt
|
@@ -3950,6 +3951,19 @@ static void nand_decode_ext_id(struct mt
|
||||||
*busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
|
*busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user