Skip to content

Commit

Permalink
Merge branch 'clk-hi6220-rtc' into clk-next
Browse files Browse the repository at this point in the history
* clk-hi6220-rtc:
  clk: hi6220: Add RTC clock for pl031
  • Loading branch information
bebarino committed Jun 30, 2016
2 parents 5ff5ec5 + 6fb924d commit a31bb03
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drivers/clk/hisilicon/clk-hi6220.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ static struct hisi_gate_clock hi6220_separated_gate_clks_ao[] __initdata = {
{ HI6220_TIMER7_PCLK, "timer7_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 22, 0, },
{ HI6220_TIMER8_PCLK, "timer8_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 23, 0, },
{ HI6220_UART0_PCLK, "uart0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 24, 0, },
{ HI6220_RTC0_PCLK, "rtc0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 25, 0, },
{ HI6220_RTC1_PCLK, "rtc1_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 26, 0, },
};

static void __init hi6220_clk_ao_init(struct device_node *np)
Expand Down
5 changes: 3 additions & 2 deletions include/dt-bindings/clock/hi6220-clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@
#define HI6220_TIMER7_PCLK 34
#define HI6220_TIMER8_PCLK 35
#define HI6220_UART0_PCLK 36

#define HI6220_AO_NR_CLKS 37
#define HI6220_RTC0_PCLK 37
#define HI6220_RTC1_PCLK 38
#define HI6220_AO_NR_CLKS 39

/* clk in Hi6220 systrl */
/* gate clock */
Expand Down

0 comments on commit a31bb03

Please sign in to comment.