]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
armv8: fsl-layerscape: Add support of QorIQ LS1012A SoC
authorPrabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Fri, 3 Jun 2016 13:11:31 +0000 (18:41 +0530)
committerYork Sun <york.sun@nxp.com>
Fri, 3 Jun 2016 21:12:50 +0000 (14:12 -0700)
The QorIQ LS1012A processor, optimized for battery-backed or
USB-powered, integrates a single ARM Cortex-A53 core with a hardware
packet forwarding engine and high-speed interfaces to deliver
line-rate networking performance.

This patch add support of LS1012A SoC along with
 - Update platform & DDR clock read logic as per SVR
 - Define MMDC controller register set.
 - Update LUT base address for PCIe
 - Avoid L3 platform cache compilation
 - Update USB address, errata
 - SerDes table
 - Added CSU IDs for SDHC2, SAI-1 to SAI-4

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Makarand Pawagi <makarand.pawagi@mindspeed.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
14 files changed:
arch/arm/cpu/armv8/fsl-layerscape/Makefile
arch/arm/cpu/armv8/fsl-layerscape/doc/README.soc
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S
arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c [new file with mode: 0644]
arch/arm/cpu/armv8/fsl-layerscape/soc.c
arch/arm/include/asm/arch-fsl-layerscape/config.h
arch/arm/include/asm/arch-fsl-layerscape/cpu.h
arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
arch/arm/include/asm/arch-fsl-layerscape/soc.h
include/fsl_mmdc.h [new file with mode: 0644]
include/linux/usb/xhci-fsl.h

index 5f86ef90d24e5e6941d70c1cead742dbe78d596a..eb2cbc3f7e2b87587a24d4002ce280807ad8d052 100644 (file)
@@ -28,3 +28,7 @@ endif
 ifneq ($(CONFIG_LS1043A),)
 obj-$(CONFIG_SYS_HAS_SERDES) += ls1043a_serdes.o
 endif
+
+ifneq ($(CONFIG_LS1012A),)
+obj-$(CONFIG_SYS_HAS_SERDES) += ls1012a_serdes.o
+endif
index a4130cee50c8a47b6d94463591500bfec7fe94b7..8eee016f11c2681ca0591b67b9ac0247df929656 100644 (file)
@@ -2,6 +2,7 @@ SoC overview
 
        1. LS1043A
        2. LS2080A
+       3. LS1012A
 
 LS1043A
 ---------
@@ -84,3 +85,45 @@ The LS2080A SoC includes the following function and features:
  - QorIQ platform's trust architecture 3.0
  - Service processor (SP) provides pre-boot initialization and secure-boot
   capabilities
+
+LS1012A
+--------
+The LS1012A features an advanced 64-bit ARM v8 Cortex-
+A53 processor, with 32 KB of parity protected L1-I cache,
+32 KB of ECC protected L1-D cache, as well as 256 KB of
+ECC protected L2 cache.
+
+The LS1012A SoC includes the following function and features:
+ - One 64-bit ARM v8 Cortex-A53 core with the following capabilities:
+ - ARM v8 cryptography extensions
+ - One 16-bit DDR3L SDRAM memory controller, Up to 1.0 GT/s, Supports
+    16-/8-bit operation (no ECC support)
+ - ARM core-link CCI-400 cache coherent interconnect
+ - Packet Forwarding Engine (PFE)
+ - Cryptography acceleration (SEC)
+ - Ethernet interfaces supported by PFE:
+ - One Configurable x3 SerDes:
+    Two Serdes PLLs supported for usage by any SerDes data lane
+    Support for up to 6 GBaud operation
+ - High-speed peripheral interfaces:
+     - One PCI Express Gen2 controller, supporting x1 operation
+     - One serial ATA (SATA Gen 3.0) controller
+     - One USB 3.0/2.0 controller with integrated PHY
+     - One USB 2.0 controller with ULPI interface. .
+ - Additional peripheral interfaces:
+    - One quad serial peripheral interface (QuadSPI) controller
+    - One serial peripheral interface (SPI) controller
+    - Two enhanced secure digital host controllers
+    - Two I2C controllers
+    - One 16550 compliant DUART (two UART interfaces)
+    - Two general purpose IOs (GPIO)
+    - Two FlexTimers
+    - Five synchronous audio interfaces (SAI)
+    - Pre-boot loader (PBL) provides pre-boot initialization and RCW loading
+    - Single-source clocking solution enabling generation of core, platform,
+    DDR, SerDes, and USB clocks from a single external crystal and internal
+    crystaloscillator
+    - Thermal monitor unit (TMU) with +/- 3C accuracy
+    - Two WatchDog timers
+    - ARM generic timer
+ - QorIQ platform's trust architecture 2.1
index 4fc31862278f2a7a6e5c968c387937020e90c3d5..3a77b21d0ab89d98ed7faed1e0cd354107d46e86 100644 (file)
@@ -59,12 +59,18 @@ void get_sys_info(struct sys_info *sys_info)
        sys_info->freq_ddrbus = sysclk;
 #endif
 
