armv8/fsl-lsch2: correct the config description of DSPI clock divider

[u-boot] / arch / arm / cpu / armv8 / fsl-layerscape / ppa.c

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
index 26c47a183c668c4f8754d7727230704b10646b37..24ddb5d991e3ba9fb2da89908e7fad59dd9f2001 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c
@@ -32,6 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int ppa_init(void)
 {
+       unsigned int el = current_el();
        void *ppa_fit_addr;
        u32 *boot_loc_ptr_l, *boot_loc_ptr_h;
        int ret;
@@ -45,6 +46,12 @@ int ppa_init(void)
 #endif
 #endif
 
+       /* Skip if running at lower exception level */
+       if (el < 3) {
+               debug("Skipping PPA init, running at EL%d\n", el);
+               return 0;
+       }
+
 #ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP
        ppa_fit_addr = (void *)CONFIG_SYS_LS_PPA_FW_ADDR;
        debug("%s: PPA image load from XIP\n", __func__);
@@ -166,8 +173,9 @@ int ppa_init(void)
        debug("%s: PPA image load from NAND\n", __func__);
 
        nand_init();
-       ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR,
-                      &fdt_header_len, (u_char *)&fit);
+       ret = nand_read(get_nand_dev_by_index(0),
+                       (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR,
+                       &fdt_header_len, (u_char *)&fit);
        if (ret == -EUCLEAN) {
                printf("NAND read of PPA FIT header at offset 0x%x failed\n",
                       CONFIG_SYS_LS_PPA_FW_ADDR);
@@ -189,8 +197,9 @@ int ppa_init(void)
 
        fw_length = CONFIG_LS_PPA_ESBC_HDR_SIZE;
 
-       ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_ESBC_ADDR,
-                      &fw_length, (u_char *)ppa_hdr_ddr);
+       ret = nand_read(get_nand_dev_by_index(0),
+                       (loff_t)CONFIG_SYS_LS_PPA_ESBC_ADDR,
+                       &fw_length, (u_char *)ppa_hdr_ddr);
        if (ret == -EUCLEAN) {
                free(ppa_hdr_ddr);
                printf("NAND read of PPA firmware at offset 0x%x failed\n",
@@ -214,8 +223,9 @@ int ppa_init(void)
                return -ENOMEM;
        }
 
-       ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR,
-                      &fw_length, (u_char *)ppa_fit_addr);
+       ret = nand_read(get_nand_dev_by_index(0),
+                       (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR,
+                       &fw_length, (u_char *)ppa_fit_addr);
        if (ret == -EUCLEAN) {
                free(ppa_fit_addr);
                printf("NAND read of PPA firmware at offset 0x%x failed\n",