tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'clk-s905' into clk-next

Michael Turquette a0fc8c4f 334e125b

+2 -1
+1 -1
drivers/clk/meson/gxbb.h
··· 234 234 #define CLKID_HDMI_PCLK 63 235 235 #define CLKID_USB1_DDR_BRIDGE 64 236 236 #define CLKID_USB0_DDR_BRIDGE 65 237 - #define CLKID_MMC_PCLK 66 237 + /* CLKID_MMC_PCLK */ 238 238 #define CLKID_DVIN 67 239 239 #define CLKID_UART2 68 240 240 #define CLKID_SANA 69
+1
include/dt-bindings/clock/gxbb-clkc.h
··· 8 8 #define CLKID_CPUCLK 1 9 9 #define CLKID_CLK81 12 10 10 #define CLKID_ETH 36 11 + #define CLKID_MMC_PCLK 66 11 12 12 13 #endif /* __GXBB_CLKC_H */