mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'clk-imx7', 'clk-bcm2835' into clk-next
* clk-imx7: clk: imx7d: Add the OCOTP clock * clk-bcm2835: clk: bcm2835: Add leaf clock measurement support, disabled by default clk: bcm2835: Register the DSI0/DSI1 pixel clocks. clk: bcm2835: Don't rate change PLLs on behalf of DSI PLL dividers.
This commit is contained in:
commit
645ebb1daa
5 changed files with 273 additions and 51 deletions
|
|
@ -64,3 +64,5 @@
|
|||
#define BCM2835_CLOCK_CAM1 46
|
||||
#define BCM2835_CLOCK_DSI0E 47
|
||||
#define BCM2835_CLOCK_DSI1E 48
|
||||
#define BCM2835_CLOCK_DSI0P 49
|
||||
#define BCM2835_CLOCK_DSI1P 50
|
||||
|
|
|
|||
|
|
@ -449,5 +449,6 @@
|
|||
#define IMX7D_ADC_ROOT_CLK 436
|
||||
#define IMX7D_CLK_ARM 437
|
||||
#define IMX7D_CKIL 438
|
||||
#define IMX7D_CLK_END 439
|
||||
#define IMX7D_OCOTP_CLK 439
|
||||
#define IMX7D_CLK_END 440
|
||||
#endif /* __DT_BINDINGS_CLOCK_IMX7D_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue