Commit 2341ab4f authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Lorenzo Pieralisi
Browse files

PCI: keystone: Use platform_get_resource_byname() to get memory resources 



Use platform_get_resource_byname() instead of platform_get_resource()
which uses an index to get memory resources. While at that get the memory
resource defined specifically for configuration space instead of
deriving the configuration space address from dbics address space.

Since the pci-keystone driver has never worked in the mainline kernel,
DT backward compatibility is not an issue.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent f3560a9f

drivers/pci/controller/dwc/pci-keystone.c

+7 −10
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#define CFG_TYPE1			BIT(24)



#define OB_SIZE				0x030

#define SPACE0_REMOTE_CFG_OFFSET	0x1000

#define OB_OFFSET_INDEX(n)		(0x200 + (8 * (n)))

#define OB_OFFSET_HI(n)			(0x204 + (8 * (n)))

#define OB_ENABLEN			BIT(0)
@@ -807,21 +806,19 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie, 
	struct resource *res;

	int ret;



	/* Index 0 is the config reg. space address */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbics");

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	/*

	 * We set these same and is used in pcie rd/wr_other_conf

	 * functions

	 */

	pp->va_cfg0_base = pci->dbi_base + SPACE0_REMOTE_CFG_OFFSET;

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");

	pp->va_cfg0_base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(pp->va_cfg0_base))

		return PTR_ERR(pp->va_cfg0_base);



	pp->va_cfg1_base = pp->va_cfg0_base;



	/* Index 1 is the application reg. space address */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "app");

	ks_pcie->va_app_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(ks_pcie->va_app_base))

		return PTR_ERR(ks_pcie->va_app_base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE