mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
Merge series "enable flexspi support on imx8mp" from Heiko Schocher <hs@denx.de>:
add compatible entry in nxp_fspi driver for imx8mp @Shawn: If this series is accepted, can you apply the DTS patches from series v2? http://lists.infradead.org/pipermail/linux-arm-kernel/2021-March/643292.html http://lists.infradead.org/pipermail/linux-arm-kernel/2021-March/643293.html Changes in v4: rebased against: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next a43e89624baea ("Merge remote-tracking branch 'spi/for-5.13' into spi-next") Changes in v3: - seperate spi changes from series: http://lists.infradead.org/pipermail/linux-arm-kernel/2021-March/643289.html into own series as Kuldeep suggested and rebased against git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next144c79ef33
("Merge tag 'perf-tools-fixes-for-v5.12-2020-03-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux") - no changes, rebased against git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next144c79ef33
Merge tag 'perf-tools-fixes-for-v5.12-2020-03-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux Changes in v2: - work in comments from Marco add own compatible entry for imx8mp Heiko Schocher (2): spi: fspi: enable fspi driver for on imx8mp dt-bindings: spi: add compatible entry for imx8mp in FlexSPI controller Documentation/devicetree/bindings/spi/spi-nxp-fspi.txt | 1 + drivers/spi/spi-nxp-fspi.c | 1 + 2 files changed, 2 insertions(+) -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
This commit is contained in:
commit
85c0ed12f7
2 changed files with 2 additions and 0 deletions
|
@ -4,6 +4,7 @@ Required properties:
|
||||||
- compatible : Should be "nxp,lx2160a-fspi"
|
- compatible : Should be "nxp,lx2160a-fspi"
|
||||||
"nxp,imx8qxp-fspi"
|
"nxp,imx8qxp-fspi"
|
||||||
"nxp,imx8mm-fspi"
|
"nxp,imx8mm-fspi"
|
||||||
|
"nxp,imx8mp-fspi"
|
||||||
"nxp,imx8dxl-fspi"
|
"nxp,imx8dxl-fspi"
|
||||||
|
|
||||||
- reg : First contains the register location and length,
|
- reg : First contains the register location and length,
|
||||||
|
|
|
@ -1242,6 +1242,7 @@ static int nxp_fspi_resume(struct device *dev)
|
||||||
static const struct of_device_id nxp_fspi_dt_ids[] = {
|
static const struct of_device_id nxp_fspi_dt_ids[] = {
|
||||||
{ .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, },
|
{ .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, },
|
||||||
{ .compatible = "nxp,imx8mm-fspi", .data = (void *)&imx8mm_data, },
|
{ .compatible = "nxp,imx8mm-fspi", .data = (void *)&imx8mm_data, },
|
||||||
|
{ .compatible = "nxp,imx8mp-fspi", .data = (void *)&imx8mm_data, },
|
||||||
{ .compatible = "nxp,imx8qxp-fspi", .data = (void *)&imx8qxp_data, },
|
{ .compatible = "nxp,imx8qxp-fspi", .data = (void *)&imx8qxp_data, },
|
||||||
{ .compatible = "nxp,imx8dxl-fspi", .data = (void *)&imx8dxl_data, },
|
{ .compatible = "nxp,imx8dxl-fspi", .data = (void *)&imx8dxl_data, },
|
||||||
{ /* sentinel */ }
|
{ /* sentinel */ }
|
||||||
|
|
Loading…
Reference in a new issue