Merge pull request torvalds#61 from gaozhangfei/rtc

Rtc: merged. thanks
hzhuang1 · May 4, 2015 · e167b35 · e167b35
2 parents 1d2d759 + 7539ccc
commit e167b35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi
@@ -286,6 +286,14 @@
 			status = "disabled";
 		};
 
+		rtc0: rtc@170000 {
+			compatible = "arm,pl031", "arm,primecell";
+			reg = <0x0 0xf8003000 0x0 0x1000>;
+			interrupts = <0 12 4>;
+			clocks = <&clock_ao HI6220_RTC0_PCLK>;
+			clock-names = "apb_pclk";
+		};
+
 		dma0: dma@f7370000 {
 			compatible = "hisilicon,k3-dma-1.0";
 			reg = <0x0 0xf7370000 0x0 0x1000>;

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
@@ -316,6 +316,7 @@ CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_XGENE=y
 CONFIG_DMADEVICES=y
 CONFIG_HISI300_EDMAC=y

diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c
@@ -69,6 +69,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 struct hisi_clock_data *clk_data_ao;

diff --git a/include/dt-bindings/clock/hi6220-clock.h b/include/dt-bindings/clock/hi6220-clock.h
@@ -55,6 +55,8 @@
 #define HI6220_TIMER7_PCLK	38
 #define HI6220_TIMER8_PCLK	39
 #define HI6220_UART0_PCLK	40
+#define HI6220_RTC0_PCLK	41
+#define HI6220_RTC1_PCLK	42
 
 #define HI6220_AO_NR_CLKS	48