Commit b19c3f46 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/tegra' 

  - Fix Tegra CLKREQ dependency programming (Vidya Sagar)

* remotes/lorenzo/pci/tegra:
  PCI: tegra: Fix CLKREQ dependency programming
parents 069ade5d ff5c2bb9

drivers/pci/controller/dwc/pcie-tegra194.c

+2 −4
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
#define APPL_PINMUX_CLKREQ_OVERRIDE		BIT(3)

#define APPL_PINMUX_CLK_OUTPUT_IN_OVERRIDE_EN	BIT(4)

#define APPL_PINMUX_CLK_OUTPUT_IN_OVERRIDE	BIT(5)

#define APPL_PINMUX_CLKREQ_OUT_OVRD_EN		BIT(9)

#define APPL_PINMUX_CLKREQ_OUT_OVRD		BIT(10)



#define APPL_CTRL				0x4

#define APPL_CTRL_SYS_PRE_DET_STATE		BIT(6)
@@ -1193,8 +1191,8 @@ static int tegra_pcie_config_controller(struct tegra_pcie_dw *pcie, 


	if (!pcie->supports_clkreq) {

		val = appl_readl(pcie, APPL_PINMUX);

		val |= APPL_PINMUX_CLKREQ_OUT_OVRD_EN;

		val |= APPL_PINMUX_CLKREQ_OUT_OVRD;

		val |= APPL_PINMUX_CLKREQ_OVERRIDE_EN;

		val &= ~APPL_PINMUX_CLKREQ_OVERRIDE;

		appl_writel(pcie, val, APPL_PINMUX);

	}