mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

qca: move ARM specific files to another sublevel

Browse source 
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>
This commit is contained in:
Prabhu Jayakumar 2017-01-02 14:19:25 +05:30
parent fbfc4db4c3
commit 97c3087906
64 changed files with 174 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/qca/common/Makefile
View file

@ -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

4
arch/arm/cpu/armv7/qca/common/scm.c
View file

@ -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>
/**

4
arch/arm/cpu/armv7/qca/common/smem.c
View file

@ -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"

2
arch/arm/include/asm/arch-qcom-common/bam.h → arch/arm/include/asm/arch-qca-common/bam.h
View file

@ -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

6
arch/arm/include/asm/arch-qcom-common/ebi2.h → arch/arm/include/asm/arch-qca-common/ebi2.h
View file

@ -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)

2
arch/arm/include/asm/arch-qcom-common/gpio.h → arch/arm/include/asm/arch-qca-common/gpio.h
View file

@ -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

2
arch/arm/include/asm/arch-qcom-common/gsbi.h → arch/arm/include/asm/arch-qca-common/gsbi.h
View file

@ -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

2
arch/arm/include/asm/arch-qcom-common/iomap.h → arch/arm/include/asm/arch-qca-common/iomap.h
View file

@ -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

10
arch/arm/include/asm/arch-qcom-common/nand.h → arch/arm/include/asm/arch-qca-common/nand.h
View file

@ -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 @@ struct ebi2nd_regs {
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

2
arch/arm/include/asm/arch-qcom-common/qca_common.h → arch/arm/include/asm/arch-qca-common/qca_common.h
View file

@ -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

6
arch/arm/include/asm/arch-qcom-common/qpic_nand.h → arch/arm/include/asm/arch-qca-common/qpic_nand.h
View file

@ -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,
};

2
arch/arm/include/asm/arch-qcom-common/scm.h → arch/arm/include/asm/arch-qca-common/scm.h
View file

@ -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

2
arch/arm/include/asm/arch-qcom-common/smem.h → arch/arm/include/asm/arch-qca-common/smem.h
View file

@ -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

2
arch/arm/include/asm/arch-qcom-common/uart.h → arch/arm/include/asm/arch-qca-common/uart.h
View file

@ -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

2
arch/arm/lib/bootm.c
View file

@ -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;

2
board/ipq40xx/Kconfig
View file

@ -7,7 +7,7 @@ config SYS_BOARD
default "ipq40xx"
config SYS_VENDOR
default "qca"
default "qca/arm"
config SYS_CONFIG_NAME
default "ipq40xx"

2
board/ipq806x/Kconfig
View file

@ -7,7 +7,7 @@ config SYS_BOARD
default "ipq806x"
config SYS_VENDOR
default "qca"
default "qca/arm"
config SYS_CONFIG_NAME
default "ipq806x"

2
board/ipq807x/Kconfig
View file

@ -5,7 +5,7 @@ config SYS_BOARD
default "ipq807x"
config SYS_VENDOR
default "qca"
default "qca/arm"
config SYS_CONFIG_NAME
default "ipq807x"

0
board/qca/common/Makefile → board/qca/arm/common/Makefile
View file

8
board/qca/common/board_init.c → board/qca/arm/common/board_init.c
View file

@ -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;

6
board/qca/common/cmd_blowsecfuse.c → board/qca/arm/common/cmd_blowsecfuse.c
View file

@ -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"

66
board/qca/common/cmd_bootqca.c → board/qca/arm/common/cmd_bootqca.c
View file

@ -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 @@ U_BOOT_CMD(bootipq, 2, 0, do_bootipq,
#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 @@ U_BOOT_CMD(bootipq, 2, 0, do_bootipq,
/* 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 crashdump_flash_spi_cxt crashdump_flash_spi_cnxt;
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 @@ static int qcom_wdt_scm_extract_tlv_info(
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 @@ static int qcom_wdt_scm_extract_tlv_info(
}
/* 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 @@ static int qcom_wdt_scm_extract_tlv_data(
* 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 @@ static int qcom_wdt_extract_crashdump_data(
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 @@ int crashdump_emmc_flash_write_data(void *cnxt,
* 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 @@ static int do_dumpqca_flash_data(cmd_tbl_t *cmdtp, int flag,
{
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 @@ static int do_dumpqca_flash_data(cmd_tbl_t *cmdtp, int flag,
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) {

4
board/qca/common/env.c → board/qca/arm/common/env.c
View file

@ -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);

4
board/qca/common/ethaddr.c → board/qca/arm/common/ethaddr.c
View file

@ -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

6
board/qca/common/fdt_fixup.c → board/qca/arm/common/fdt_fixup.c
View file

@ -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>

0
board/qca/common/fdt_info.c → board/qca/arm/common/fdt_info.c
View file

0
board/qca/common/fdt_info.h → board/qca/arm/common/fdt_info.h
View file

0
board/qca/common/qca_common.h → board/qca/arm/common/qca_common.h
View file

3
board/qca/arm/ipq40xx/Makefile Normal file
View file

@ -0,0 +1,3 @@
ccflags-y += -I$(srctree)/board/qca/arm/common/ -I$(srctree)/drivers/net/ipq40xx/
obj-y += ipq40xx.o

14
board/qca/ipq40xx/ipq40xx.c → board/qca/arm/ipq40xx/ipq40xx.c
View file

@ -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>

6
board/qca/ipq40xx/ipq40xx.h → board/qca/arm/ipq40xx/ipq40xx.h
View file

@ -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>

6
board/qca/ipq40xx/ipq40xx_board_param.h → board/qca/arm/ipq40xx/ipq40xx_board_param.h
View file

@ -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"

4
board/qca/arm/ipq806x/Makefile Normal file
View file

@ -0,0 +1,4 @@
ccflags-y += -I$(srctree)/board/qca/arm/common/
obj-y += ipq806x.o

14
board/qca/ipq806x/ipq806x.c → board/qca/arm/ipq806x/ipq806x.c
View file

@ -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 @@ void board_nand_init(void)
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);
}

4
board/qca/ipq806x/ipq806x.h → board/qca/arm/ipq806x/ipq806x.h
View file

@ -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

0
board/qca/ipq807x/Makefile → board/qca/arm/ipq807x/Makefile
View file

0
board/qca/ipq807x/clock.c → board/qca/arm/ipq807x/clock.c
View file

10
board/qca/ipq807x/ipq807x.c → board/qca/arm/ipq807x/ipq807x.c
View file

@ -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>

4
board/qca/ipq807x/ipq807x.h → board/qca/arm/ipq807x/ipq807x.h
View file

@ -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

3
board/qca/ipq40xx/Makefile
View file

@ -1,3 +0,0 @@
ccflags-y += -I$(srctree)/board/qca/common/ -I$(srctree)/drivers/net/ipq40xx/
obj-y := ipq40xx.o

4
board/qca/ipq806x/Makefile
View file

@ -1,4 +0,0 @@
ccflags-y += -I$(srctree)/board/qca/common/
obj-y := ipq806x.o

2
configs/ipq807x_defconfig
View file

@ -196,7 +196,7 @@ CONFIG_SIMPLE_BUS=y
# CONFIG_DM_MMC is not set
CONFIG_GENERIC_MMC=y
CONFIG_SDHCI=y
CONFIG_SDHCI_QCOM=y
CONFIG_SDHCI_QCA=y
#
# NAND Device Support

4
drivers/clk/ipq40xx_clk.c
View file

@ -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>

2
drivers/dma/Makefile
View file

@ -11,4 +11,4 @@ obj-$(CONFIG_FSL_DMA) += fsl_dma.o
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

4
drivers/dma/bam.c
View file

@ -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 */

