Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b46926bb authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[ARM] Orion: catch a couple more alternative spellings of PCIe



Unify a couple more spellings of "PCIe" ("PCI-E", "PCIE".)

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 994cab84
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -19,14 +19,14 @@


/*
/*
 * The Orion has fully programable address map. There's a separate address
 * The Orion has fully programable address map. There's a separate address
 * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIE, USB,
 * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIe, USB,
 * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
 * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
 * address decode windows that allow it to access any of the Orion resources.
 * address decode windows that allow it to access any of the Orion resources.
 *
 *
 * CPU address decoding --
 * CPU address decoding --
 * Linux assumes that it is the boot loader that already setup the access to
 * Linux assumes that it is the boot loader that already setup the access to
 * DDR and internal registers.
 * DDR and internal registers.
 * Setup access to PCI and PCI-E IO/MEM space is issued by this file.
 * Setup access to PCI and PCIe IO/MEM space is issued by this file.
 * Setup access to various devices located on the device bus interface (e.g.
 * Setup access to various devices located on the device bus interface (e.g.
 * flashes, RTC, etc) should be issued by machine-setup.c according to
 * flashes, RTC, etc) should be issued by machine-setup.c according to
 * specific board population (by using orion5x_setup_*_win()).
 * specific board population (by using orion5x_setup_*_win()).
+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ struct sys_timer orion5x_timer = {
 ****************************************************************************/
 ****************************************************************************/


/*
/*
 * Identify device ID and rev from PCIE configuration header space '0'.
 * Identify device ID and rev from PCIe configuration header space '0'.
 */
 */
static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
{
{
+2 −2
Original line number Original line Diff line number Diff line
@@ -258,9 +258,9 @@ static void __init dns323_init(void)
	 */
	 */
	orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);
	orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);


	/* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIE
	/* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
	 *
	 *
	 * Open a special address decode windows for the PCIE WA.
	 * Open a special address decode windows for the PCIe WA.
	 */
	 */
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
				ORION5X_PCIE_WA_SIZE);
				ORION5X_PCIE_WA_SIZE);
+1 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ static void __init kurobox_pro_init(void)
	orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE);
	orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE);


	/*
	/*
	 * Open a special address decode windows for the PCIE WA.
	 * Open a special address decode windows for the PCIe WA.
	 */
	 */
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
				ORION5X_PCIE_WA_SIZE);
				ORION5X_PCIE_WA_SIZE);
+1 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,7 @@ static void __init rd88f5182_init(void)
	orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
	orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);


	/*
	/*
	 * Open a special address decode windows for the PCIE WA.
	 * Open a special address decode windows for the PCIe WA.
	 */
	 */
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
				ORION5X_PCIE_WA_SIZE);
				ORION5X_PCIE_WA_SIZE);
Loading