diff options
| -rw-r--r-- | drivers/clk/samsung/clk-exynos7.c | 14 | ||||
| -rw-r--r-- | include/dt-bindings/clock/exynos7-clk.h | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/drivers/clk/samsung/clk-exynos7.c b/drivers/clk/samsung/clk-exynos7.c index 3a30f43fa925..17e5cf4d2248 100644 --- a/drivers/clk/samsung/clk-exynos7.c +++ b/drivers/clk/samsung/clk-exynos7.c | |||
| @@ -486,9 +486,12 @@ static struct samsung_gate_clock peric0_gate_clks[] __initdata = { | |||
| 486 | ENABLE_PCLK_PERIC0, 14, 0, 0), | 486 | ENABLE_PCLK_PERIC0, 14, 0, 0), |
| 487 | GATE(PCLK_UART0, "pclk_uart0", "mout_aclk_peric0_66_user", | 487 | GATE(PCLK_UART0, "pclk_uart0", "mout_aclk_peric0_66_user", |
| 488 | ENABLE_PCLK_PERIC0, 16, 0, 0), | 488 | ENABLE_PCLK_PERIC0, 16, 0, 0), |
| 489 | GATE(PCLK_PWM, "pclk_pwm", "mout_aclk_peric0_66_user", | ||
| 490 | ENABLE_PCLK_PERIC0, 21, 0, 0), | ||
| 489 | 491 | ||
| 490 | GATE(SCLK_UART0, "sclk_uart0_user", "mout_sclk_uart0_user", | 492 | GATE(SCLK_UART0, "sclk_uart0_user", "mout_sclk_uart0_user", |
| 491 | ENABLE_SCLK_PERIC0, 16, 0, 0), | 493 | ENABLE_SCLK_PERIC0, 16, 0, 0), |
| 494 | GATE(SCLK_PWM, "sclk_pwm", "fin_pll", ENABLE_SCLK_PERIC0, 21, 0, 0), | ||
| 492 | }; | 495 | }; |
| 493 | 496 | ||
| 494 | static struct samsung_cmu_info peric0_cmu_info __initdata = { | 497 | static struct samsung_cmu_info peric0_cmu_info __initdata = { |
| @@ -586,7 +589,9 @@ CLK_OF_DECLARE(exynos7_clk_peric1, "samsung,exynos7-clock-peric1", | |||
| 586 | 589 | ||
| 587 | /* Register Offset definitions for CMU_PERIS (0x10040000) */ | 590 | /* Register Offset definitions for CMU_PERIS (0x10040000) */ |
| 588 | #define MUX_SEL_PERIS 0x0200 | 591 | #define MUX_SEL_PERIS 0x0200 |
| 592 | #define ENABLE_PCLK_PERIS 0x0900 | ||
| 589 | #define ENABLE_PCLK_PERIS_SECURE_CHIPID 0x0910 | 593 | #define ENABLE_PCLK_PERIS_SECURE_CHIPID 0x0910 |
| 594 | #define ENABLE_SCLK_PERIS 0x0A00 | ||
| 590 | #define ENABLE_SCLK_PERIS_SECURE_CHIPID 0x0A10 | 595 | #define ENABLE_SCLK_PERIS_SECURE_CHIPID 0x0A10 |
| 591 | 596 | ||
| 592 | /* List of parent clocks for Muxes in CMU_PERIS */ | 597 | /* List of parent clocks for Muxes in CMU_PERIS */ |
| @@ -594,7 +599,9 @@ PNAME(mout_aclk_peris_66_p) = { "fin_pll", "dout_aclk_peris_66" }; | |||
| 594 | 599 | ||
| 595 | static unsigned long peris_clk_regs[] __initdata = { | 600 | static unsigned long peris_clk_regs[] __initdata = { |
| 596 | MUX_SEL_PERIS, | 601 | MUX_SEL_PERIS, |
| 602 | ENABLE_PCLK_PERIS, | ||
| 597 | ENABLE_PCLK_PERIS_SECURE_CHIPID, | 603 | ENABLE_PCLK_PERIS_SECURE_CHIPID, |
| 604 | ENABLE_SCLK_PERIS, | ||
| 598 | ENABLE_SCLK_PERIS_SECURE_CHIPID, | 605 | ENABLE_SCLK_PERIS_SECURE_CHIPID, |
| 599 | }; | 606 | }; |
| 600 | 607 | ||
| @@ -604,10 +611,17 @@ static struct samsung_mux_clock peris_mux_clks[] __initdata = { | |||
| 604 | }; | 611 | }; |
| 605 | 612 | ||
| 606 | static struct samsung_gate_clock peris_gate_clks[] __initdata = { | 613 | static struct samsung_gate_clock peris_gate_clks[] __initdata = { |
| 614 | GATE(PCLK_WDT, "pclk_wdt", "mout_aclk_peris_66_user", | ||
| 615 | ENABLE_PCLK_PERIS, 6, 0, 0), | ||
| 616 | GATE(PCLK_TMU, "pclk_tmu_apbif", "mout_aclk_peris_66_user", | ||
| 617 | ENABLE_PCLK_PERIS, 10, 0, 0), | ||
| 618 | |||
| 607 | GATE(PCLK_CHIPID, "pclk_chipid", "mout_aclk_peris_66_user", | 619 | GATE(PCLK_CHIPID, "pclk_chipid", "mout_aclk_peris_66_user", |
| 608 | ENABLE_PCLK_PERIS_SECURE_CHIPID, 0, 0, 0), | 620 | ENABLE_PCLK_PERIS_SECURE_CHIPID, 0, 0, 0), |
| 609 | GATE(SCLK_CHIPID, "sclk_chipid", "fin_pll", | 621 | GATE(SCLK_CHIPID, "sclk_chipid", "fin_pll", |
| 610 | ENABLE_SCLK_PERIS_SECURE_CHIPID, 0, 0, 0), | 622 | ENABLE_SCLK_PERIS_SECURE_CHIPID, 0, 0, 0), |
| 623 | |||
| 624 | GATE(SCLK_TMU, "sclk_tmu", "fin_pll", ENABLE_SCLK_PERIS, 10, 0, 0), | ||
| 611 | }; | 625 | }; |
| 612 | 626 | ||
| 613 | static struct samsung_cmu_info peris_cmu_info __initdata = { | 627 | static struct samsung_cmu_info peris_cmu_info __initdata = { |
diff --git a/include/dt-bindings/clock/exynos7-clk.h b/include/dt-bindings/clock/exynos7-clk.h index dd89aa0f84e1..f255bb7c64b3 100644 --- a/include/dt-bindings/clock/exynos7-clk.h +++ b/include/dt-bindings/clock/exynos7-clk.h | |||
| @@ -53,7 +53,9 @@ | |||
| 53 | #define PCLK_HSI2C9 7 | 53 | #define PCLK_HSI2C9 7 |
| 54 | #define PCLK_HSI2C10 8 | 54 | #define PCLK_HSI2C10 8 |
| 55 | #define PCLK_HSI2C11 9 | 55 | #define PCLK_HSI2C11 9 |
| 56 | #define PERIC0_NR_CLK 10 | 56 | #define PCLK_PWM 10 |
| 57 | #define SCLK_PWM 11 | ||
| 58 | #define PERIC0_NR_CLK 12 | ||
| 57 | 59 | ||
| 58 | /* PERIC1 */ | 60 | /* PERIC1 */ |
| 59 | #define PCLK_UART1 1 | 61 | #define PCLK_UART1 1 |
| @@ -72,7 +74,10 @@ | |||
| 72 | /* PERIS */ | 74 | /* PERIS */ |
| 73 | #define PCLK_CHIPID 1 | 75 | #define PCLK_CHIPID 1 |
| 74 | #define SCLK_CHIPID 2 | 76 | #define SCLK_CHIPID 2 |
| 75 | #define PERIS_NR_CLK 3 | 77 | #define PCLK_WDT 3 |
| 78 | #define PCLK_TMU 4 | ||
| 79 | #define SCLK_TMU 5 | ||
| 80 | #define PERIS_NR_CLK 6 | ||
| 76 | 81 | ||
| 77 | /* FSYS0 */ | 82 | /* FSYS0 */ |
| 78 | #define ACLK_MMC2 1 | 83 | #define ACLK_MMC2 1 |
