File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -119,11 +119,18 @@ static void __init imx6q_1588_init(void)
119119 IMX6Q_GPR1_ENET_CLK_SEL_ANATOP :
120120 IMX6Q_GPR1_ENET_CLK_SEL_PAD ;
121121 gpr = syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" );
122- if (!IS_ERR (gpr ))
122+ if (!IS_ERR (gpr )) {
123123 regmap_update_bits (gpr , IOMUXC_GPR1 ,
124124 IMX6Q_GPR1_ENET_CLK_SEL_MASK ,
125125 clksel );
126- else
126+ if (clksel == IMX6Q_GPR1_ENET_CLK_SEL_ANATOP &&
127+ cpu_is_imx6q () &&
128+ imx_get_soc_revision () >= IMX_CHIP_REVISION_2_0 ) {
129+ regmap_update_bits (gpr , IOMUXC_GPR5 ,
130+ IMX6Q_GPR5_ENET_TX_CLK_SEL ,
131+ IMX6Q_GPR5_ENET_TX_CLK_SEL );
132+ }
133+ } else
127134 pr_err ("failed to find fsl,imx6q-iomuxc-gpr regmap\n" );
128135
129136 clk_put (enet_ref );
Original file line number Diff line number Diff line change 240240#define IMX6Q_GPR4_IPU_RD_CACHE_CTL BIT(0)
241241
242242#define IMX6Q_GPR5_L2_CLK_STOP BIT(8)
243+ #define IMX6Q_GPR5_ENET_TX_CLK_SEL BIT(9)
243244#define IMX6Q_GPR5_SATA_SW_PD BIT(10)
244245#define IMX6Q_GPR5_SATA_SW_RST BIT(11)
245246#define IMX6Q_GPR5_PRE_PRG_SEL0_MASK (0x3 << 12)
You can’t perform that action at this time.
0 commit comments