qca: move ARM specific files to another sublevel
As the U-boot source is going to be common between ARM and MIPS
architecture , it is required to pick only the files specific
to the respective architectures during the build.
So, move the qca arm target specific common files to another
sub level by specifying the ARCH arm.
Change-Id: I06b538834109981f21fef6270bfb8e437a2f5a7e
Signed-off-by: Prabhu Jayakumar <pjayak@codeaurora.org>
diff --git a/arch/arm/cpu/armv7/qca/common/Makefile b/arch/arm/cpu/armv7/qca/common/Makefile
index 4d815c9..253ef6b 100644
--- a/arch/arm/cpu/armv7/qca/common/Makefile
+++ b/arch/arm/cpu/armv7/qca/common/Makefile
@@ -1,4 +1,4 @@
-ccflags-y += -I$(srctree)/board/qca/common/
+ccflags-y += -I$(srctree)/board/qca/arm/common/
obj-y := smem.o
obj-y += timer.o
diff --git a/arch/arm/cpu/armv7/qca/common/scm.c b/arch/arm/cpu/armv7/qca/common/scm.c
index 9e697d6f..0645f95 100644
--- a/arch/arm/cpu/armv7/qca/common/scm.c
+++ b/arch/arm/cpu/armv7/qca/common/scm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@
#include <linux/compat.h>
#include <asm-generic/errno.h>
#include <asm/io.h>
-#include <asm/arch-qcom-common/scm.h>
+#include <asm/arch-qca-common/scm.h>
#include <common.h>
/**
diff --git a/arch/arm/cpu/armv7/qca/common/smem.c b/arch/arm/cpu/armv7/qca/common/smem.c
index 9a7d30e..4cce81e 100644
--- a/arch/arm/cpu/armv7/qca/common/smem.c
+++ b/arch/arm/cpu/armv7/qca/common/smem.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013, 2015-2017 The Linux Foundation. All rights reserved.
*
* Based on smem.c from lk.
*
@@ -33,7 +33,7 @@
#include <asm/io.h>
#include <asm/errno.h>
#include <linux/sizes.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
#include <nand.h>
#include "fdt_info.h"
diff --git a/arch/arm/include/asm/arch-qcom-common/bam.h b/arch/arm/include/asm/arch-qca-common/bam.h
similarity index 98%
rename from arch/arm/include/asm/arch-qcom-common/bam.h
rename to arch/arm/include/asm/arch-qca-common/bam.h
index ebf31d5..6dc28d2 100644
--- a/arch/arm/include/asm/arch-qcom-common/bam.h
+++ b/arch/arm/include/asm/arch-qca-common/bam.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012,2015 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012, 2015-2017 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/arch/arm/include/asm/arch-qcom-common/ebi2.h b/arch/arm/include/asm/arch-qca-common/ebi2.h
similarity index 97%
rename from arch/arm/include/asm/arch-qcom-common/ebi2.h
rename to arch/arm/include/asm/arch-qca-common/ebi2.h
index 0d3770d..1f145d3 100644
--- a/arch/arm/include/asm/arch-qcom-common/ebi2.h
+++ b/arch/arm/include/asm/arch-qca-common/ebi2.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -11,8 +11,8 @@
* GNU General Public License for more details.
*/
-#ifndef QCOM_EBI2_H
-#define QCOM_EBI2_H
+#ifndef QCA_EBI2_H
+#define QCA_EBI2_H
#define IPQ806x_EBI2CR_BASE (0x1A600000)
#define IPQ40xx_EBI2CR_BASE (0x079a0000)
diff --git a/arch/arm/include/asm/arch-qcom-common/gpio.h b/arch/arm/include/asm/arch-qca-common/gpio.h
similarity index 96%
rename from arch/arm/include/asm/arch-qcom-common/gpio.h
rename to arch/arm/include/asm/arch-qca-common/gpio.h
index 008ed0c..6476632 100644
--- a/arch/arm/include/asm/arch-qcom-common/gpio.h
+++ b/arch/arm/include/asm/arch-qca-common/gpio.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2012, 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2016-2017 The Linux Foundation. All rights reserved.
* Source : APQ8064 LK Boot
*
* Redistribution and use in source and binary forms, with or without
diff --git a/arch/arm/include/asm/arch-qcom-common/gsbi.h b/arch/arm/include/asm/arch-qca-common/gsbi.h
similarity index 93%
rename from arch/arm/include/asm/arch-qcom-common/gsbi.h
rename to arch/arm/include/asm/arch-qca-common/gsbi.h
index 333a4bf..718c413 100644
--- a/arch/arm/include/asm/arch-qcom-common/gsbi.h
+++ b/arch/arm/include/asm/arch-qca-common/gsbi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, 2015-2016, The Linux Foundation.
+ * Copyright (c) 2012-2013, 2015-2017, The Linux Foundation.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/arch/arm/include/asm/arch-qcom-common/iomap.h b/arch/arm/include/asm/arch-qca-common/iomap.h
similarity index 92%
rename from arch/arm/include/asm/arch-qcom-common/iomap.h
rename to arch/arm/include/asm/arch-qca-common/iomap.h
index 5966d7d..bfd35c6 100644
--- a/arch/arm/include/asm/arch-qcom-common/iomap.h
+++ b/arch/arm/include/asm/arch-qca-common/iomap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
diff --git a/arch/arm/include/asm/arch-qcom-common/nand.h b/arch/arm/include/asm/arch-qca-common/nand.h
similarity index 98%
rename from arch/arm/include/asm/arch-qcom-common/nand.h
rename to arch/arm/include/asm/arch-qca-common/nand.h
index 6082cc7..40b9b5c 100644
--- a/arch/arm/include/asm/arch-qcom-common/nand.h
+++ b/arch/arm/include/asm/arch-qca-common/nand.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -11,8 +11,8 @@
* GNU General Public License for more details.
*/
-#ifndef QCOM_NAND_H
-#define QCOM_NAND_H
+#ifndef QCA_NAND_H
+#define QCA_NAND_H
#define IPQ806x_EBI2ND_BASE (0x1ac00000)
#define IPQ40xx_EBI2ND_BASE (0x079b0000)
@@ -100,8 +100,8 @@
uint32_t qpic_nand_mpu_bypass; /* 0x00000f44 */
};
-#define QCOM_NAND_IPQ 0
-#define QCOM_NAND_QPIC 1
+#define QCA_NAND_IPQ 0
+#define QCA_NAND_QPIC 1
/* Register: NAND_DEVn_CFG0 */
#define SET_RD_MODE_AFTER_STATUS_MASK 0x80000000
diff --git a/arch/arm/include/asm/arch-qcom-common/qca_common.h b/arch/arm/include/asm/arch-qca-common/qca_common.h
similarity index 95%
rename from arch/arm/include/asm/arch-qcom-common/qca_common.h
rename to arch/arm/include/asm/arch-qca-common/qca_common.h
index 94c0d8c..2a57334 100644
--- a/arch/arm/include/asm/arch-qcom-common/qca_common.h
+++ b/arch/arm/include/asm/arch-qca-common/qca_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
diff --git a/arch/arm/include/asm/arch-qcom-common/qpic_nand.h b/arch/arm/include/asm/arch-qca-common/qpic_nand.h
similarity index 98%
rename from arch/arm/include/asm/arch-qcom-common/qpic_nand.h
rename to arch/arm/include/asm/arch-qca-common/qpic_nand.h
index 291b25d..0c29546 100644
--- a/arch/arm/include/asm/arch-qcom-common/qpic_nand.h
+++ b/arch/arm/include/asm/arch-qca-common/qpic_nand.h
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2008, Google Inc.
* All rights reserved.
- * Copyright (c) 2009-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2017 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -270,8 +270,8 @@
#define QPIC_BAM_CMD_FIFO_SIZE 64
enum qpic_verion{
- QCOM_QPIC_V1_4_20,
- QCOM_QPIC_V1_5_20,
+ QCA_QPIC_V1_4_20,
+ QCA_QPIC_V1_5_20,
};
diff --git a/arch/arm/include/asm/arch-qcom-common/scm.h b/arch/arm/include/asm/arch-qca-common/scm.h
similarity index 98%
rename from arch/arm/include/asm/arch-qcom-common/scm.h
rename to arch/arm/include/asm/arch-qca-common/scm.h
index 1126400..ab33f30 100644
--- a/arch/arm/include/asm/arch-qcom-common/scm.h
+++ b/arch/arm/include/asm/arch-qca-common/scm.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
diff --git a/arch/arm/include/asm/arch-qcom-common/smem.h b/arch/arm/include/asm/arch-qca-common/smem.h
similarity index 98%
rename from arch/arm/include/asm/arch-qcom-common/smem.h
rename to arch/arm/include/asm/arch-qca-common/smem.h
index e950536..34e782c 100644
--- a/arch/arm/include/asm/arch-qcom-common/smem.h
+++ b/arch/arm/include/asm/arch-qca-common/smem.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
diff --git a/arch/arm/include/asm/arch-qcom-common/uart.h b/arch/arm/include/asm/arch-qca-common/uart.h
similarity index 99%
rename from arch/arm/include/asm/arch-qcom-common/uart.h
rename to arch/arm/include/asm/arch-qca-common/uart.h
index 79238dd..b682e1b 100644
--- a/arch/arm/include/asm/arch-qcom-common/uart.h
+++ b/arch/arm/include/asm/arch-qca-common/uart.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, 2015-2016, The Linux Foundation.
+ * Copyright (c) 2012-2013, 2015-2017, The Linux Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index d6aaa9f..ff70861 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -30,7 +30,7 @@
#include <asm/armv7.h>
#endif
#ifdef CONFIG_SCM_TZ64
-#include <asm/arch-qcom-common/scm.h>
+#include <asm/arch-qca-common/scm.h>
#endif
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/ipq40xx/Kconfig b/board/ipq40xx/Kconfig
index 9cf6897..65e02d9 100644
--- a/board/ipq40xx/Kconfig
+++ b/board/ipq40xx/Kconfig
@@ -7,7 +7,7 @@
default "ipq40xx"
config SYS_VENDOR
- default "qca"
+ default "qca/arm"
config SYS_CONFIG_NAME
default "ipq40xx"
diff --git a/board/ipq806x/Kconfig b/board/ipq806x/Kconfig
index 6de4e07..a18f54a 100644
--- a/board/ipq806x/Kconfig
+++ b/board/ipq806x/Kconfig
@@ -7,7 +7,7 @@
default "ipq806x"
config SYS_VENDOR
- default "qca"
+ default "qca/arm"
config SYS_CONFIG_NAME
default "ipq806x"
diff --git a/board/ipq807x/Kconfig b/board/ipq807x/Kconfig
index ed3fb34..77d0005 100644
--- a/board/ipq807x/Kconfig
+++ b/board/ipq807x/Kconfig
@@ -5,7 +5,7 @@
default "ipq807x"
config SYS_VENDOR
- default "qca"
+ default "qca/arm"
config SYS_CONFIG_NAME
default "ipq807x"
diff --git a/board/qca/common/Makefile b/board/qca/arm/common/Makefile
similarity index 100%
rename from board/qca/common/Makefile
rename to board/qca/arm/common/Makefile
diff --git a/board/qca/common/board_init.c b/board/qca/arm/common/board_init.c
similarity index 96%
rename from board/qca/common/board_init.c
rename to board/qca/arm/common/board_init.c
index 6841123..a166cd9 100644
--- a/board/qca/common/board_init.c
+++ b/board/qca/arm/common/board_init.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -13,9 +13,9 @@
#include <common.h>
#include <environment.h>
-#include <asm/arch-qcom-common/smem.h>
-#include <asm/arch-qcom-common/uart.h>
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/smem.h>
+#include <asm/arch-qca-common/uart.h>
+#include <asm/arch-qca-common/gpio.h>
#include <fdtdec.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/qca/common/cmd_blowsecfuse.c b/board/qca/arm/common/cmd_blowsecfuse.c
similarity index 92%
rename from board/qca/common/cmd_blowsecfuse.c
rename to board/qca/arm/common/cmd_blowsecfuse.c
index e0a1a1c..3fcc88e 100644
--- a/board/qca/common/cmd_blowsecfuse.c
+++ b/board/qca/arm/common/cmd_blowsecfuse.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,8 +16,8 @@
#include <image.h>
#include <nand.h>
#include <errno.h>
-#include <asm/arch-qcom-common/smem.h>
-#include <asm/arch-qcom-common/scm.h>
+#include <asm/arch-qca-common/smem.h>
+#include <asm/arch-qca-common/scm.h>
#include <linux/mtd/ubi.h>
#include <part.h>
#include "qca_common.h"
diff --git a/board/qca/common/cmd_bootqca.c b/board/qca/arm/common/cmd_bootqca.c
similarity index 95%
rename from board/qca/common/cmd_bootqca.c
rename to board/qca/arm/common/cmd_bootqca.c
index c2f77ef..df3dd8c 100644
--- a/board/qca/common/cmd_bootqca.c
+++ b/board/qca/arm/common/cmd_bootqca.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,10 +16,10 @@
#include <image.h>
#include <nand.h>
#include <errno.h>
-#include <asm/arch-qcom-common/scm.h>
+#include <asm/arch-qca-common/scm.h>
#include <part.h>
#include <linux/mtd/ubi.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
#include <mmc.h>
#include <part_efi.h>
#include <fdtdec.h>
@@ -682,10 +682,10 @@
#ifdef CONFIG_QCA_APPSBL_DLOAD
#define MAX_UNAME_SIZE 1024
-#define QCOM_WDT_SCM_TLV_TYPE_SIZE 1
-#define QCOM_WDT_SCM_TLV_LEN_SIZE 2
-#define QCOM_WDT_SCM_TLV_TYPE_LEN_SIZE (QCOM_WDT_SCM_TLV_TYPE_SIZE +\
- QCOM_WDT_SCM_TLV_LEN_SIZE)
+#define QCA_WDT_SCM_TLV_TYPE_SIZE 1
+#define QCA_WDT_SCM_TLV_LEN_SIZE 2
+#define QCA_WDT_SCM_TLV_TYPE_LEN_SIZE (QCA_WDT_SCM_TLV_TYPE_SIZE +\
+ QCA_WDT_SCM_TLV_LEN_SIZE)
#define CRASHDUMP_CPU_CONTEXT_SIZE 2048
#define MAX_NAND_PAGE_SIZE 2048
#define MAX_EMMC_BLK_LEN 1024
@@ -704,19 +704,19 @@
/* Type in TLV for crashdump data type */
enum {
- QCOM_WDT_LOG_DUMP_TYPE_INVALID,
- QCOM_WDT_LOG_DUMP_TYPE_UNAME,
+ QCA_WDT_LOG_DUMP_TYPE_INVALID,
+ QCA_WDT_LOG_DUMP_TYPE_UNAME,
};
/* This will be used for parsing the TLV data */
-struct qcom_wdt_scm_tlv_msg {
+struct qca_wdt_scm_tlv_msg {
unsigned char *msg_buffer;
unsigned char *cur_msg_buffer_pos;
unsigned int len;
};
/* Actual crashdump related data */
-struct qcom_wdt_crashdump_data {
+struct qca_wdt_crashdump_data {
unsigned char uname[MAX_UNAME_SIZE];
unsigned int uname_length;
unsigned char *cpu_context;
@@ -755,11 +755,11 @@
static struct mmc *mmc;
static struct crashdump_flash_emmc_cxt crashdump_emmc_cnxt;
#endif
-static struct qcom_wdt_crashdump_data g_crashdump_data;
+static struct qca_wdt_crashdump_data g_crashdump_data;
/* Extracts the type and length in TLV for current offset */
-static int qcom_wdt_scm_extract_tlv_info(
- struct qcom_wdt_scm_tlv_msg *scm_tlv_msg,
+static int qca_wdt_scm_extract_tlv_info(
+ struct qca_wdt_scm_tlv_msg *scm_tlv_msg,
unsigned char *type,
unsigned int *size)
{
@@ -767,7 +767,7 @@
unsigned char *y = scm_tlv_msg->msg_buffer +
scm_tlv_msg->len;
- if ((x + QCOM_WDT_SCM_TLV_TYPE_LEN_SIZE) >= y)
+ if ((x + QCA_WDT_SCM_TLV_TYPE_LEN_SIZE) >= y)
return -EINVAL;
*type = x[0];
@@ -777,21 +777,21 @@
}
/* Extracts the value from TLV for current offset */
-static int qcom_wdt_scm_extract_tlv_data(
- struct qcom_wdt_scm_tlv_msg *scm_tlv_msg,
+static int qca_wdt_scm_extract_tlv_data(
+ struct qca_wdt_scm_tlv_msg *scm_tlv_msg,
unsigned char *data,
unsigned int size)
{
unsigned char *x = scm_tlv_msg->cur_msg_buffer_pos;
unsigned char *y = scm_tlv_msg->msg_buffer + scm_tlv_msg->len;
- if ((x + QCOM_WDT_SCM_TLV_TYPE_LEN_SIZE + size) >= y)
+ if ((x + QCA_WDT_SCM_TLV_TYPE_LEN_SIZE + size) >= y)
return -EINVAL;
memcpy(data, x + 3, size);
scm_tlv_msg->cur_msg_buffer_pos +=
- (size + QCOM_WDT_SCM_TLV_TYPE_LEN_SIZE);
+ (size + QCA_WDT_SCM_TLV_TYPE_LEN_SIZE);
return 0;
}
@@ -802,30 +802,30 @@
* length, then it extracts the actual value and stores in the appropriate
* field in crashdump_data.
*/
-static int qcom_wdt_extract_crashdump_data(
- struct qcom_wdt_scm_tlv_msg *scm_tlv_msg,
- struct qcom_wdt_crashdump_data *crashdump_data)
+static int qca_wdt_extract_crashdump_data(
+ struct qca_wdt_scm_tlv_msg *scm_tlv_msg,
+ struct qca_wdt_crashdump_data *crashdump_data)
{
- unsigned char cur_type = QCOM_WDT_LOG_DUMP_TYPE_INVALID;
+ unsigned char cur_type = QCA_WDT_LOG_DUMP_TYPE_INVALID;
unsigned int cur_size;
int ret_val;
do {
- ret_val = qcom_wdt_scm_extract_tlv_info(scm_tlv_msg,
+ ret_val = qca_wdt_scm_extract_tlv_info(scm_tlv_msg,
&cur_type, &cur_size);
if (ret_val)
break;
switch (cur_type) {
- case QCOM_WDT_LOG_DUMP_TYPE_UNAME:
+ case QCA_WDT_LOG_DUMP_TYPE_UNAME:
crashdump_data->uname_length = cur_size;
- ret_val = qcom_wdt_scm_extract_tlv_data(scm_tlv_msg,
+ ret_val = qca_wdt_scm_extract_tlv_data(scm_tlv_msg,
crashdump_data->uname, cur_size);
break;
- case QCOM_WDT_LOG_DUMP_TYPE_INVALID:
+ case QCA_WDT_LOG_DUMP_TYPE_INVALID:
break;
default:
@@ -836,7 +836,7 @@
if (ret_val != 0)
break;
- } while (cur_type != QCOM_WDT_LOG_DUMP_TYPE_INVALID);
+ } while (cur_type != QCA_WDT_LOG_DUMP_TYPE_INVALID);
return ret_val;
}
@@ -1206,8 +1206,8 @@
* function pointers are being initialized with respective flash
* memory writing routines.
*/
-static int qcom_wdt_write_crashdump_data(
- struct qcom_wdt_crashdump_data *crashdump_data,
+static int qca_wdt_write_crashdump_data(
+ struct qca_wdt_crashdump_data *crashdump_data,
int flash_type, loff_t crashdump_offset)
{
int ret = 0;
@@ -1306,7 +1306,7 @@
{
unsigned char *kernel_crashdump_address =
(unsigned char *) CONFIG_QCA_KERNEL_CRASHDUMP_ADDRESS;
- struct qcom_wdt_scm_tlv_msg tlv_msg;
+ struct qca_wdt_scm_tlv_msg tlv_msg;
int flash_type;
int ret_val;
loff_t crashdump_offset;
@@ -1337,10 +1337,10 @@
tlv_msg.cur_msg_buffer_pos = tlv_msg.msg_buffer;
tlv_msg.len = CONFIG_TLV_DUMP_SIZE;
- ret_val = qcom_wdt_extract_crashdump_data(&tlv_msg, &g_crashdump_data);
+ ret_val = qca_wdt_extract_crashdump_data(&tlv_msg, &g_crashdump_data);
if (!ret_val)
- ret_val = qcom_wdt_write_crashdump_data(&g_crashdump_data,
+ ret_val = qca_wdt_write_crashdump_data(&g_crashdump_data,
flash_type, crashdump_offset);
if (ret_val) {
diff --git a/board/qca/common/env.c b/board/qca/arm/common/env.c
similarity index 93%
rename from board/qca/common/env.c
rename to board/qca/arm/common/env.c
index 4367aea..6e2407c 100644
--- a/board/qca/common/env.c
+++ b/board/qca/arm/common/env.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -12,7 +12,7 @@
*/
#include <common.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
extern void nand_env_relocate_spec(void);
extern int nand_env_init(void);
diff --git a/board/qca/common/ethaddr.c b/board/qca/arm/common/ethaddr.c
similarity index 96%
rename from board/qca/common/ethaddr.c
rename to board/qca/arm/common/ethaddr.c
index c1b5d0e..2ca7f96 100644
--- a/board/qca/common/ethaddr.c
+++ b/board/qca/arm/common/ethaddr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@
#include <nand.h>
#include <part.h>
#include <mmc.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
#include "qca_common.h"
#ifdef CONFIG_QCA_MMC
diff --git a/board/qca/common/fdt_fixup.c b/board/qca/arm/common/fdt_fixup.c
similarity index 97%
rename from board/qca/common/fdt_fixup.c
rename to board/qca/arm/common/fdt_fixup.c
index ac8d243..76593de 100644
--- a/board/qca/common/fdt_fixup.c
+++ b/board/qca/arm/common/fdt_fixup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -12,8 +12,8 @@
*/
#include <common.h>
-#include <asm/arch-qcom-common/smem.h>
-#include <asm/arch-qcom-common/scm.h>
+#include <asm/arch-qca-common/smem.h>
+#include <asm/arch-qca-common/scm.h>
#include <jffs2/load_kernel.h>
#include <fdtdec.h>
diff --git a/board/qca/common/fdt_info.c b/board/qca/arm/common/fdt_info.c
similarity index 100%
rename from board/qca/common/fdt_info.c
rename to board/qca/arm/common/fdt_info.c
diff --git a/board/qca/common/fdt_info.h b/board/qca/arm/common/fdt_info.h
similarity index 100%
rename from board/qca/common/fdt_info.h
rename to board/qca/arm/common/fdt_info.h
diff --git a/board/qca/common/qca_common.h b/board/qca/arm/common/qca_common.h
similarity index 100%
rename from board/qca/common/qca_common.h
rename to board/qca/arm/common/qca_common.h
diff --git a/board/qca/arm/ipq40xx/Makefile b/board/qca/arm/ipq40xx/Makefile
new file mode 100644
index 0000000..d5ffe2d
--- /dev/null
+++ b/board/qca/arm/ipq40xx/Makefile
@@ -0,0 +1,3 @@
+ccflags-y += -I$(srctree)/board/qca/arm/common/ -I$(srctree)/drivers/net/ipq40xx/
+
+obj-y += ipq40xx.o
diff --git a/board/qca/ipq40xx/ipq40xx.c b/board/qca/arm/ipq40xx/ipq40xx.c
similarity index 95%
rename from board/qca/ipq40xx/ipq40xx.c
rename to board/qca/arm/ipq40xx/ipq40xx.c
index 5914a03..5f54197 100644
--- a/board/qca/ipq40xx/ipq40xx.c
+++ b/board/qca/arm/ipq40xx/ipq40xx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -18,15 +18,15 @@
#include <configs/ipq40xx.h>
#include <nand.h>
#include <part.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
#include <asm/arch-ipq40xx/clk.h>
-#include <asm/arch-qcom-common/scm.h>
-#include <asm/arch-qcom-common/qpic_nand.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/iomap.h>
+#include <asm/arch-qca-common/scm.h>
+#include <asm/arch-qca-common/qpic_nand.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/iomap.h>
#include <jffs2/load_kernel.h>
#include <fdtdec.h>
-#include <asm/arch-qcom-common/uart.h>
+#include <asm/arch-qca-common/uart.h>
#include "fdt_info.h"
#include <asm/arch-ipq40xx/ess/ipq40xx_edma.h>
#include <phy.h>
diff --git a/board/qca/ipq40xx/ipq40xx.h b/board/qca/arm/ipq40xx/ipq40xx.h
similarity index 95%
rename from board/qca/ipq40xx/ipq40xx.h
rename to board/qca/arm/ipq40xx/ipq40xx.h
index 9cf8847..1fcd85f 100644
--- a/board/qca/ipq40xx/ipq40xx.h
+++ b/board/qca/arm/ipq40xx/ipq40xx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -15,8 +15,8 @@
#define _IPQ40XX_CDP_H_
#include <configs/ipq40xx.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/qca_common.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/qca_common.h>
#include <asm/u-boot.h>
#include <phy.h>
diff --git a/board/qca/ipq40xx/ipq40xx_board_param.h b/board/qca/arm/ipq40xx/ipq40xx_board_param.h
similarity index 99%
rename from board/qca/ipq40xx/ipq40xx_board_param.h
rename to board/qca/arm/ipq40xx/ipq40xx_board_param.h
index 7ea4604..a8c7b04 100644
--- a/board/qca/ipq40xx/ipq40xx_board_param.h
+++ b/board/qca/arm/ipq40xx/ipq40xx_board_param.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -14,8 +14,8 @@
#ifndef _IPQ40XX_BOARD_PARAM_H_
#define _IPQ40XX_BOARD_PARAM_H_
-#include <asm/arch-qcom-common/iomap.h>
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/iomap.h>
+#include <asm/arch-qca-common/gpio.h>
#include <linux/sizes.h>
#include "ipq40xx.h"
diff --git a/board/qca/arm/ipq806x/Makefile b/board/qca/arm/ipq806x/Makefile
new file mode 100644
index 0000000..3d736a2
--- /dev/null
+++ b/board/qca/arm/ipq806x/Makefile
@@ -0,0 +1,4 @@
+ccflags-y += -I$(srctree)/board/qca/arm/common/
+
+obj-y += ipq806x.o
+
diff --git a/board/qca/ipq806x/ipq806x.c b/board/qca/arm/ipq806x/ipq806x.c
similarity index 96%
rename from board/qca/ipq806x/ipq806x.c
rename to board/qca/arm/ipq806x/ipq806x.c
index d558478..178c73a 100644
--- a/board/qca/ipq806x/ipq806x.c
+++ b/board/qca/arm/ipq806x/ipq806x.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,13 +16,13 @@
#include <asm/io.h>
#include <environment.h>
#include <fdtdec.h>
-#include <asm/arch-qcom-common/gsbi.h>
-#include <asm/arch-qcom-common/uart.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/gsbi.h>
+#include <asm/arch-qca-common/uart.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/smem.h>
#include <asm/arch-ipq806x/msm_ipq806x_gmac.h>
#include <linux/mtd/ipq_nand.h>
-#include <asm/arch-qcom-common/nand.h>
+#include <asm/arch-qca-common/nand.h>
#include <asm/arch-ipq806x/clk.h>
#include "ipq806x.h"
#include "qca_common.h"
@@ -136,7 +136,7 @@
ipq_nand.ebi2cr_regs = fdt32_to_cpu(nand_base[0]);
ipq_nand.ebi2nd_regs = fdt32_to_cpu(nand_base[2]);
ipq_nand.layout = IPQ_NAND_LAYOUT_LINUX;
- ipq_nand.variant = QCOM_NAND_IPQ;
+ ipq_nand.variant = QCA_NAND_IPQ;
qca_gpio_init(gpio_node);
ipq_nand_init(&ipq_nand);
}
diff --git a/board/qca/ipq806x/ipq806x.h b/board/qca/arm/ipq806x/ipq806x.h
similarity index 96%
rename from board/qca/ipq806x/ipq806x.h
rename to board/qca/arm/ipq806x/ipq806x.h
index ae6281f..0296d07 100644
--- a/board/qca/ipq806x/ipq806x.h
+++ b/board/qca/arm/ipq806x/ipq806x.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -17,7 +17,7 @@
#include <configs/ipq806x.h>
#include <asm/u-boot.h>
#include <asm/arch-ipq806x/clk.h>
-#include <asm/arch-qcom-common/qca_common.h>
+#include <asm/arch-qca-common/qca_common.h>
#include "phy.h"
#define GSBI4_BASE 0x16300000
diff --git a/board/qca/ipq807x/Makefile b/board/qca/arm/ipq807x/Makefile
similarity index 100%
rename from board/qca/ipq807x/Makefile
rename to board/qca/arm/ipq807x/Makefile
diff --git a/board/qca/ipq807x/clock.c b/board/qca/arm/ipq807x/clock.c
similarity index 100%
rename from board/qca/ipq807x/clock.c
rename to board/qca/arm/ipq807x/clock.c
diff --git a/board/qca/ipq807x/ipq807x.c b/board/qca/arm/ipq807x/ipq807x.c
similarity index 92%
rename from board/qca/ipq807x/ipq807x.c
rename to board/qca/arm/ipq807x/ipq807x.c
index ef220b3..f7e14eb 100644
--- a/board/qca/ipq807x/ipq807x.c
+++ b/board/qca/arm/ipq807x/ipq807x.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -15,10 +15,10 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <environment.h>
-#include <asm/arch-qcom-common/qca_common.h>
-#include <asm/arch-qcom-common/qpic_nand.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/uart.h>
+#include <asm/arch-qca-common/qca_common.h>
+#include <asm/arch-qca-common/qpic_nand.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/uart.h>
#include <fdtdec.h>
diff --git a/board/qca/ipq807x/ipq807x.h b/board/qca/arm/ipq807x/ipq807x.h
similarity index 93%
rename from board/qca/ipq807x/ipq807x.h
rename to board/qca/arm/ipq807x/ipq807x.h
index d29f74c..48cfa89 100644
--- a/board/qca/ipq807x/ipq807x.h
+++ b/board/qca/arm/ipq807x/ipq807x.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -16,7 +16,7 @@
#include <configs/ipq807x.h>
#include <asm/u-boot.h>
-#include <asm/arch-qcom-common/qca_common.h>
+#include <asm/arch-qca-common/qca_common.h>
/*
* GCC-SDCC Registers
diff --git a/board/qca/ipq40xx/Makefile b/board/qca/ipq40xx/Makefile
deleted file mode 100644
index 5f9b2e3..0000000
--- a/board/qca/ipq40xx/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ccflags-y += -I$(srctree)/board/qca/common/ -I$(srctree)/drivers/net/ipq40xx/
-
-obj-y := ipq40xx.o
diff --git a/board/qca/ipq806x/Makefile b/board/qca/ipq806x/Makefile
deleted file mode 100644
index b476dc1..0000000
--- a/board/qca/ipq806x/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-ccflags-y += -I$(srctree)/board/qca/common/
-
-obj-y := ipq806x.o
-
diff --git a/configs/ipq807x_defconfig b/configs/ipq807x_defconfig
index 9d6a3dc..0bcd5f5 100644
--- a/configs/ipq807x_defconfig
+++ b/configs/ipq807x_defconfig
@@ -196,7 +196,7 @@
# CONFIG_DM_MMC is not set
CONFIG_GENERIC_MMC=y
CONFIG_SDHCI=y
-CONFIG_SDHCI_QCOM=y
+CONFIG_SDHCI_QCA=y
#
# NAND Device Support
diff --git a/drivers/clk/ipq40xx_clk.c b/drivers/clk/ipq40xx_clk.c
index 17c07f1..cc4439c 100644
--- a/drivers/clk/ipq40xx_clk.c
+++ b/drivers/clk/ipq40xx_clk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,7 @@
#include <common.h>
#include <asm/arch-ipq40xx/clk.h>
-#include <asm/arch-qcom-common/iomap.h>
+#include <asm/arch-qca-common/iomap.h>
#include <asm/io.h>
#include <asm/errno.h>
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index d6c880e..eb81453 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -11,4 +11,4 @@
obj-$(CONFIG_TI_KSNAV) += keystone_nav.o keystone_nav_cfg.o
obj-$(CONFIG_TI_EDMA3) += ti-edma3.o
obj-$(CONFIG_DMA_LPC32XX) += lpc32xx_dma.o
-obj-$(CONFIG_QCOM_BAM) += bam.o
+obj-$(CONFIG_QCA_BAM) += bam.o
diff --git a/drivers/dma/bam.c b/drivers/dma/bam.c
index ef618a7..39b8552 100644
--- a/drivers/dma/bam.c
+++ b/drivers/dma/bam.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012,2015 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012,2015-2017 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#include <asm/errno.h>
#include <common.h>
-#include <asm/arch-qcom-common/bam.h>
+#include <asm/arch-qca-common/bam.h>
#define HLOS_EE_INDEX 0
/* Resets pipe registers and state machines */
diff --git a/drivers/gpio/ipq_gpio.c b/drivers/gpio/ipq_gpio.c
index 2b84ea5..9ae719f 100644
--- a/drivers/gpio/ipq_gpio.c
+++ b/drivers/gpio/ipq_gpio.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,7 @@
#include <common.h>
#include <asm/types.h>
#include <fdtdec.h>
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/gpio.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/i2c/qup_i2c.c b/drivers/i2c/qup_i2c.c
index 3d8d058..1973438 100644
--- a/drivers/i2c/qup_i2c.c
+++ b/drivers/i2c/qup_i2c.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -21,7 +21,7 @@
#include <dm/root.h>
#include <mapmem.h>
#include <dm.h>
-#include <asm/arch-qcom-common/qca_common.h>
+#include <asm/arch-qca-common/qca_common.h>
DECLARE_GLOBAL_DATA_PTR;
static int src_clk_freq;
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index cc71bc5..e90d77e 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -31,11 +31,11 @@
help
This enables SDHCI controllers support
-config SDHCI_QCOM
- bool "Enable Qualcomm SDHCI controllers"
+config SDHCI_QCA
+ bool "Enable QTI SDHCI controllers"
depends on SDHCI
help
- This enables Qualcomm SDHCI controller support
+ This enables QTI SDHCI controller support
config ROCKCHIP_DWMMC
bool "Rockchip SD/MMC controller support"
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index d533e9a..b5544c2 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -42,7 +42,7 @@
obj-$(CONFIG_SPEAR_SDHCI) += spear_sdhci.o
obj-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
obj-$(CONFIG_ZYNQ_SDHCI) += zynq_sdhci.o
-obj-$(CONFIG_SDHCI_QCOM) += qca_mmc.o
+obj-$(CONFIG_SDHCI_QCA) += qca_mmc.o
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_MMC_BOOT) += fsl_esdhc_spl.o
diff --git a/drivers/mmc/qca_mmc.c b/drivers/mmc/qca_mmc.c
index 40d601b..6413b71 100644
--- a/drivers/mmc/qca_mmc.c
+++ b/drivers/mmc/qca_mmc.c
@@ -19,7 +19,7 @@
#include <malloc.h>
#include <asm/io.h>
#include <asm-generic/errno.h>
-#include "../../board/qca/common/qca_common.h"
+#include "../../board/qca/arm/common/qca_common.h"
#include "qca_mmc.h"
static inline void qca_reg_wr_delay(qca_mmc *host)
diff --git a/drivers/mtd/nand/ipq_nand.c b/drivers/mtd/nand/ipq_nand.c
index 9a6934b..3635880 100644
--- a/drivers/mtd/nand/ipq_nand.c
+++ b/drivers/mtd/nand/ipq_nand.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -19,8 +19,8 @@
#include <asm/io.h>
#include <asm/errno.h>
-#include <asm/arch-qcom-common/nand.h>
-#include <asm/arch-qcom-common/ebi2.h>
+#include <asm/arch-qca-common/nand.h>
+#include <asm/arch-qca-common/ebi2.h>
#include <fdtdec.h>
#include <dm.h>
@@ -609,7 +609,7 @@
writel(dev->dev_cfg1_raw, ®s->dev0_cfg1);
/* we use BCH ECC on QPIC for both 4 bit and 8 bit strength */
- if (dev->variant == QCOM_NAND_QPIC)
+ if (dev->variant == QCA_NAND_QPIC)
writel(BCH_ECC_DISABLE(1), ®s->dev0_ecc_cfg);
dev->read_cmd = IPQ_CMD_PAGE_READ;
@@ -1727,7 +1727,7 @@
mtd->oobavail += cw_layout->oob_size;
}
- if (dev->variant == QCOM_NAND_QPIC) {
+ if (dev->variant == QCA_NAND_QPIC) {
/*
* On IPQ40xx with the QPIC controller, we use BCH for both ECC
* modes
@@ -1871,7 +1871,7 @@
memset(dev->zero_page, 0x0, mtd->writesize);
memset(dev->zero_oob, 0x0, mtd->oobsize);
- if (dev->variant == QCOM_NAND_QPIC)
+ if (dev->variant == QCA_NAND_QPIC)
configs = qpic_configs[layout];
else
configs = ipq_configs[layout];
@@ -1984,7 +1984,7 @@
regs = ipq_nand_dev.regs =
(struct ebi2nd_regs *) ipq_nand->ebi2nd_regs;
- if (ipq_nand_dev.variant == QCOM_NAND_QPIC) {
+ if (ipq_nand_dev.variant == QCA_NAND_QPIC) {
/* Reset QPIC BAM */
qpic_bam_reset(regs);
@@ -1993,7 +1993,7 @@
chip = mtd->priv;
chip->priv = &ipq_nand_dev;
- if (ipq_nand_dev.variant == QCOM_NAND_QPIC) {
+ if (ipq_nand_dev.variant == QCA_NAND_QPIC) {
/* bypass XPU */
writel(0x1, ®s->qpic_nand_mpu_bypass);
@@ -2107,7 +2107,7 @@
ipq_nand.ebi2cr_regs = fdt32_to_cpu(nand_base[0]);
ipq_nand.ebi2nd_regs = fdt32_to_cpu(nand_base[2]);
ipq_nand.layout = layout;
- ipq_nand.variant = QCOM_NAND_IPQ;
+ ipq_nand.variant = QCA_NAND_IPQ;
ret = ipq_nand_init(&ipq_nand);
if (ret < 0)
return CMD_RET_FAILURE;
diff --git a/drivers/mtd/nand/qpic_nand.c b/drivers/mtd/nand/qpic_nand.c
index 7006560..58cd88a 100644
--- a/drivers/mtd/nand/qpic_nand.c
+++ b/drivers/mtd/nand/qpic_nand.c
@@ -33,9 +33,9 @@
#include <asm/errno.h>
#include <nand.h>
#include <linux/mtd/nand.h>
-#include <asm/arch-qcom-common/bam.h>
-#include <asm/arch-qcom-common/qpic_nand.h>
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/bam.h>
+#include <asm/arch-qca-common/qpic_nand.h>
+#include <asm/arch-qca-common/gpio.h>
#include <fdtdec.h>
#include <dm.h>
@@ -54,8 +54,8 @@
struct nand_ecclayout fake_ecc_layout;
static const struct udevice_id qpic_ver_ids[] = {
- { .compatible = "qcom,qpic-nand.1.4.20", .data = QCOM_QPIC_V1_4_20 },
- { .compatible = "qcom,qpic-nand.1.5.20", .data = QCOM_QPIC_V1_5_20 },
+ { .compatible = "qcom,qpic-nand.1.4.20", .data = QCA_QPIC_V1_4_20 },
+ { .compatible = "qcom,qpic-nand.1.5.20", .data = QCA_QPIC_V1_5_20 },
{ },
};
@@ -213,7 +213,7 @@
vld = NAND_CMD_VALID_BASE;
- if (hw_ver == QCOM_QPIC_V1_5_20)
+ if (hw_ver == QCA_QPIC_V1_5_20)
cmd_vld = NAND_DEV_CMD_VLD_V1_5_20;
bam_add_cmd_element(cmd_list_ptr, cmd_vld, (uint32_t)vld,
@@ -402,7 +402,7 @@
cmd_list_ptr = qpic_nand_add_addr_n_cfg_ce(¶ms->cfg, cmd_list_ptr);
- if (hw_ver == QCOM_QPIC_V1_5_20) {
+ if (hw_ver == QCA_QPIC_V1_5_20) {
cmd_vld = NAND_DEV_CMD_VLD_V1_5_20;
dev_cmd1 = NAND_DEV_CMD1_V1_5_20;
}
@@ -494,7 +494,7 @@
uint32_t cmd_vld = NAND_DEV_CMD_VLD_V1_4_20;
uint32_t dev_cmd1_reg = NAND_DEV_CMD1_V1_4_20;
- if (hw_ver == QCOM_QPIC_V1_5_20) {
+ if (hw_ver == QCA_QPIC_V1_5_20) {
cmd_vld = NAND_DEV_CMD_VLD_V1_5_20;
dev_cmd1_reg = NAND_DEV_CMD1_V1_5_20;
}
@@ -688,7 +688,7 @@
return -ENOMEM;
}
- if (hw_ver == QCOM_QPIC_V1_5_20) {
+ if (hw_ver == QCA_QPIC_V1_5_20) {
cmd_vld = NAND_DEV_CMD_VLD_V1_5_20;
dev_cmd1_reg = NAND_DEV_CMD1_V1_5_20;
}
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6a35765..2e956ab 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
-ccflags-y += -I$(srctree)/board/qca/ipq40xx -I$(srctree)/board/qca/common
+ccflags-y += -I$(srctree)/board/qca/arm/ipq40xx -I$(srctree)/board/qca/arm/common
obj-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
obj-$(CONFIG_ALTERA_TSE) += altera_tse.o
diff --git a/drivers/net/ipq806x/ipq_gmac_eth.c b/drivers/net/ipq806x/ipq_gmac_eth.c
index fae341b..be297d7 100644
--- a/drivers/net/ipq806x/ipq_gmac_eth.c
+++ b/drivers/net/ipq806x/ipq_gmac_eth.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 - 2013, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012 - 2013, 2016-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -23,7 +23,7 @@
#include <asm/arch-ipq806x/clk.h>
#include <asm/arch-ipq806x/ipq_gmac.h>
#include <asm/arch-ipq806x/msm_ipq806x_gmac.h>
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/gpio.h>
#include <dt-bindings/qcom/gpio-ipq806x.h>
#define ipq_info printf
diff --git a/drivers/pci/pci_ipq.c b/drivers/pci/pci_ipq.c
index 64bb5f3..10fe12e 100644
--- a/drivers/pci/pci_ipq.c
+++ b/drivers/pci/pci_ipq.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2015-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -17,8 +17,8 @@
#include <linux/sizes.h>
#include <asm/io.h>
#include <asm/errno.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/iomap.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/iomap.h>
#include <fdtdec.h>
#include <dm.h>
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index b8cc879..14dd14c 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -8,9 +8,9 @@
ccflags-y += -I$(srctree)/board/qca/ipq40xx
cppflags-y += -I$(srctree)/board/qca/ipq40xx
-obj-$(CONFIG_ARCH_IPQ807x) += qcom_uart.o
-obj-$(CONFIG_ARCH_IPQ806x) += qcom_uart.o
-obj-$(CONFIG_ARCH_IPQ40xx) += qcom_uart.o
+obj-$(CONFIG_ARCH_IPQ807x) += qca_uart.o
+obj-$(CONFIG_ARCH_IPQ806x) += qca_uart.o
+obj-$(CONFIG_ARCH_IPQ40xx) += qca_uart.o
ifdef CONFIG_DM_SERIAL
obj-y += serial-uclass.o
obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o
diff --git a/drivers/serial/qcom_uart.c b/drivers/serial/qca_uart.c
similarity index 98%
rename from drivers/serial/qcom_uart.c
rename to drivers/serial/qca_uart.c
index 0e6c071..d6ec55f 100644
--- a/drivers/serial/qcom_uart.c
+++ b/drivers/serial/qca_uart.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted (subject to the limitations in the
@@ -34,8 +34,8 @@
#include <common.h>
#include <watchdog.h>
-#include <asm/arch-qcom-common/uart.h>
-#include <asm/arch-qcom-common/gsbi.h>
+#include <asm/arch-qca-common/uart.h>
+#include <asm/arch-qca-common/gsbi.h>
#include <dm.h>
#include <errno.h>
#include <fdtdec.h>
diff --git a/drivers/spi/ipq_spi.c b/drivers/spi/ipq_spi.c
index a17be0a..c97f6fb 100644
--- a/drivers/spi/ipq_spi.c
+++ b/drivers/spi/ipq_spi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -19,7 +19,7 @@
#include <asm/io.h>
#include <asm/errno.h>
#include "ipq_spi.h"
-#include <asm/arch-qcom-common/gpio.h>
+#include <asm/arch-qca-common/gpio.h>
#include <dt-bindings/qcom/gpio-ipq806x.h>
#define SUCCESS 0
diff --git a/drivers/spi/qca_qup_spi.c b/drivers/spi/qca_qup_spi.c
index 83325c8..b95a4c6 100644
--- a/drivers/spi/qca_qup_spi.c
+++ b/drivers/spi/qca_qup_spi.c
@@ -1,6 +1,6 @@
/*
* BLSP QUP SPI controller driver.
- * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -19,8 +19,8 @@
#include <malloc.h>
#include <asm/io.h>
#include <asm/errno.h>
-#include <asm/arch-qcom-common/gpio.h>
-#include <asm/arch-qcom-common/iomap.h>
+#include <asm/arch-qca-common/gpio.h>
+#include <asm/arch-qca-common/iomap.h>
#include "qca_qup_spi.h"
static int check_bit_state(uint32_t reg_addr, int bit_num, int val, int us_delay)
diff --git a/include/common.h b/include/common.h
index 8c24543..b6865aa 100644
--- a/include/common.h
+++ b/include/common.h
@@ -30,13 +30,13 @@
#endif
#if defined(CONFIG_IPQ40XX)
-#include <../board/qca/ipq40xx/ipq40xx.h>
+#include <../board/qca/arm/ipq40xx/ipq40xx.h>
#elif defined(CONFIG_IPQ806X)
-#include <../board/qca/ipq806x/ipq806x.h>
+#include <../board/qca/arm/ipq806x/ipq806x.h>
#elif defined(CONFIG_IPQ_RUMI)
-#include <../board/qca/ipq807x/ipq807x.h>
+#include <../board/qca/arm/ipq807x/ipq807x.h>
#endif
#if defined(CONFIG_8xx)
diff --git a/include/configs/ipq40xx.h b/include/configs/ipq40xx.h
index 772a73f..f1a2db4 100644
--- a/include/configs/ipq40xx.h
+++ b/include/configs/ipq40xx.h
@@ -147,7 +147,7 @@
* size is configured to 64 */
#define CONFIG_SYS_CACHELINE_SIZE 64
-#define CONFIG_QCOM_BAM 1
+#define CONFIG_QCA_BAM 1
/*
* NAND Flash Configs104
*/
@@ -265,7 +265,7 @@
#define CONFIG_MMC
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_CMD_MMC
-#define CONFIG_SDHCI_QCOM
+#define CONFIG_SDHCI_QCA
#define CONFIG_GENERIC_MMC
#define CONFIG_EFI_PARTITION
#define CONFIG_SYS_MMC_ENV_DEV 0
diff --git a/include/configs/ipq807x.h b/include/configs/ipq807x.h
index f6f5b32..87c6697 100644
--- a/include/configs/ipq807x.h
+++ b/include/configs/ipq807x.h
@@ -133,7 +133,7 @@
#define CONFIG_SPI_FLASH_BAR 1
#define CONFIG_EFI_PARTITION
-#define CONFIG_QCOM_BAM 1
+#define CONFIG_QCA_BAM 1
/*
* NAND Flash Configs
*/
diff --git a/include/fdtdec.h b/include/fdtdec.h
index 491520a..8290d46 100644
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -170,9 +170,9 @@
COMPAT_ALTERA_SOCFPGA_DWC2USB, /* SoCFPGA DWC2 USB controller */
COMPAT_INTEL_BAYTRAIL_FSP, /* Intel Bay Trail FSP */
COMPAT_INTEL_BAYTRAIL_FSP_MDP, /* Intel FSP memory-down params */
- COMPAT_QCOM_QPIC_NAND_V1_5_20, /* Qualcomm QPIC NAND controller */
- COMPAT_QCOM_QPIC_NAND_V1_4_20, /* Qualcomm QPIC NAND controller */
- COMPAT_QCOM_QUP_I2C, /* Qualcomm QUP I2C controller */
+ COMPAT_QCA_QPIC_NAND_V1_5_20, /* QTI QPIC NAND controller */
+ COMPAT_QCA_QPIC_NAND_V1_4_20, /* QTI QPIC NAND controller */
+ COMPAT_QCA_QUP_I2C, /* QTI QUP I2C controller */
COMPAT_COUNT,
};
diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 59450f2..5ae8c90 100644
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -11,7 +11,7 @@
#include <fdtdec.h>
#include <asm/sections.h>
#include <linux/ctype.h>
-#include <asm/arch-qcom-common/smem.h>
+#include <asm/arch-qca-common/smem.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -75,9 +75,9 @@
COMPAT(ALTERA_SOCFPGA_DWC2USB, "snps,dwc2"),
COMPAT(COMPAT_INTEL_BAYTRAIL_FSP, "intel,baytrail-fsp"),
COMPAT(COMPAT_INTEL_BAYTRAIL_FSP_MDP, "intel,baytrail-fsp-mdp"),
- COMPAT(COMPAT_QCOM_QPIC_NAND_V1_5_20, "qcom,qpic-nand.1.5.20"),
- COMPAT(COMPAT_QCOM_QPIC_NAND_V1_4_20, "qcom,qpic-nand.1.4.20"),
- COMPAT(QCOM_QUP_I2C, "qcom,qup-ip2c"),
+ COMPAT(COMPAT_QCA_QPIC_NAND_V1_5_20, "qcom,qpic-nand.1.5.20"),
+ COMPAT(COMPAT_QCA_QPIC_NAND_V1_4_20, "qcom,qpic-nand.1.4.20"),
+ COMPAT(QCA_QUP_I2C, "qcom,qup-ip2c"),
};
const char *fdtdec_get_compatible(enum fdt_compat_id id)