GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci/layerscape: remove unnecessary pcie_layerscape.h

Browse source 
The patch uses the common function name ft_pci_setup to replace
ft_pcie_setup, then removes unnecessary pcie_layerscape.h because
all the functions have been declared in common.h.

Signed-off-by: Minghuan Lian <Minghuan.Lian@freescale.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Minghuan Lian 2015-03-12 10:58:48 +08:00 • committed by York Sun
parent 4a4323af3d
commit d42bd3453a
4 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/arm/include/asm/pcie_layerscape.h
View file

@ -1,13 +0,0 @@
/*
* Copyright 2014 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __PCIE_LAYERSCAPE_H_
#define __PCIE_LAYERSCAPE_H_
void pci_init_board(void);
void ft_pcie_setup(void *blob, bd_t *bd);
#endif

5
board/freescale/ls1021aqds/ls1021aqds.c
View file

@ -12,7 +12,6 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/fsl_serdes.h> #include <asm/arch/fsl_serdes.h>
#include <asm/arch/ls102xa_stream_id.h> #include <asm/arch/ls102xa_stream_id.h>
#include <asm/pcie_layerscape.h>
#include <hwconfig.h> #include <hwconfig.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
@ -623,8 +622,8 @@ int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCIE_LAYERSCAPE #ifdef CONFIG_PCI
ft_pcie_setup(blob, bd); ft_pci_setup(blob, bd);
#endif #endif
return 0; return 0;

5
board/freescale/ls1021atwr/ls1021atwr.c
View file

@ -12,7 +12,6 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/fsl_serdes.h> #include <asm/arch/fsl_serdes.h>
#include <asm/arch/ls102xa_stream_id.h> #include <asm/arch/ls102xa_stream_id.h>
#include <asm/pcie_layerscape.h>
#include <hwconfig.h> #include <hwconfig.h>
#include <mmc.h> #include <mmc.h>
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
@ -568,8 +567,8 @@ int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
#ifdef CONFIG_PCIE_LAYERSCAPE #ifdef CONFIG_PCI
ft_pcie_setup(blob, bd); ft_pci_setup(blob, bd);
#endif #endif
return 0; return 0;

5
drivers/pci/pcie_layerscape.c
View file

@ -11,7 +11,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <errno.h> #include <errno.h>
#include <malloc.h> #include <malloc.h>
#include <asm/pcie_layerscape.h>
#ifndef CONFIG_SYS_PCI_MEMORY_BUS #ifndef CONFIG_SYS_PCI_MEMORY_BUS
#define CONFIG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE #define CONFIG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE
@ -486,7 +485,7 @@ static void ft_pcie_ls_setup(void *blob, const char *pci_compat,
fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0); fdt_set_node_status(blob, off, FDT_STATUS_DISABLED, 0);
} }
void ft_pcie_setup(void *blob, bd_t *bd) void ft_pci_setup(void *blob, bd_t *bd)
{ {
#ifdef CONFIG_PCIE1 #ifdef CONFIG_PCIE1
ft_pcie_ls_setup(blob, FSL_PCIE_COMPAT, CONFIG_SYS_PCIE1_ADDR, PCIE1); ft_pcie_ls_setup(blob, FSL_PCIE_COMPAT, CONFIG_SYS_PCIE1_ADDR, PCIE1);
@ -506,7 +505,7 @@ void ft_pcie_setup(void *blob, bd_t *bd)
} }
#else #else
void ft_pcie_setup(void *blob, bd_t *bd) void ft_pci_setup(void *blob, bd_t *bd)
{ {
} }
#endif #endif