adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: pcie_ep: iproc: shorten file names

Browse source 
File names such as pcie_ep_bcm_iproc.c / pcie_ep_bcm_iproc_regs.h
seem unnecessarily long, same with CONFIG symbols' names.
Let's shorten them by replacing 'bcm_iproc' with simply 'iproc'.

Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
This commit is contained in:
Abhishek Shah 2020-09-28 22:09:26 +05:30 committed by Carles Cufí
parent 9b09125fe8
commit 8d226c595d
7 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/bcm958402m2_a72/bcm958402m2_a72_defconfig
View file

@ -23,5 +23,5 @@ CONFIG_UART_CONSOLE=y
# Enable PCIe EP
CONFIG_PCIE_ENDPOINT=y
CONFIG_PCIE_EP_BCM_IPROC=y
CONFIG_PCIE_EP_BCM_IPROC_V2=y
CONFIG_PCIE_EP_IPROC=y
CONFIG_PCIE_EP_IPROC_V2=y

2
drivers/pcie/endpoint/CMakeLists.txt
View file

@ -2,4 +2,4 @@
zephyr_sources(pcie_ep_common.c)
zephyr_sources_ifdef(CONFIG_PCIE_EP_BCM_IPROC pcie_ep_bcm_iproc.c)
zephyr_sources_ifdef(CONFIG_PCIE_EP_IPROC pcie_ep_iproc.c)

2
drivers/pcie/endpoint/Kconfig
View file

@ -16,6 +16,6 @@ source "subsys/logging/Kconfig.template.log_config"
comment "PCIe Endpoint Drivers"
source "drivers/pcie/endpoint/Kconfig.bcm_iproc"
source "drivers/pcie/endpoint/Kconfig.iproc"
endif # PCIE_ENDPOINT

10
drivers/pcie/endpoint/Kconfig.bcm_iproc → drivers/pcie/endpoint/Kconfig.iproc
View file

@ -3,20 +3,20 @@
# Copyright 2020 Broadcom
# SPDX-License-Identifier: Apache-2.0
menuconfig PCIE_EP_BCM_IPROC
menuconfig PCIE_EP_IPROC
bool "Broadcom iProc PCIe EP driver"
default n
help
This option enables Broadcom iProc PCIe EP driver.
if PCIE_EP_BCM_IPROC
if PCIE_EP_IPROC
config PCIE_EP_BCM_IPROC_INIT_CFG
config PCIE_EP_IPROC_INIT_CFG
bool "Re-initialize PCIe MSI/MSIX configurations"
default n
config PCIE_EP_BCM_IPROC_V2
config PCIE_EP_IPROC_V2
bool "Version-2 of iProc PCIe EP controller"
default n
endif # PCIE_EP_BCM_IPROC
endif # PCIE_EP_IPROC

10
drivers/pcie/endpoint/pcie_ep_bcm_iproc.c → drivers/pcie/endpoint/pcie_ep_iproc.c
View file

@ -12,8 +12,8 @@ LOG_MODULE_REGISTER(iproc_pcie);
#include <soc.h>
#include "pcie_ep_bcm_iproc.h"
#include "pcie_ep_bcm_iproc_regs.h"
#include "pcie_ep_iproc.h"
#include "pcie_ep_iproc_regs.h"
#define DT_DRV_COMPAT brcm_iproc_pcie_ep
@ -150,7 +150,7 @@ static int iproc_pcie_generate_msi(const struct device *dev,
const uint32_t msi_num)
{
int ret = 0;
#ifdef CONFIG_PCIE_EP_BCM_IPROC_V2
#ifdef CONFIG_PCIE_EP_IPROC_V2
uint64_t addr;
uint32_t data;
@ -402,7 +402,7 @@ static void iproc_pcie_reset_config(const struct device *dev)
#endif
}
#ifdef CONFIG_PCIE_EP_BCM_IPROC_INIT_CFG
#ifdef PCIE_EP_IPROC_INIT_CFG
static void iproc_pcie_msix_config(const struct device *dev)
{
/*
@ -459,7 +459,7 @@ static int iproc_pcie_ep_init(const struct device *dev)
LOG_INF("PCIe linkup width 0x%x\n", ((data >>
PCIE_LINKWIDTH_SHIFT) & PCIE_LINKWIDTH_MASK));
#ifdef CONFIG_PCIE_EP_BCM_IPROC_INIT_CFG
#ifdef PCIE_EP_IPROC_INIT_CFG
iproc_pcie_msi_config(dev);
iproc_pcie_msix_config(dev);
#endif

6
drivers/pcie/endpoint/pcie_ep_bcm_iproc.h → drivers/pcie/endpoint/pcie_ep_iproc.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_H_
#define ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_H_
#ifndef ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_H_
#define ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_H_
#include <sys/util.h>
@ -78,4 +78,4 @@ struct iproc_pcie_ep_ctx {
void *reset_data[PCIE_RESET_MAX];
};
#endif /* ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_H_ */
#endif /* ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_H_ */

8
drivers/pcie/endpoint/pcie_ep_bcm_iproc_regs.h → drivers/pcie/endpoint/pcie_ep_iproc_regs.h
View file

@ -4,15 +4,15 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_REGS_H_
#define ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_REGS_H_
#ifndef ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_REGS_H_
#define ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_REGS_H_
struct paxb_64 {
uint32_t lower;
uint32_t upper;
};
#ifdef CONFIG_PCIE_EP_BCM_IPROC_V2
#ifdef CONFIG_PCIE_EP_IPROC_V2
struct paxb_imap {
uint32_t lower;
uint32_t upper;
@ -362,4 +362,4 @@ static inline uint32_t pcie_read32(uint32_t *addr)
{
return sys_read32((mem_addr_t)addr);
}
#endif /* ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_BCM_IPROC_REGS_H_ */
#endif /* ZEPHYR_INCLUDE_DRIVERS_PCIE_EP_IPROC_REGS_H_ */