Skip to content

GitLab

Commit 95d064b4 authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "fix(plat/marvell/armada): select correct pcie reference clock source" into integration

parents 076bb38d 371648e1
Show whitespace changes
Inline Side-by-side
drivers/marvell/comphy/phy-comphy-cp110.c
View file @ 95d064b4
...@@ -53,13 +53,13 @@ ...@@ -53,13 +53,13 @@
#define SYS_CTRL_FROM_COMPHY_ADDR(x) ((x & ~0xffffff) + 0x440000) #define SYS_CTRL_FROM_COMPHY_ADDR(x) ((x & ~0xffffff) + 0x440000)
/* DFX register spaces */ /* DFX register spaces */
#define SAR_RST_PCIE0_CLOCK_CONFIG_CP1_OFFSET (0) #define SAR_RST_PCIE0_CLOCK_CONFIG_CP0_OFFSET (30)
#define SAR_RST_PCIE0_CLOCK_CONFIG_CP1_MASK (0x1 << \ #define SAR_RST_PCIE0_CLOCK_CONFIG_CP0_MASK (0x1UL << \
SAR_RST_PCIE0_CLOCK_CONFIG_CP1_OFFSET) SAR_RST_PCIE0_CLOCK_CONFIG_CP0_OFFSET)
#define SAR_RST_PCIE1_CLOCK_CONFIG_CP1_OFFSET (1) #define SAR_RST_PCIE1_CLOCK_CONFIG_CP0_OFFSET (31)
#define SAR_RST_PCIE1_CLOCK_CONFIG_CP1_MASK (0x1 << \ #define SAR_RST_PCIE1_CLOCK_CONFIG_CP0_MASK (0x1UL << \
SAR_RST_PCIE1_CLOCK_CONFIG_CP1_OFFSET) SAR_RST_PCIE1_CLOCK_CONFIG_CP0_OFFSET)
#define SAR_STATUS_0_REG 200 #define SAR_STATUS_0_REG 0x40600
#define DFX_FROM_COMPHY_ADDR(x) ((x & ~0xffffff) + DFX_BASE) #define DFX_FROM_COMPHY_ADDR(x) ((x & ~0xffffff) + DFX_BASE)
/* Common Phy training */ /* Common Phy training */
#define COMPHY_TRX_TRAIN_COMPHY_OFFS 0x1000 #define COMPHY_TRX_TRAIN_COMPHY_OFFS 0x1000
...@@ -1318,11 +1318,11 @@ static int mvebu_cp110_comphy_pcie_power_on(uint64_t comphy_base, ...@@ -1318,11 +1318,11 @@ static int mvebu_cp110_comphy_pcie_power_on(uint64_t comphy_base,
reg = mmio_read_32(DFX_FROM_COMPHY_ADDR(comphy_base) + reg = mmio_read_32(DFX_FROM_COMPHY_ADDR(comphy_base) +
SAR_STATUS_0_REG); SAR_STATUS_0_REG);
if (comphy_index == COMPHY_LANE4 || comphy_index == COMPHY_LANE5) if (comphy_index == COMPHY_LANE4 || comphy_index == COMPHY_LANE5)
clk_dir = (reg & SAR_RST_PCIE1_CLOCK_CONFIG_CP1_MASK) >> clk_dir = (reg & SAR_RST_PCIE1_CLOCK_CONFIG_CP0_MASK) >>
SAR_RST_PCIE1_CLOCK_CONFIG_CP1_OFFSET; SAR_RST_PCIE1_CLOCK_CONFIG_CP0_OFFSET;
else else
clk_dir = (reg & SAR_RST_PCIE0_CLOCK_CONFIG_CP1_MASK) >> clk_dir = (reg & SAR_RST_PCIE0_CLOCK_CONFIG_CP0_MASK) >>
SAR_RST_PCIE0_CLOCK_CONFIG_CP1_OFFSET; SAR_RST_PCIE0_CLOCK_CONFIG_CP0_OFFSET;
debug("On lane %d\n", comphy_index); debug("On lane %d\n", comphy_index);
debug("PCIe clock direction = %x\n", clk_dir); debug("PCIe clock direction = %x\n", clk_dir);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment