e72b2464b1
This bumps the 4.4. kernel in master to 4.4.119. Includes more Meltdown & Spectre mitigation. * Refresh patches. * Refresh x86/config for RETPOLINE. * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream) * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream) * Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)). Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant. Compile-tested on: ar71xx & oxnas. Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 3e63b26bdd4069c3df2cd7ce7217a21d06801b41 Mon Sep 17 00:00:00 2001
|
|
From: Brian Norris <computersforpeace@gmail.com>
|
|
Date: Fri, 30 Oct 2015 20:33:22 -0700
|
|
Subject: [PATCH 03/11] mtd: {nand,spi-nor}: assign MTD of_node
|
|
|
|
We should pass along our flash DT node to the MTD layer, so it can set
|
|
up ofpart for us.
|
|
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
---
|
|
drivers/mtd/nand/nand_base.c | 3 +++
|
|
drivers/mtd/spi-nor/spi-nor.c | 1 +
|
|
2 files changed, 4 insertions(+)
|
|
|
|
--- a/drivers/mtd/nand/nand_base.c
|
|
+++ b/drivers/mtd/nand/nand_base.c
|
|
@@ -3995,6 +3995,9 @@ int nand_scan_ident(struct mtd_info *mtd
|
|
int ret;
|
|
|
|
if (chip->flash_node) {
|
|
+ /* MTD can automatically handle DT partitions, etc. */
|
|
+ mtd_set_of_node(mtd, chip->flash_node);
|
|
+
|
|
ret = nand_dt_init(mtd, chip, chip->flash_node);
|
|
if (ret)
|
|
return ret;
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -1228,6 +1228,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
mtd->flags |= MTD_NO_ERASE;
|
|
|
|
mtd->dev.parent = dev;
|
|
+ mtd_set_of_node(mtd, np);
|
|
nor->page_size = info->page_size;
|
|
mtd->writebufsize = nor->page_size;
|
|
|