diff options
| -rw-r--r-- | arch/arm/boot/dts/hi3620.dtsi | 8 | ||||
| -rwxr-xr-x | drivers/input/keyboard/k3_keypad.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi index 109d6f4b53d..c8bbdc42224 100644 --- a/arch/arm/boot/dts/hi3620.dtsi +++ b/arch/arm/boot/dts/hi3620.dtsi @@ -235,14 +235,6 @@ clock-output-names = "clk_uart4"; }; - clk_mcu: mcu { - compatible = "hisilicon,periclock"; - #clock-cells = <0>; - clocks = <&clk_cfgaxi>; - hisilicon,hi3620-clkgate = <0x50 24>; - clock-output-names = "clk_mcu"; - }; - /*-------------------spi clock----------------*/ clk_spi0_mux: spi0_mux { diff --git a/drivers/input/keyboard/k3_keypad.c b/drivers/input/keyboard/k3_keypad.c index c4944943fc7..03c6debb947 100755 --- a/drivers/input/keyboard/k3_keypad.c +++ b/drivers/input/keyboard/k3_keypad.c @@ -95,7 +95,7 @@ static int k3v2_keypad_open(struct input_dev *dev) int ret = 0; if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&dev->dev, "get invalid keypad pointer\n"); return -EINVAL; } @@ -122,7 +122,7 @@ static void k3v2_keypad_close(struct input_dev *dev) struct k3v2_keypad *keypad = input_get_drvdata(dev); if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&dev->dev, "get invalid keypad pointer\n"); return; } @@ -389,7 +389,7 @@ static struct matrix_keymap_data hisik3_keymap_data = { .keymap_size = ARRAY_SIZE(default_keymap), }; static uint16_t long_func_key1[] = {KEY_BACK}; -static uint16_t long_func_key2[] = {DPAD_CENTER, KEY_VOLUMEDOWN}; +/*static uint16_t long_func_key2[] = {DPAD_CENTER, KEY_VOLUMEDOWN};*/ static struct keypad_remap_item remap_items[] = { {KEY_HOME, 1, 1000/*ms*/, long_func_key1}, @@ -585,7 +585,7 @@ static int k3v2_keypad_remove(struct platform_device* pdev) struct k3v2_keypad *keypad = platform_get_drvdata(pdev); if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&pdev->dev, "get invalid keypad pointer\n"); return -EINVAL; } |