+#ifdef CONFIG_LS1012A
+       sys_info->freq_ddrbus *= (gur_in32(&gur->rcwsr[0]) >>
+                       FSL_CHASSIS2_RCWSR0_SYS_PLL_RAT_SHIFT) &
+                       FSL_CHASSIS2_RCWSR0_SYS_PLL_RAT_MASK;
+#else
        sys_info->freq_systembus *= (gur_in32(&gur->rcwsr[0]) >>
                        FSL_CHASSIS2_RCWSR0_SYS_PLL_RAT_SHIFT) &
                        FSL_CHASSIS2_RCWSR0_SYS_PLL_RAT_MASK;
        sys_info->freq_ddrbus *= (gur_in32(&gur->rcwsr[0]) >>
                        FSL_CHASSIS2_RCWSR0_MEM_PLL_RAT_SHIFT) &
                        FSL_CHASSIS2_RCWSR0_MEM_PLL_RAT_MASK;
+#endif
 
        for (i = 0; i < CONFIG_SYS_FSL_NUM_CC_PLLS; i++) {
                ratio[i] = (in_be32(&clk->pllcgsr[i].pllcngsr) >> 1) & 0xff;
@@ -83,6 +89,11 @@ void get_sys_info(struct sys_info *sys_info)
                        freq_c_pll[cplx_pll] / core_cplx_pll_div[c_pll_sel];
        }
 
+#ifdef CONFIG_LS1012A
+       sys_info->freq_systembus = sys_info->freq_ddrbus / 2;
+       sys_info->freq_ddrbus *= 2;
+#endif
+
 #define HWA_CGA_M1_CLK_SEL     0xe0000000
 #define HWA_CGA_M1_CLK_SHIFT   29
 #ifdef CONFIG_SYS_DPAA_FMAN
index d743ffe6b555c7f83c90583fe26220e8c840e131..5af6b73bc9e8dab0bb32edff6b9653ac49b8e1c0 100644 (file)
@@ -183,6 +183,7 @@ ENTRY(lowlevel_init)
        ret
 ENDPROC(lowlevel_init)
 
