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>
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 11a68a2d48fee4524163c5ce36477bafb6515a98 Mon Sep 17 00:00:00 2001
|
|
From: Camelia Groza <camelia.groza@nxp.com>
|
|
Date: Mon, 26 Mar 2018 10:48:19 +0300
|
|
Subject: [PATCH] sdk_fman: probe OH ports on PPC
|
|
|
|
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
|
|
---
|
|
.../ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm_port.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm_port.c
|
|
+++ b/drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm_port.c
|
|
@@ -303,7 +303,13 @@ static t_LnxWrpFmPortDev *ReadFmPortDevT
|
|
tmp_prop = be32_to_cpu(*uint32_prop);
|
|
if (WARN_ON(lenp != sizeof(uint32_t)))
|
|
return NULL;
|
|
- if (of_device_is_compatible(port_node, "fsl,fman-port-oh")) {
|
|
+ if (of_device_is_compatible(port_node, "fsl,fman-port-oh") ||
|
|
+ of_device_is_compatible(port_node, "fsl,fman-v2-port-oh") ||
|
|
+ of_device_is_compatible(port_node, "fsl,fman-v3-port-oh")) {
|
|
+#ifndef CONFIG_FMAN_ARM
|
|
+ /* On PPC, OH ports start from cell-index 0x2 */
|
|
+ tmp_prop -= 0x2;
|
|
+#endif
|
|
if (unlikely(tmp_prop >= FM_MAX_NUM_OF_OH_PORTS)) {
|
|
REPORT_ERROR(MAJOR, E_INVALID_VALUE,
|
|
("of_get_property(%s, cell-index) failed",
|
|
@@ -1433,6 +1439,10 @@ static const struct of_device_id fm_port
|
|
{
|
|
.compatible = "fsl,fman-port-oh"},
|
|
{
|
|
+ .compatible = "fsl,fman-v2-port-oh"},
|
|
+ {
|
|
+ .compatible = "fsl,fman-v3-port-oh"},
|
|
+ {
|
|
.compatible = "fsl,fman-port-1g-rx"},
|
|
{
|
|
.compatible = "fsl,fman-port-10g-rx"},
|