diff options
| author | LiXin <li.xin@linaro.org> | 2013-08-16 10:16:52 +0800 |
|---|---|---|
| committer | LiXin <li.xin@linaro.org> | 2013-08-16 10:16:52 +0800 |
| commit | eb9dc32ccb78f3b77ac154e63d4994cca9b08f48 (patch) | |
| tree | 1f2ea6866b1d77e2dcba6fa4f9b2d7ae90703471 | |
| parent | b6c2b2dc591a1048ad1f296ba5796d714bc9c193 (diff) | |
ARM: Hi3620: Add DTS node for Keypadkeypad-0819
Hi3620 DTS node for k3_keypad.
Signed-off-by: LiXin <li.xin@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/hi3620.dtsi | 17 | ||||
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 8 |
2 files changed, 24 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index 37f047b3d995..1bc8f4bdefc4 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -59,6 +59,14 @@ clock-output-names = "timer1"; }; + kpcclk: clkgate@60 { + compatible = "hisilicon,hi3620-clk-gate"; + #clock-cells = <0>; + clocks = <&osc32k>; + clock-output-names = "clk_kpc"; + hisilicon,hi3620-clkgate = <0x20 0x40>; + }; + rtc0: rtc@fc804000 { compatible = "arm,rtc-pl031", "arm,primecell"; reg = <0xfc804000 0x1000>; @@ -561,5 +569,14 @@ pinctrl-single,register-width = <32>; }; + + kpc: kpc@fc805000 { + compatible = "hisilicon,k3_keypad"; + reg = <0xfc805000 0x1000>; + interrupts = <0 10 4>; + clocks = <&clkkpc>; + status = "disabled"; + }; + }; }; diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index 718df1e72b62..7e1a7f80980f 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -66,6 +66,12 @@ status = "ok"; }; + kpc: kpc@fc805000 { + pinctrl-names = "default"; + pinctrl-0 = <&kpc_pmx_func &kpc_cfg_func>; + status = "ok"; + }; + gpio0: gpio@fc806000 { status = "ok"; }; @@ -420,7 +426,7 @@ pmx1: pinmux@fc803800 { pinctrl-names = "default"; pinctrl-0 = < &board_pu_pins &board_pd_pins &board_pd_ps_pins - &board_np_pins &board_ps_pins &kpc_cfg_func + &board_np_pins &board_ps_pins &audio_out_cfg_func>; board_pu_pins: pinmux_board_pu_pins { pinctrl-single,pins = < |