diff options
| author | LiXin <li.xin@linaro.org> | 2013-08-16 10:16:52 +0800 |
|---|---|---|
| committer | LiXin <li.xin@linaro.org> | 2013-08-26 17:04:57 +0800 |
| commit | 9dc2015ea2d8f1e6150a5cd048cd9e13935cb384 (patch) | |
| tree | 56d267122c43ccc63163b7aa4febceae81ffb7b9 | |
| parent | 4415f75cde76d8f886b8839a9a8a5996de87781f (diff) | |
ARM: Hi3620: Add DTS node for Keypadtracking-hilt-keypad
Hi3620 DTS node for k3_keypad.
Signed-off-by: LiXin <li.xin@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/hi3620.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index d0baa681e561..7c0ecec7ef0a 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -1621,5 +1621,13 @@ clock-names = "ldi", "edc"; status = "disabled"; }; + + kpc: kpc@fc805000 { + compatible = "hisilicon,k3_keypad"; + reg = <0xfc805000 0x1000>; + interrupts = <0 10 4>; + clocks = <&kpcclk>; + status = "disabled"; + }; }; }; diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index b8d27401c4a9..c18fa991873f 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -105,6 +105,12 @@ status = "ok"; }; + kpc: kpc@fc805000 { + pinctrl-names = "default"; + pinctrl-0 = <&kpc_pmx_func &kpc_cfg_func>; + status = "ok"; + }; + gpio0: gpio@fc806000 { status = "ok"; }; @@ -470,7 +476,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 = < |