History

clk: ti: dra7: disable the RNG and TIMER12 clkctrl clocks on HS devices

RNG and TIMER12 are reserved for secure side usage only on HS devices, so disable their clkctrl clocks on HS SoCs also.

Tero Kristo committed 7 years ago

Commit 869decd1 parent 2b1202d6 files · +16 −8Browse files

Unified · Split

6 files
  1. arch/arm/mach-omap2/clock.c +3 −0
  2. drivers/clk/ti/clk-7xx-compat.c +2 −2
  3. drivers/clk/ti/clk-7xx.c +2 −2
  4. drivers/clk/ti/clkctrl.c +3 −0
  5. drivers/clk/ti/clock.h +5 −4
  6. include/linux/clk/ti.h +1 −0
arch/arm/mach-omap2/clock.c+3−0
@@ -119,6 +119,9 @@ void __init ti_clk_init_features(void) · 118 unmodified lines
119119 if (cpu_is_omap343x())
120120 features.flags |= TI_CLK_DPLL_HAS_FREQSEL;
121121
122+ if (omap_type() == OMAP2_DEVICE_TYPE_GP)
123+ features.flags |= TI_CLK_DEVICE_TYPE_GP;
124+
122125 /* Idlest value for interface clocks.
123126 * 24xx uses 0 to indicate not ready, and 1 to indicate ready.
124127 * 34xx reverses this, just to keep us on our toes
drivers/clk/ti/clk-7xx-compat.c+2−2
@@ -662,7 +662,7 @@ static const struct omap_clkctrl_reg_data dra7_l4per_clkctrl_regs[] __initconst · 661 unmodified lines
662662 { DRA7_AES1_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div", "l4sec_clkdm" },
663663 { DRA7_AES2_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div", "l4sec_clkdm" },
664664 { DRA7_DES_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div", "l4sec_clkdm" },
665− { DRA7_RNG_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div", "l4sec_clkdm" },
665+ { DRA7_RNG_CLKCTRL, NULL, CLKF_HW_SUP | CLKF_SOC_NONSEC, "l3_iclk_div", "l4sec_clkdm" },
666666 { DRA7_SHAM_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div", "l4sec_clkdm" },
667667 { DRA7_UART7_CLKCTRL, dra7_uart7_bit_data, CLKF_SW_SUP, "l4per_cm:clk:01d0:24", "l4per2_clkdm" },
668668 { DRA7_UART8_CLKCTRL, dra7_uart8_bit_data, CLKF_SW_SUP, "l4per_cm:clk:01e0:24", "l4per2_clkdm" },
@@ -704,7 +704,7 @@ static const struct omap_clkctrl_reg_data dra7_wkupaon_clkctrl_regs[] __initcons · 35 unmodified lines
704704 { DRA7_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" },
705705 { DRA7_GPIO1_CLKCTRL, dra7_gpio1_bit_data, CLKF_HW_SUP, "wkupaon_iclk_mux" },
706706 { DRA7_TIMER1_CLKCTRL, dra7_timer1_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0020:24" },
707− { DRA7_TIMER12_CLKCTRL, NULL, 0, "secure_32k_clk_src_ck" },
707+ { DRA7_TIMER12_CLKCTRL, NULL, CLKF_SOC_NONSEC, "secure_32k_clk_src_ck" },
708708 { DRA7_COUNTER_32K_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" },
709709 { DRA7_UART10_CLKCTRL, dra7_uart10_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0060:24" },
710710 { DRA7_DCAN1_CLKCTRL, dra7_dcan1_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0068:24" },
drivers/clk/ti/clk-7xx.c+2−2
@@ -590,7 +590,7 @@ static const struct omap_clkctrl_reg_data dra7_l4sec_clkctrl_regs[] __initconst · 589 unmodified lines
590590 { DRA7_L4SEC_AES1_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div" },
591591 { DRA7_L4SEC_AES2_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div" },
592592 { DRA7_L4SEC_DES_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div" },
593− { DRA7_L4SEC_RNG_CLKCTRL, NULL, CLKF_HW_SUP, "" },
593+ { DRA7_L4SEC_RNG_CLKCTRL, NULL, CLKF_HW_SUP | CLKF_SOC_NONSEC, "" },
594594 { DRA7_L4SEC_SHAM_CLKCTRL, NULL, CLKF_HW_SUP, "l3_iclk_div" },
595595 { 0 },
596596 };
@@ -757,7 +757,7 @@ static const struct omap_clkctrl_reg_data dra7_wkupaon_clkctrl_regs[] __initcons · 160 unmodified lines
757757 { DRA7_WKUPAON_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" },
758758 { DRA7_WKUPAON_GPIO1_CLKCTRL, dra7_gpio1_bit_data, CLKF_HW_SUP, "wkupaon_iclk_mux" },
759759 { DRA7_WKUPAON_TIMER1_CLKCTRL, dra7_timer1_bit_data, CLKF_SW_SUP, "wkupaon-clkctrl:0020:24" },
760− { DRA7_WKUPAON_TIMER12_CLKCTRL, NULL, 0, "secure_32k_clk_src_ck" },
760+ { DRA7_WKUPAON_TIMER12_CLKCTRL, NULL, CLKF_SOC_NONSEC, "secure_32k_clk_src_ck" },
761761 { DRA7_WKUPAON_COUNTER_32K_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" },
762762 { DRA7_WKUPAON_UART10_CLKCTRL, dra7_uart10_bit_data, CLKF_SW_SUP, "wkupaon-clkctrl:0060:24" },
763763 { DRA7_WKUPAON_DCAN1_CLKCTRL, dra7_dcan1_bit_data, CLKF_SW_SUP, "wkupaon-clkctrl:0068:24" },
drivers/clk/ti/clkctrl.c+3−0
@@ -509,6 +509,9 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) · 508 unmodified lines
509509 data = dm816_clkctrl_data;
510510 #endif
511511
512+ if (ti_clk_get_features()->flags & TI_CLK_DEVICE_TYPE_GP)
513+ soc_mask |= CLKF_SOC_NONSEC;
514+
512515 while (data->addr) {
513516 if (addr == data->addr)
514517 break;
drivers/clk/ti/clock.h+5−4
@@ -83,11 +83,12 @@ enum { · 82 unmodified lines
8383 #define CLKF_HW_SUP BIT(6)
8484 #define CLKF_NO_IDLEST BIT(7)
8585
86−#define CLKF_SOC_MASK GENMASK(10, 8)
86+#define CLKF_SOC_MASK GENMASK(11, 8)
8787
88−#define CLKF_SOC_DRA72 BIT(8)
89−#define CLKF_SOC_DRA74 BIT(9)
90−#define CLKF_SOC_DRA76 BIT(10)
88+#define CLKF_SOC_NONSEC BIT(8)
89+#define CLKF_SOC_DRA72 BIT(9)
90+#define CLKF_SOC_DRA74 BIT(10)
91+#define CLKF_SOC_DRA76 BIT(11)
9192
9293 #define CLK(dev, con, ck) \
9394 { \
include/linux/clk/ti.h+1−0
@@ -294,6 +294,7 @@ struct ti_clk_features { · 293 unmodified lines
294294 #define TI_CLK_DISABLE_CLKDM_CONTROL BIT(2)
295295 #define TI_CLK_ERRATA_I810 BIT(3)
296296 #define TI_CLK_CLKCTRL_COMPAT BIT(4)
297+#define TI_CLK_DEVICE_TYPE_GP BIT(5)
297298
298299 void ti_clk_setup_features(struct ti_clk_features *features);
299300 const struct ti_clk_features *ti_clk_get_features(void);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t