+#ifdef CONFIG_FSL_LSCH3
 hnf_pstate_poll:
        /* x0 has the desired status, return 0 for success, 1 for timeout
         * clobber x1, x2, x3, x4, x6, x7
@@ -260,6 +261,7 @@ ENTRY(__asm_flush_l3_cache)
        mov     lr, x29
        ret
 ENDPROC(__asm_flush_l3_cache)
+#endif
 
 #ifdef CONFIG_MP
        /* Keep literals not used by the secondary boot code outside it */
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c
new file mode 100644 (file)
index 0000000..ff0903c
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/fsl_serdes.h>
+#include <asm/arch/immap_lsch2.h>
+
+struct serdes_config {
+       u32 protocol;
+       u8 lanes[SRDS_MAX_LANES];
+};
+
+static struct serdes_config serdes1_cfg_tbl[] = {
+       {0x2208, {SGMII_2500_FM1_DTSEC1, SGMII_2500_FM1_DTSEC2, NONE, SATA1} },
+       {0x0008, {NONE, NONE, NONE, SATA1} },
+       {0x3508, {SGMII_FM1_DTSEC1, PCIE1, NONE, SATA1} },
+       {0x3305, {SGMII_FM1_DTSEC1, SGMII_FM1_DTSEC2, NONE, PCIE1} },
+       {0x2205, {SGMII_2500_FM1_DTSEC1, SGMII_2500_FM1_DTSEC2, NONE, PCIE1} },
+       {0x2305, {SGMII_2500_FM1_DTSEC1, SGMII_FM1_DTSEC2, NONE, PCIE1} },
+       {0x9508, {TX_CLK, PCIE1, NONE, SATA1} },
+       {0x3905, {SGMII_FM1_DTSEC1, TX_CLK, NONE, PCIE1} },
+       {0x9305, {TX_CLK, SGMII_FM1_DTSEC2, NONE, PCIE1} },
+       {}
+};
+
+static struct serdes_config *serdes_cfg_tbl[] = {
+       serdes1_cfg_tbl,
+};
+
+enum srds_prtcl serdes_get_prtcl(int serdes, int cfg, int lane)
+{
+       struct serdes_config *ptr;
+
+       if (serdes >= ARRAY_SIZE(serdes_cfg_tbl))
+               return 0;
+
+       ptr = serdes_cfg_tbl[serdes];
+       while (ptr->protocol) {
+               if (ptr->protocol == cfg)
+                       return ptr->lanes[lane];
+               ptr++;
+       }
+
+       return 0;
+}
+
+int is_serdes_prtcl_valid(int serdes, u32 prtcl)
+{
+       int i;
+       struct serdes_config *ptr;
+
+       if (serdes >= ARRAY_SIZE(serdes_cfg_tbl))
+               return 0;
+
+       ptr = serdes_cfg_tbl[serdes];
+       while (ptr->protocol) {
+               if (ptr->protocol == prtcl)
+                       break;
+               ptr++;
+       }
+
+       if (!ptr->protocol)
+               return 0;
+
+       for (i = 0; i < SRDS_MAX_LANES; i++) {
+               if (ptr->lanes[i] != NONE)
+                       return 1;
+       }
+
+       return 0;
+}
index 0ae61d6d3abcdce050ee309b787af6d46f7c81ae..dd633f36905c77d318ffab53d83eb2dca65c3c5b 100644 (file)
 #include <asm/io.h>
 #include <asm/global_data.h>
 #include <asm/arch-fsl-layerscape/config.h>
+#ifdef CONFIG_SYS_FSL_DDR
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
+#endif
 #ifdef CONFIG_CHAIN_OF_TRUST
 #include <fsl_validate.h>
 #endif
index fbdaa52c32943144139f68c7061cd80a7491ff6d..44fe0c00953964b8f59ebac78fb8495cc5a85666 100644 (file)
 #else
 #define CONFIG_SYS_FSL_DDRC_ARM_GEN3   /* Enable Freescale ARM DDR3 driver */
 #endif
+
+#ifndef CONFIG_LS1012A
 #define CONFIG_SYS_FSL_DDR             /* Freescale DDR driver */
 #define CONFIG_SYS_FSL_DDR_VER         FSL_DDR_VER_5_0
