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

Commit 93bc65b1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdm845: Add UPD720X PCI-E to USB controller support"

parents 30f01d52 9faa0ee7

arch/arm64/configs/sdm845-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_UPD720X=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

arch/arm64/configs/sdm845_defconfig

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_UPD720X=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

drivers/usb/host/xhci-fwdload.c

+0 −7
Original line number Diff line number Diff line
@@ -83,13 +83,6 @@ static struct dma_iommu_mapping *upd720x_smmu_init(struct device *dev) 
	return mapping;

}



static void upd720x_smmu_deinit(struct device *dev)

{

	arm_iommu_detach_device(dev);

	arm_iommu_release_mapping(to_dma_iommu_mapping(dev));

}





static int upd720x_download_enable(struct pci_dev *pDev)

{

	unsigned int read_data;