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

Commit 22ea3159 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: cntrl: qcom: store PCIe BAR address in controller structure"

parents c306aa20 5e6f0e4f

drivers/bus/mhi/controllers/mhi_qcom.c

+4 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018, The Linux Foundation. All rights reserved.*/

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.*/



#include <asm/arch_timer.h>

#include <linux/debugfs.h>
@@ -85,7 +85,7 @@ static int mhi_init_pci_dev(struct mhi_controller *mhi_cntrl) 
	struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);

	struct pci_dev *pci_dev = mhi_dev->pci_dev;

	int ret;

	resource_size_t start, len;

	resource_size_t len;

	int i;



	mhi_dev->resn = MHI_PCI_BAR_NUM;
@@ -109,9 +109,9 @@ static int mhi_init_pci_dev(struct mhi_controller *mhi_cntrl) 


	pci_set_master(pci_dev);



	start = pci_resource_start(pci_dev, mhi_dev->resn);

	mhi_cntrl->base_addr = pci_resource_start(pci_dev, mhi_dev->resn);

	len = pci_resource_len(pci_dev, mhi_dev->resn);

	mhi_cntrl->regs = ioremap_nocache(start, len);

	mhi_cntrl->regs = ioremap_nocache(mhi_cntrl->base_addr, len);

	if (!mhi_cntrl->regs) {

		MHI_ERR("Error ioremap region\n");

		goto error_ioremap;

include/linux/mhi.h

+2 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* Copyright (c) 2018, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */



#ifndef _MHI_H_

#define _MHI_H_
@@ -173,6 +173,7 @@ struct mhi_controller { 
	struct device_node *of_node;



	/* mmio base */

	phys_addr_t base_addr;

	void __iomem *regs;

	void __iomem *bhi;

	void __iomem *bhie;