f577cb25c0
The following patches were dropped because they are already applied upstream: - 0038-MIPS-lantiq-fpi-on-ar9.patch - 0039-MIPS-lantiq-initialize-usb-on-boot.patch - 0042-USB-DWC2-big-endian-support.patch - 0043-gpio-stp-xway-fix-phy-mask.patch All other patches were simply refreshed, except the following: - 0001-MIPS-lantiq-add-pcie-driver.patch Changes to arch/mips/lantiq/xway/sysctrl.c (these changes disabled some PMU gates for the vrx200 / VR9 SoCs) were removed since the upstream kernel disables unused PMU gates automatically (since 95135bfa7ead1becc2879230f72583dde2b71a0c "MIPS: Lantiq: Deactivate most of the devices by default"). - 0025-NET-MIPS-lantiq-adds-xrx200-net.patch Since OpenWrt commit 55ba20afcc2fe785146316e5be2c2473cb329885 drivers should use of_get_mac_address(). of_get_mac_address_mtd is not available for drivers anymore since it's called automatically within of_get_mac_address(). - 0028-NET-lantiq-various-etop-fixes.patch Same changes as in 0025-NET-MIPS-lantiq-adds-xrx200-net.patch While refreshing the kernel configuration SPI support had to be moved to config-4.4 because otherwise M25P80 was disabled. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 48307
25 lines
919 B
Diff
25 lines
919 B
Diff
From e3b20f04e9f9cae1babe091fdc1d08d7703ae344 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Thu, 7 Aug 2014 18:18:00 +0200
|
|
Subject: [PATCH 20/36] MTD: lantiq: handle NO_XIP on cfi0001 flash
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/mtd/maps/lantiq-flash.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mtd/maps/lantiq-flash.c
|
|
+++ b/drivers/mtd/maps/lantiq-flash.c
|
|
@@ -138,7 +138,11 @@ ltq_mtd_probe(struct platform_device *pd
|
|
if (!ltq_mtd->map)
|
|
return -ENOMEM;
|
|
|
|
- ltq_mtd->map->phys = ltq_mtd->res->start;
|
|
+ if (of_find_property(pdev->dev.of_node, "lantiq,noxip", NULL))
|
|
+ ltq_mtd->map->phys = NO_XIP;
|
|
+ else
|
|
+ ltq_mtd->map->phys = ltq_mtd->res->start;
|
|
+ ltq_mtd->res->start;
|
|
ltq_mtd->map->size = resource_size(ltq_mtd->res);
|
|
ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
|
|
if (IS_ERR(ltq_mtd->map->virt))
|