diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2021-04-09 09:50:46 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2021-04-09 09:50:46 -0700 |
| commit | 5c55197cbf9bfa9a025ddf220d65d376fc389f02 (patch) | |
| tree | fe9e75d819fc483e101050c526ad2801d169a778 /include | |
| parent | a38fd8748464831584a19438cbb3082b5a2dab15 (diff) | |
| parent | 054ef44ea3ef2883e0f63c9a54c91c07f321a0b4 (diff) | |
| download | cachepc-linux-5c55197cbf9bfa9a025ddf220d65d376fc389f02.tar.gz cachepc-linux-5c55197cbf9bfa9a025ddf220d65d376fc389f02.zip | |
Merge tag 'clk-imx-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx
Pull i.MX clk driver updates from Abel Vesa:
- Fix reparenting of UART clocks by initializing only the ones
associated to stdout
- Correct the PCIE clocks for i.MX8MP and i.MX8MQ
- Make LPCG and SCU clocks return on registering failure
* tag 'clk-imx-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
clk: imx: Reference preceded by free
clk: imx8mq: Correct the pcie1 sels
clk: imx8mp: Remove the none exist pcie clocks
clk: imx: Fix reparenting of UARTs not associated with stdout
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx8mp-clock.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index e8d68fbb6e3f..43927a1b9e94 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -125,7 +125,6 @@ #define IMX8MP_CLK_CAN1 116 #define IMX8MP_CLK_CAN2 117 #define IMX8MP_CLK_MEMREPAIR 118 -#define IMX8MP_CLK_PCIE_PHY 119 #define IMX8MP_CLK_PCIE_AUX 120 #define IMX8MP_CLK_I2C5 121 #define IMX8MP_CLK_I2C6 122 @@ -182,8 +181,6 @@ #define IMX8MP_CLK_MEDIA_CAM2_PIX 173 #define IMX8MP_CLK_MEDIA_LDB 174 #define IMX8MP_CLK_MEDIA_MIPI_CSI2_ESC 175 -#define IMX8MP_CLK_PCIE2_CTRL 176 -#define IMX8MP_CLK_PCIE2_PHY 177 #define IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE 178 #define IMX8MP_CLK_ECSPI3 179 #define IMX8MP_CLK_PDM 180 |