tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'clk-hi6220-rtc' into clk-next
* clk-hi6220-rtc:
clk: hi6220: Add RTC clock for pl031
+5
-2
+2
drivers/clk/hisilicon/clk-hi6220.c
+2
drivers/clk/hisilicon/clk-hi6220.c
···
68
68
{ HI6220_TIMER7_PCLK, "timer7_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 22, 0, },
69
69
{ HI6220_TIMER8_PCLK, "timer8_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 23, 0, },
70
70
{ HI6220_UART0_PCLK, "uart0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 24, 0, },
71
+
{ HI6220_RTC0_PCLK, "rtc0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 25, 0, },
72
+
{ HI6220_RTC1_PCLK, "rtc1_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 26, 0, },
71
73
};
72
74
73
75
static void __init hi6220_clk_ao_init(struct device_node *np)
+3
-2
include/dt-bindings/clock/hi6220-clock.h
+3
-2
include/dt-bindings/clock/hi6220-clock.h
···
55
55
#define HI6220_TIMER7_PCLK 34
56
56
#define HI6220_TIMER8_PCLK 35
57
57
#define HI6220_UART0_PCLK 36
58
-
59
-
#define HI6220_AO_NR_CLKS 37
58
+
#define HI6220_RTC0_PCLK 37
59
+
#define HI6220_RTC1_PCLK 38
60
+
#define HI6220_AO_NR_CLKS 39
60
61
61
62
/* clk in Hi6220 systrl */
62
63
/* gate clock */