4
drivers/gpio/ipq_gpio.c
View file

@ -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;

4
drivers/i2c/qup_i2c.c
View file

@ -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;

6
drivers/mmc/Kconfig
View file

@ -31,11 +31,11 @@ config SDHCI
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"

2
drivers/mmc/Makefile
View file

@ -42,7 +42,7 @@ obj-$(CONFIG_SOCFPGA_DWMMC) += socfpga_dw_mmc.o
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

2
drivers/mmc/qca_mmc.c
View file

@ -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)

18
drivers/mtd/nand/ipq_nand.c
View file

@ -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 @@ static void ipq_enter_raw_mode(struct mtd_info *mtd)
writel(dev->dev_cfg1_raw, &regs->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), &regs->dev0_ecc_cfg);
dev->read_cmd = IPQ_CMD_PAGE_READ;
@ -1727,7 +1727,7 @@ static void ipq_nand_hw_config(struct mtd_info *mtd, struct ipq_config *cfg)
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 @@ int ipq_nand_post_scan_init(struct mtd_info *mtd, enum ipq_nand_layout layout)
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 @@ int ipq_nand_init (struct ipq_nand *ipq_nand)
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 @@ int ipq_nand_init (struct ipq_nand *ipq_nand)
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, &regs->qpic_nand_mpu_bypass);
@ -2107,7 +2107,7 @@ static int do_ipq_nand_cmd(cmd_tbl_t *cmdtp, int flag,
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;

18
drivers/mtd/nand/qpic_nand.c
View file

@ -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 @@ static struct bam_instance bam;
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 @@ qpic_nand_fetch_id(struct mtd_info *mtd)
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 @@ qpic_nand_add_onfi_probe_ce(struct onfi_probe_params *params,
cmd_list_ptr = qpic_nand_add_addr_n_cfg_ce(&params->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 @@ qpic_nand_onfi_probe_cleanup(uint32_t vld, uint32_t dev_cmd1)
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 @@ qpic_nand_onfi_probe(struct mtd_info *mtd)
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;
}

2
drivers/net/Makefile
View file

@ -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

4
drivers/net/ipq806x/ipq_gmac_eth.c
View file

@ -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

6
drivers/pci/pci_ipq.c
View file

@ -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>

6
drivers/serial/Makefile
View file

@ -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

6
drivers/serial/qcom_uart.c → drivers/serial/qca_uart.c
View file

@ -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>

4
drivers/spi/ipq_spi.c
View file

@ -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

6
drivers/spi/qca_qup_spi.c
View file

@ -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)

6
include/common.h
View file

@ -30,13 +30,13 @@ typedef volatile unsigned char vu_char;
#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)

4
include/configs/ipq40xx.h
View file

@ -147,7 +147,7 @@ typedef struct {
* 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 @@ typedef struct {
#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

2
include/configs/ipq807x.h
View file

@ -133,7 +133,7 @@ extern loff_t board_env_offset;
#define CONFIG_SPI_FLASH_BAR 1
#define CONFIG_EFI_PARTITION
#define CONFIG_QCOM_BAM 1
#define CONFIG_QCA_BAM 1
/*
* NAND Flash Configs
*/

6
include/fdtdec.h
View file

@ -170,9 +170,9 @@ enum fdt_compat_id {
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,
};

8
lib/fdtdec.c
View file

@ -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 @@ static const char * const compat_names[COMPAT_COUNT] = {
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)