Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 11ea97fb3c67f71ba7d9cb05bf10a9035f1d3cc4

Authored by Ye Li
1 parent f3e87ac7e4
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 1 other branch smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-24192-2 DTS: imx8qm/qxp/dxl: Update PCIE clocks 

Update PCIE clocks to align with latest v5.4 kernel, otherwise we
may miss some LPCG clocks in u-boot and have potential problem if
they have been disabled in kernel during partition reboot.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 76ebe2016c2ab7199cb6a6b83f8bc97fe0140549)

Showing 3 changed files with 22 additions and 12 deletions Side-by-side Diff

arch/arm/dts/fsl-imx8dx.dtsi
Diff comments   View file @ 11ea97f
... ... @@ -3382,9 +3382,11 @@
3382 3382 <&clk IMX8QXP_HSIO_PCIE_SLV_AXI_CLK>,
3383 3383 <&clk IMX8QXP_HSIO_PHY_X1_PCLK>,
3384 3384 <&clk IMX8QXP_HSIO_PCIE_X1_PER_CLK>,
3385   - <&clk IMX8QXP_HSIO_PCIE_DBI_AXI_CLK>;
3386   - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi";
3387   -
  3385 + <&clk IMX8QXP_HSIO_PCIE_DBI_AXI_CLK>,
  3386 + <&clk IMX8QXP_HSIO_PHY_X1_PER_CLK>,
  3387 + <&clk IMX8QXP_HSIO_MISC_PER_CLK>;
  3388 + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi",
  3389 + "phy_per", "misc_per";
3388 3390 interrupt-map-mask = <0 0 0 0x7>;
3389 3391 interrupt-map = <0 0 0 1 &gic 0 105 4>,
3390 3392 <0 0 0 2 &gic 0 106 4>,
arch/arm/dts/fsl-imx8dxl.dtsi
Diff comments   View file @ 11ea97f
... ... @@ -1796,9 +1796,11 @@
1796 1796 <&clk IMX8QXP_HSIO_PCIE_SLV_AXI_CLK>,
1797 1797 <&clk IMX8QXP_HSIO_PHY_X1_PCLK>,
1798 1798 <&clk IMX8QXP_HSIO_PCIE_X1_PER_CLK>,
1799   - <&clk IMX8QXP_HSIO_PCIE_DBI_AXI_CLK>;
1800   - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi";
1801   -
  1799 + <&clk IMX8QXP_HSIO_PCIE_DBI_AXI_CLK>,
  1800 + <&clk IMX8QXP_HSIO_PHY_X1_PER_CLK>,
  1801 + <&clk IMX8QXP_HSIO_MISC_PER_CLK>;
  1802 + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi",
  1803 + "phy_per", "misc_per";
1802 1804 interrupt-map-mask = <0 0 0 0x7>;
1803 1805 interrupt-map = <0 0 0 1 &gic 0 105 4>,
1804 1806 <0 0 0 2 &gic 0 106 4>,
arch/arm/dts/fsl-imx8qm-device.dtsi
Diff comments   View file @ 11ea97f
... ... @@ -2188,9 +2188,11 @@
2188 2188 <&clk IMX8QM_HSIO_PCIE_A_SLV_AXI_CLK>,
2189 2189 <&clk IMX8QM_HSIO_PHY_X2_PCLK_0>,
2190 2190 <&clk IMX8QM_HSIO_PCIE_X2_PER_CLK>,
2191   - <&clk IMX8QM_HSIO_PCIE_A_DBI_AXI_CLK>;
2192   - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi";
2193   -
  2191 + <&clk IMX8QM_HSIO_PCIE_A_DBI_AXI_CLK>,
  2192 + <&clk IMX8QM_HSIO_PHY_X2_PER_CLK>,
  2193 + <&clk IMX8QM_HSIO_MISC_PER_CLK>;
  2194 + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi",
  2195 + "phy_per", "misc_per";
2194 2196 interrupt-map-mask = <0 0 0 0x7>;
2195 2197 interrupt-map = <0 0 0 1 &gic 0 73 4>,
2196 2198 <0 0 0 2 &gic 0 74 4>,
... ... @@ -2231,9 +2233,13 @@
2231 2233 <&clk IMX8QM_HSIO_PCIE_B_SLV_AXI_CLK>,
2232 2234 <&clk IMX8QM_HSIO_PHY_X2_PCLK_1>,
2233 2235 <&clk IMX8QM_HSIO_PCIE_X1_PER_CLK>,
2234   - <&clk IMX8QM_HSIO_PCIE_B_DBI_AXI_CLK>;
2235   - clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi";
2236   -
  2236 + <&clk IMX8QM_HSIO_PCIE_B_DBI_AXI_CLK>,
  2237 + <&clk IMX8QM_HSIO_PCIE_X2_PER_CLK>,
  2238 + <&clk IMX8QM_HSIO_PHY_X2_PCLK_0>,
  2239 + <&clk IMX8QM_HSIO_PHY_X2_PER_CLK>,
  2240 + <&clk IMX8QM_HSIO_MISC_PER_CLK>;
  2241 + clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_per", "pcie_inbound_axi",
  2242 + "pciex2_per", "pcie_phy_pclk", "phy_per", "misc_per";
2237 2243 interrupt-map-mask = <0 0 0 0x7>;
2238 2244 interrupt-map = <0 0 0 1 &gic 0 105 4>,
2239 2245 <0 0 0 2 &gic 0 106 4>,