Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

9533cdc100 BACKPORT: clk: composite: Export clk_hw_register_composite()
a9cae6eab7 ANDROID: PCI: dwc: Export symbols for ep driver

Change-Id: Ic471a7348e79b4e9d2e1367e030d8884f236950a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2021-02-07 16:01:16 +01:00
commit ee6b04d8d6
3 changed files with 6 additions and 0 deletions

View file

@ -311,6 +311,7 @@ err:
kfree(composite);
return hw;
}
EXPORT_SYMBOL_GPL(clk_hw_register_composite);
struct clk *clk_register_composite(struct device *dev, const char *name,
const char * const *parent_names, int num_parents,

View file

@ -40,6 +40,7 @@ void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)
{
__dw_pcie_ep_reset_bar(pci, bar, 0);
}
EXPORT_SYMBOL_GPL(dw_pcie_ep_reset_bar);
static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no,
struct pci_epf_header *hdr)
@ -359,6 +360,7 @@ int dw_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep, u8 func_no)
return -EINVAL;
}
EXPORT_SYMBOL_GPL(dw_pcie_ep_raise_legacy_irq);
int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
u8 interrupt_num)
@ -405,6 +407,7 @@ int dw_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, u8 func_no,
return 0;
}
EXPORT_SYMBOL_GPL(dw_pcie_ep_raise_msi_irq);
int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
u16 interrupt_num)
@ -464,6 +467,7 @@ int dw_pcie_ep_raise_msix_irq(struct dw_pcie_ep *ep, u8 func_no,
return 0;
}
EXPORT_SYMBOL_GPL(dw_pcie_ep_raise_msix_irq);
void dw_pcie_ep_exit(struct dw_pcie_ep *ep)
{

View file

@ -473,6 +473,7 @@ int dw_pcie_link_up(struct dw_pcie *pci)
return ((val & PCIE_PORT_DEBUG1_LINK_UP) &&
(!(val & PCIE_PORT_DEBUG1_LINK_IN_TRAINING)));
}
EXPORT_SYMBOL_GPL(dw_pcie_link_up);
static u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci)
{