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

clk: samsung: Add explicit MPLL, EPLL clkdev aliases in S3C2443 driver

S3C2443 platform still use non-dt based lookup in some of its drivers
to get MPLL and EPLL clocks. Till now it worked only because PLL()
macro implicitly created aliases for all instantiated clocks. This
feature will be removed, so explicitly create aliases for MPLL and
EPLL clocks.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

authored by

Marek Szyprowski and committed by
Sylwester Nawrocki
45d882da cd05417f

+8 -4
+6 -4
drivers/clk/samsung/clk-s3c2443.c
··· 191 191 struct samsung_clock_alias s3c2443_common_aliases[] __initdata = { 192 192 ALIAS(MSYSCLK, NULL, "msysclk"), 193 193 ALIAS(ARMCLK, NULL, "armclk"), 194 + ALIAS(MPLL, NULL, "mpll"), 195 + ALIAS(EPLL, NULL, "epll"), 194 196 ALIAS(HCLK, NULL, "hclk"), 195 197 ALIAS(HCLK_SSMC, NULL, "nand"), 196 198 ALIAS(PCLK_UART0, "s3c2440-uart.0", "uart"), ··· 225 223 /* S3C2416 specific clocks */ 226 224 227 225 static struct samsung_pll_clock s3c2416_pll_clks[] __initdata = { 228 - [mpll] = PLL(pll_6552_s3c2416, 0, "mpll", "mpllref", 226 + [mpll] = PLL(pll_6552_s3c2416, MPLL, "mpll", "mpllref", 229 227 LOCKCON0, MPLLCON, NULL), 230 - [epll] = PLL(pll_6553, 0, "epll", "epllref", 228 + [epll] = PLL(pll_6553, EPLL, "epll", "epllref", 231 229 LOCKCON1, EPLLCON, NULL), 232 230 }; 233 231 ··· 279 277 /* S3C2443 specific clocks */ 280 278 281 279 static struct samsung_pll_clock s3c2443_pll_clks[] __initdata = { 282 - [mpll] = PLL(pll_3000, 0, "mpll", "mpllref", 280 + [mpll] = PLL(pll_3000, MPLL, "mpll", "mpllref", 283 281 LOCKCON0, MPLLCON, NULL), 284 - [epll] = PLL(pll_2126, 0, "epll", "epllref", 282 + [epll] = PLL(pll_2126, EPLL, "epll", "epllref", 285 283 LOCKCON1, EPLLCON, NULL), 286 284 }; 287 285
+2
include/dt-bindings/clock/s3c2443.h
··· 26 26 #define ARMCLK 4 27 27 #define HCLK 5 28 28 #define PCLK 6 29 + #define MPLL 7 30 + #define EPLL 8 29 31 30 32 /* Special clocks */ 31 33 #define SCLK_HSSPI0 16