+#endif
 
 /*
  * Reserve secure memory
 #define CONFIG_SYS_FSL_ERRATUM_A009942
 #define CONFIG_SYS_FSL_ERRATUM_A009660
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC          1
+#elif defined(CONFIG_LS1012A)
+#define CONFIG_MAX_CPUS                         1
+#define CONFIG_SYS_CACHELINE_SIZE              64
+#define CONFIG_NUM_DDR_CONTROLLERS             1
+#define CONFIG_SYS_CCSRBAR_DEFAULT             0x01000000
+#define CONFIG_SYS_FSL_SEC_COMPAT              5
+#undef CONFIG_SYS_FSL_DDRC_ARM_GEN3
+
+#define CONFIG_SYS_FSL_OCRAM_BASE              0x10000000 /* initial RAM */
+#define CONFIG_SYS_FSL_OCRAM_SIZE              0x200000 /* 2 MiB */
+
+#define GICD_BASE              0x01401000
+#define GICC_BASE              0x01402000
+
+#define CONFIG_SYS_FSL_CCSR_GUR_BE
+#define CONFIG_SYS_FSL_CCSR_SCFG_BE
+#define CONFIG_SYS_FSL_ESDHC_BE
+#define CONFIG_SYS_FSL_WDOG_BE
+#define CONFIG_SYS_FSL_DSPI_BE
+#define CONFIG_SYS_FSL_QSPI_BE
+#define CONFIG_SYS_FSL_PEX_LUT_BE
+
+#define SRDS_MAX_LANES         4
+#define CONFIG_SYS_FSL_SRDS_1
+#define CONFIG_SYS_FSL_PCIE_COMPAT             "fsl,qoriq-pcie-v2.4"
+#define CONFIG_SYS_FSL_SEC_BE
 #else
 #error SoC not defined
 #endif
index 702b9faabd9f23e11918008c929f80e821e3a884..1cebe2fbb010736ae0e35a944773a025e3638701 100644 (file)
@@ -14,6 +14,7 @@ static struct cpu_type cpu_type_list[] = {
        CPU_TYPE_ENTRY(LS1043, LS1043, 4),
        CPU_TYPE_ENTRY(LS1023, LS1023, 2),
        CPU_TYPE_ENTRY(LS2040, LS2040, 4),
+       CPU_TYPE_ENTRY(LS1012, LS1012, 1),
 };
 
 #ifndef CONFIG_SYS_DCACHE_OFF
index c4fb7c9a4755de095ec0e2e7dc3a15672be5db2f..487cba80803f64c9f520e7c15e08d65542c06abe 100644 (file)
@@ -134,6 +134,7 @@ enum srds_prtcl {
        SGMII_2500_FM2_DTSEC6,
        SGMII_2500_FM2_DTSEC9,
        SGMII_2500_FM2_DTSEC10,
+       TX_CLK,
        SERDES_PRCTL_COUNT
 };
 
index 57b99d4084ef0c666540f1c6e59d5d2ca46c2c12..e98e055d9f1150e29ddd20b88718f8afa8150d3c 100644 (file)
 #define CONFIG_SYS_PCIE2_PHYS_ADDR             0x4800000000ULL
 #define CONFIG_SYS_PCIE3_PHYS_ADDR             0x5000000000ULL
 /* LUT registers */
+#ifdef CONFIG_LS1012A
+#define PCIE_LUT_BASE                          0xC0000
+#else
 #define PCIE_LUT_BASE                          0x10000
+#endif
 #define PCIE_LUT_LCTRL0                                0x7F8
 #define PCIE_LUT_DBG                           0x7FC
 
