6062d85892
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Run tested: ath79 Build tested: ath79 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
From: Christopher Hill <ch6574@gmail.com>
|
|
To: Mark Brown <broonie@kernel.org>
|
|
Cc: Christopher Hill <ch6574@gmail.com>, linux-spi@vger.kernel.org,
|
|
linux-kernel@vger.kernel.org
|
|
Subject: [PATCH 2/3] spi: rb4xx: update driver to be device tree aware
|
|
Date: Thu, 21 May 2020 14:36:30 -0400
|
|
Message-Id: <20200521183631.37806-2-ch6574@gmail.com>
|
|
X-Mailer: git-send-email 2.25.1
|
|
In-Reply-To: <20200521183631.37806-1-ch6574@gmail.com>
|
|
References: <20200521183631.37806-1-ch6574@gmail.com>
|
|
MIME-Version: 1.0
|
|
Sender: linux-spi-owner@vger.kernel.org
|
|
Precedence: bulk
|
|
List-ID: <linux-spi.vger.kernel.org>
|
|
X-Mailing-List: linux-spi@vger.kernel.org
|
|
|
|
This patch updates the spi driver spi-rb4xx.c to be device tree aware
|
|
|
|
Signed-off-by: Christopher Hill <ch6574@gmail.com>
|
|
---
|
|
drivers/spi/spi-rb4xx.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
--- a/drivers/spi/spi-rb4xx.c
|
|
+++ b/drivers/spi/spi-rb4xx.c
|
|
@@ -18,6 +18,7 @@
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/spi/spi.h>
|
|
+#include <linux/of.h>
|
|
|
|
#include <asm/mach-ath79/ar71xx_regs.h>
|
|
|
|
@@ -156,6 +157,7 @@ static int rb4xx_spi_probe(struct platfo
|
|
if (IS_ERR(ahb_clk))
|
|
return PTR_ERR(ahb_clk);
|
|
|
|
+ master->dev.of_node = pdev->dev.of_node;
|
|
master->bus_num = 0;
|
|
master->num_chipselect = 3;
|
|
master->mode_bits = SPI_TX_DUAL;
|
|
@@ -194,11 +196,18 @@ static int rb4xx_spi_remove(struct platf
|
|
return 0;
|
|
}
|
|
|
|
+static const struct of_device_id rb4xx_spi_dt_match[] = {
|
|
+ { .compatible = "mikrotik,rb4xx-spi" },
|
|
+ { },
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, rb4xx_spi_dt_match);
|
|
+
|
|
static struct platform_driver rb4xx_spi_drv = {
|
|
.probe = rb4xx_spi_probe,
|
|
.remove = rb4xx_spi_remove,
|
|
.driver = {
|
|
.name = "rb4xx-spi",
|
|
+ .of_match_table = of_match_ptr(rb4xx_spi_dt_match),
|
|
},
|
|
};
|
|
|