45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
|
From 825d623c913c63b1f00c42f27ef0916b11d9f09f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
|
||
|
|
Date: Tue, 15 Mar 2016 13:40:22 +0530
|
||
|
|
Subject: [PATCH 07/93] armv8: fsl-layerscape: Avoid LS1043A specifc defines
|
||
|
|
|
||
|
|
Other than LS1043A, LS1012A also Chassis Gen2 Architecture compliant.
|
||
|
|
|
||
|
|
So Avoid LS1043A specific defines in arch/arm
|
||
|
|
|
||
|
|
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
|
||
|
|
---
|
||
|
|
arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +-
|
||
|
|
.../include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
|
||
|
|
index 92dcb72..23f0c88 100644
|
||
|
|
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
|
||
|
|
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
|
||
|
|
@@ -314,7 +314,7 @@ int sata_init(void)
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#elif defined(CONFIG_LS1043A)
|
||
|
|
+#elif defined(CONFIG_FSL_LSCH2)
|
||
|
|
#ifdef CONFIG_SCSI_AHCI_PLAT
|
||
|
|
int sata_init(void)
|
||
|
|
{
|
||
|
|
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
|
||
|
|
index d1fbde7..7096dac 100644
|
||
|
|
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
|
||
|
|
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
|
||
|
|
@@ -55,7 +55,7 @@ enum srds {
|
||
|
|
FSL_SRDS_1 = 0,
|
||
|
|
FSL_SRDS_2 = 1,
|
||
|
|
};
|
||
|
|
-#elif defined(CONFIG_LS1043A)
|
||
|
|
+#elif defined(CONFIG_FSL_LSCH2)
|
||
|
|
enum srds_prtcl {
|
||
|
|
NONE = 0,
|
||
|
|
PCIE1,
|
||
|
|
--
|
||
|
|
1.7.9.5
|
||
|
|
|