index a3ccdb03c7f67969f86c4366175fd724f0447db4..db76066c8078f1aef342b46399a5a8e97129bfca 100644 (file)
@@ -69,7 +69,12 @@ enum csu_cslx_ind {
        CSU_CSLX_IIC4 = 77,
        CSU_CSLX_WDT4,
        CSU_CSLX_WDT3,
+       CSU_CSLX_ESDHC2 = 80,
        CSU_CSLX_WDT5 = 81,
+       CSU_CSLX_SAI2,
+       CSU_CSLX_SAI1,
+       CSU_CSLX_SAI4,
+       CSU_CSLX_SAI3,
        CSU_CSLX_FTM2 = 86,
        CSU_CSLX_FTM1,
        CSU_CSLX_FTM4,
@@ -143,7 +148,12 @@ static struct csu_ns_dev ns_dev[] = {
         {CSU_CSLX_IIC4, CSU_ALL_RW},
         {CSU_CSLX_WDT4, CSU_ALL_RW},
         {CSU_CSLX_WDT3, CSU_ALL_RW},
+        {CSU_CSLX_ESDHC2, CSU_ALL_RW},
         {CSU_CSLX_WDT5, CSU_ALL_RW},
+        {CSU_CSLX_SAI2, CSU_ALL_RW},
+        {CSU_CSLX_SAI1, CSU_ALL_RW},
+        {CSU_CSLX_SAI4, CSU_ALL_RW},
+        {CSU_CSLX_SAI3, CSU_ALL_RW},
         {CSU_CSLX_FTM2, CSU_ALL_RW},
         {CSU_CSLX_FTM1, CSU_ALL_RW},
         {CSU_CSLX_FTM4, CSU_ALL_RW},
index 831d81764ec5d34e7c2b860fce999b901e4df7a6..02ecc6257e16993385821cc6be545a565c096861 100644 (file)
@@ -41,6 +41,7 @@ struct cpu_type {
        { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc)}
 
 #define SVR_WO_E               0xFFFFFE
+#define SVR_LS1012             0x870400
 #define SVR_LS1043             0x879200
 #define SVR_LS1023             0x879208
 #define SVR_LS2045             0x870120
diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
new file mode 100644 (file)
index 0000000..281a819
--- /dev/null
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef FSL_MMDC_H
+#define FSL_MMDC_H
+
+#define CONFIG_SYS_MMDC_CORE_ODT_TIMING                0x12554000
+#define CONFIG_SYS_MMDC_CORE_TIMING_CFG_0      0xbabf7954
+#define CONFIG_SYS_MMDC_CORE_TIMING_CFG_1      0xff328f64
+#define CONFIG_SYS_MMDC_CORE_TIMING_CFG_2      0x01ff00db
+
+#define CONFIG_SYS_MMDC_CORE_MISC              0x00000680
+#define CONFIG_SYS_MMDC_PHY_MEASURE_UNIT       0x00000800
+#define CONFIG_SYS_MMDC_CORE_RDWR_CMD_DELAY    0x00002000
+#define CONFIG_SYS_MMDC_PHY_ODT_CTRL           0x0000022a
+
+#define CONFIG_SYS_MMDC_CORE_OUT_OF_RESET_DELAY        0x00bf1023
+
+#define CONFIG_SYS_MMDC_CORE_ADDR_PARTITION    0x0000007f
+
+#define CONFIG_SYS_MMDC_PHY_ZQ_HW_CTRL         0xa1390003
+
+#define        FORCE_ZQ_AUTO_CALIBRATION               (0x1 << 16)
+
+/* PHY Write Leveling Configuration and Error Status (MPWLGCR) */
+#define WR_LVL_HW_EN                           0x00000001
+
+/* PHY Pre-defined Compare and CA delay-line Configuration (MPPDCMPR2) */
+#define MPR_COMPARE_EN                         0x00000001
+
+#define CONFIG_SYS_MMDC_PHY_RD_DLY_LINES_CFG   0x40404040
+
+/* MMDC PHY Read DQS gating control register 0 (MPDGCTRL0) */
+#define AUTO_RD_DQS_GATING_CALIBRATION_EN      0x10000000
+
+/* MMDC PHY Read Delay HW Calibration Control Register (MPRDDLHWCTL) */
+#define AUTO_RD_CALIBRATION_EN                 0x00000010
+
+#define CONFIG_SYS_MMDC_CORE_PWR_DOWN_CTRL     0x00030035
+
+#define CONFIG_SYS_MMDC_CORE_PWR_SAV_CTRL_STAT 0x00001067
+
+#define CONFIG_SYS_MMDC_CORE_REFRESH_CTL       0x103e8000
+
+#define START_REFRESH                          0x00000001
+
+/* MMDC Core Special Command Register (MDSCR) */
+#define CMD_ADDR_MSB_MR_OP(x)   (x << 24)
+
+#define  CMD_ADDR_LSB_MR_ADDR(x)    (x << 16)
+
+#define DISABLE_CFG_REQ                0x0
+#define CONFIGURATION_REQ      (0x1  << 15)
+#define WL_EN                  (0x1  << 9)
+
+#define        CMD_NORMAL              (0x0 << 4)
+#define        CMD_PRECHARGE           (0x1 << 4)
+#define        CMD_AUTO_REFRESH        (0x2 << 4)
+#define        CMD_LOAD_MODE_REG       (0x3 << 4)
+#define        CMD_ZQ_CALIBRATION      (0x4 << 4)
+#define        CMD_PRECHARGE_BANK_OPEN (0x5 << 4)
+#define        CMD_MRR                 (0x6 << 4)
+
+#define CMD_BANK_ADDR_0                0x0
+#define CMD_BANK_ADDR_1                0x1
+#define CMD_BANK_ADDR_2                0x2
+#define CMD_BANK_ADDR_3                0x3
+#define CMD_BANK_ADDR_4                0x4
+#define CMD_BANK_ADDR_5                0x5
+#define CMD_BANK_ADDR_6                0x6
+#define CMD_BANK_ADDR_7                0x7
+
+/* MMDC Registers */
+struct mmdc_p_regs {
+       u32 mdctl;
+       u32 mdpdc;
+       u32 mdotc;
+       u32 mdcfg0;
+       u32 mdcfg1;
+       u32 mdcfg2;
+       u32 mdmisc;
+       u32 mdscr;
+       u32 mdref;
+       u32 res1[2];
+       u32 mdrwd;
+       u32 mdor;
+       u32 mdmrr;
+       u32 mdcfg3lp;
+       u32 mdmr4;
+       u32 mdasp;
+       u32 res2[239];
+       u32 maarcr;
+       u32 mapsr;
+       u32 maexidr0;
+       u32 maexidr1;
+       u32 madpcr0;
+       u32 madpcr1;
+       u32 madpsr0;
+       u32 madpsr1;
+       u32 madpsr2;
+       u32 madpsr3;
+       u32 madpsr4;
+       u32 madpsr5;
+       u32 masbs0;
+       u32 masbs1;
+       u32 res3[2];
+       u32 magenp;
+       u32 res4[239];
+       u32 mpzqhwctrl;
+       u32 mpzqswctrl;
+       u32 mpwlgcr;
+       u32 mpwldectrl0;
+       u32 mpwldectrl1;
+       u32 mpwldlst;
+       u32 mpodtctrl;
+       u32 mprddqby0dl;
+       u32 mprddqby1dl;
+       u32 mprddqby2dl;
+       u32 mprddqby3dl;
+       u32 res5[4];
+       u32 mpdgctrl0;
+       u32 mpdgctrl1;
+       u32 mpdgdlst0;
+       u32 mprddlctl;
+       u32 mprddlst;
+       u32 mpwrdlctl;
+       u32 mpwrdlst;
+       u32 mpsdctrl;
+       u32 mpzqlp2ctl;
+       u32 mprddlhwctl;
+       u32 mpwrdlhwctl;
+       u32 mprddlhwst0;
+       u32 mprddlhwst1;
+       u32 mpwrdlhwst0;
+       u32 mpwrdlhwst1;
+       u32 mpwlhwerr;
+       u32 mpdghwst0;
+       u32 mpdghwst1;
+       u32 mpdghwst2;
+       u32 mpdghwst3;
+       u32 mppdcmpr1;
+       u32 mppdcmpr2;
+       u32 mpswdar0;
+       u32 mpswdrdr0;
+       u32 mpswdrdr1;
+       u32 mpswdrdr2;
+       u32 mpswdrdr3;
+       u32 mpswdrdr4;
+       u32 mpswdrdr5;
+       u32 mpswdrdr6;
+       u32 mpswdrdr7;
+       u32 mpmur0;
+       u32 mpwrcadl;
+       u32 mpdccr;
+};
+
+#endif /* FSL_MMDC_H */
index c5e42e69fe2b3476487bd5c8d6cc73fab7fecb00..253eddf1590bd89cc810b64247431a9476dca360 100644 (file)
@@ -59,10 +59,14 @@ struct fsl_xhci {
 #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR
 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR
 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
-#elif defined(CONFIG_LS1043A)
+#elif defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A)
 #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR
 #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS1043A_XHCI_USB2_ADDR
 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR
+#elif defined(CONFIG_LS1012A)
+#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR
+#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0
+#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0
 #endif
 
 #define FSL_USB_XHCI_ADDR      {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \