ARM: dts: qcom: ipq8064: move keys and leds out of soc node

GPIO keys and LEDs are not part of the SoC, so move them to top-level to
fix dtbs_check warnings like:

  qcom-ipq8064-rb3011.dtb: soc: gpio-keys: {'compatible': ['gpio-keys'], ... should not be valid under {'type': 'object'}
        from schema $id: http://devicetree.org/schemas/simple-bus.yaml#

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230924183914.51414-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts b/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
index 1796ded..12e806a 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts
@@ -20,6 +20,33 @@
                stdout-path = "serial0:115200n8";
        };
 
+       gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-0 = <&buttons_pins>;
+               pinctrl-names = "default";
+
+               button {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&qcom_pinmux 66 GPIO_ACTIVE_LOW>;
+                       linux,input-type = <1>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-0 = <&leds_pins>;
+               pinctrl-names = "default";
+
+               led-0 {
+                       label = "rb3011:green:user";
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+       };
+
        memory@42000000 {
                reg = <0x42000000 0x3e000000>;
                device_type = "memory";
@@ -302,34 +329,6 @@
                                };
                        };
                };
-
-               gpio-keys {
-                       compatible = "gpio-keys";
-                       pinctrl-0 = <&buttons_pins>;
-                       pinctrl-names = "default";
-
-                       button {
-                               label = "reset";
-                               linux,code = <KEY_RESTART>;
-                               gpios = <&qcom_pinmux 66 GPIO_ACTIVE_LOW>;
-                               linux,input-type = <1>;
-                               debounce-interval = <60>;
-                       };
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-                       pinctrl-0 = <&leds_pins>;
-                       pinctrl-names = "default";
-
-                       led-0 {
-                               label = "rb3011:green:user";
-                               color = <LED_COLOR_ID_GREEN>;
-                               gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
-                               default-state = "off";
-                       };
-               };
-
        };
 };
 

diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi
index 17f65e1..49de975 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi
@@ -14,6 +14,67 @@
                stdout-path = "serial0:115200n8";
        };
 
+       gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-0 = <&buttons_pins>;
+               pinctrl-names = "default";
+
+               button-1 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
+                       linux,input-type = <1>;
+                       debounce-interval = <60>;
+               };
+               button-2 {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
+                       linux,input-type = <1>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-0 = <&leds_pins>;
+               pinctrl-names = "default";
+
+               led-0 {
+                       label = "led_usb1";
+                       gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "usbdev";
+                       default-state = "off";
+               };
+
+               led-1 {
+                       label = "led_usb3";
+                       gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "usbdev";
+                       default-state = "off";
+               };
+
+               led-2 {
+                       label = "status_led_fail";
+                       function = LED_FUNCTION_STATUS;
+                       gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               led-3 {
+                       label = "sata_led";
+                       gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               led-4 {
+                       label = "status_led_pass";
+                       function = LED_FUNCTION_STATUS;
+                       gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+       };
+
        soc {
                gsbi@16300000 {
                        qcom,mode = <GSBI_PROT_I2C_UART>;
@@ -64,66 +125,5 @@
                        ports-implemented = <0x1>;
                        status = "okay";
                };
-
-               gpio-keys {
-                       compatible = "gpio-keys";
-                       pinctrl-0 = <&buttons_pins>;
-                       pinctrl-names = "default";
-
-                       button-1 {
-                               label = "reset";
-                               linux,code = <KEY_RESTART>;
-                               gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
-                               linux,input-type = <1>;
-                               debounce-interval = <60>;
-                       };
-                       button-2 {
-                               label = "wps";
-                               linux,code = <KEY_WPS_BUTTON>;
-                               gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
-                               linux,input-type = <1>;
-                               debounce-interval = <60>;
-                       };
-               };
-
-               leds {
-                       compatible = "gpio-leds";
-                       pinctrl-0 = <&leds_pins>;
-                       pinctrl-names = "default";
-
-                       led-0 {
-                               label = "led_usb1";
-                               gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
-                               linux,default-trigger = "usbdev";
-                               default-state = "off";
-                       };
-
-                       led-1 {
-                               label = "led_usb3";
-                               gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
-                               linux,default-trigger = "usbdev";
-                               default-state = "off";
-                       };
-
-                       led-2 {
-                               label = "status_led_fail";
-                               function = LED_FUNCTION_STATUS;
-                               gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
-                               default-state = "off";
-                       };
-
-                       led-3 {
-                               label = "sata_led";
-                               gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
-                               default-state = "off";
-                       };
-
-                       led-4 {
-                               label = "status_led_pass";
-                               function = LED_FUNCTION_STATUS;
-                               gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
-                               default-state = "off";
-                       };
-               };
        };
 };