From 1d4903c84cbcdeccc19d302834c4bff3f6436b2b Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 21 Jun 2019 18:40:02 +0200 Subject: arm: dts: colibri_imx7: fix gpio-keys Avoid the following spew: [ 2.083946] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin MX7D_PAD_GPIO1_IO01 already requested by 302c0000.iomuxc-lpsr; cannot claim for gpio-keys [ 2.099682] imx7d-pinctrl 302c0000.iomuxc-lpsr: pin-1 (gpio-keys) status -22 [ 2.108272] imx7d-pinctrl 302c0000.iomuxc-lpsr: could not request pin 1 (MX7D_PAD_GPIO1_IO01) from group gpiokeysgrp on device 302c0000.iomuxc-lpsr [ 2.124626] gpio-keys gpio-keys: Error applying setting, reverse things back [ 2.133420] gpio-keys: probe of gpio-keys failed with error -22 While at it also fix some missing new lines. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 6 ++++++ arch/arm/boot/dts/imx7-colibri.dtsi | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 7ccae7666ea8..22c6d1f8ae57 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -66,10 +66,12 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbc_det>; }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpiokeys>; + power { label = "Wake-Up"; gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; @@ -237,6 +239,7 @@ vsync-active = <0>; pixelclk-active = <0>; }; + /* WVGA Timing, TouchRevolution Fusion 7" */ timing_wvga2: 800x480pixclkact { clock-frequency = <33260000>; @@ -254,6 +257,7 @@ vsync-active = <0>; pixelclk-active = <1>; }; + /* Standard SVGA timing */ timing_svga: 800x600 { clock-frequency = <40000000>; @@ -271,6 +275,7 @@ vsync-active = <1>; pixelclk-active = <0>; }; + /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ timing_wsvga: 1024x600 { clock-frequency = <48000000>; @@ -288,6 +293,7 @@ vsync-active = <0>; pixelclk-active = <0>; }; + /* Standard XGA timing */ timing_xga: 1024x768 { clock-frequency = <65000000>; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 6d399af81899..07f2484b91ea 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -806,7 +806,6 @@ pinctrl_gpio_lpsr: gpio1-grp { fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59 MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59 MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59 >; -- cgit v1.2.3