mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
101 lines
3.0 KiB
Diff
101 lines
3.0 KiB
Diff
From 12ae7ff3ecb4527ebe30ec6feb29ebb0ec4cd0a7 Mon Sep 17 00:00:00 2001
|
|
From: Biwen Li <biwen.li@nxp.com>
|
|
Date: Sat, 14 Sep 2019 12:37:49 +0800
|
|
Subject: [PATCH] soc: fsl: handle RCPM errata A-008646 on SoC LS1021A
|
|
|
|
Description:
|
|
- Reading configuration register RCPM_IPPDEXPCR1
|
|
always return zero
|
|
|
|
Workaround:
|
|
- Save register RCPM_IPPDEXPCR1's value to
|
|
register SCFG_SPARECR8.(uboot's psci also
|
|
need reading value from the register SCFG_SPARECR8
|
|
to set register RCPM_IPPDEXPCR1)
|
|
|
|
Impact:
|
|
- FlexTimer module will cannot wakeup system in
|
|
deep sleep on SoC LS1021A
|
|
|
|
Reviewed-by: Ran Wang <ran.wang_1@nxp.com>
|
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
|
---
|
|
drivers/soc/fsl/rcpm.c | 47 +++++++++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 45 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/soc/fsl/rcpm.c
|
|
+++ b/drivers/soc/fsl/rcpm.c
|
|
@@ -6,13 +6,16 @@
|
|
//
|
|
// Author: Ran Wang <ran.wang_1@nxp.com>
|
|
|
|
+#include <linux/acpi.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/mfd/syscon.h>
|
|
#include <linux/module.h>
|
|
-#include <linux/platform_device.h>
|
|
#include <linux/of_address.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/regmap.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/suspend.h>
|
|
-#include <linux/kernel.h>
|
|
|
|
#define RCPM_WAKEUP_CELL_MAX_SIZE 7
|
|
|
|
@@ -37,6 +40,9 @@ static int rcpm_pm_prepare(struct device
|
|
struct device_node *np = dev->of_node;
|
|
u32 value[RCPM_WAKEUP_CELL_MAX_SIZE + 1];
|
|
u32 setting[RCPM_WAKEUP_CELL_MAX_SIZE] = {0};
|
|
+ struct regmap *scfg_addr_regmap = NULL;
|
|
+ u32 reg_offset[RCPM_WAKEUP_CELL_MAX_SIZE + 1];
|
|
+ u32 reg_value = 0;
|
|
|
|
rcpm = dev_get_drvdata(dev);
|
|
if (!rcpm)
|
|
@@ -90,6 +96,43 @@ static int rcpm_pm_prepare(struct device
|
|
tmp |= ioread32be(address);
|
|
iowrite32be(tmp, address);
|
|
}
|
|
+ /*
|
|
+ * Workaround of errata A-008646 on SoC LS1021A:
|
|
+ * There is a bug of register ippdexpcr1.
|
|
+ * Reading configuration register RCPM_IPPDEXPCR1
|
|
+ * always return zero. So save ippdexpcr1's value
|
|
+ * to register SCFG_SPARECR8.And the value of
|
|
+ * ippdexpcr1 will be read from SCFG_SPARECR8.
|
|
+ */
|
|
+ if (device_property_present(dev, "fsl,ippdexpcr1-alt-addr")) {
|
|
+ if (dev_of_node(dev)) {
|
|
+ scfg_addr_regmap = syscon_regmap_lookup_by_phandle(np,
|
|
+ "fsl,ippdexpcr1-alt-addr");
|
|
+ } else if (is_acpi_node(dev->fwnode)) {
|
|
+ dev_err(dev, "not support acpi for rcpm\n");
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (scfg_addr_regmap && (i == 1)) {
|
|
+ if (device_property_read_u32_array(dev,
|
|
+ "fsl,ippdexpcr1-alt-addr",
|
|
+ reg_offset,
|
|
+ 1 + sizeof(u64)/sizeof(u32))) {
|
|
+ scfg_addr_regmap = NULL;
|
|
+ continue;
|
|
+ }
|
|
+ /* Read value from register SCFG_SPARECR8 */
|
|
+ regmap_read(scfg_addr_regmap,
|
|
+ (u32)(((u64)(reg_offset[1] << (sizeof(u32) * 8) |
|
|
+ reg_offset[2])) & 0xffffffff),
|
|
+ ®_value);
|
|
+ /* Write value to register SCFG_SPARECR8 */
|
|
+ regmap_write(scfg_addr_regmap,
|
|
+ (u32)(((u64)(reg_offset[1] << (sizeof(u32) * 8) |
|
|
+ reg_offset[2])) & 0xffffffff),
|
|
+ tmp | reg_value);
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
return 0;
|