Commit 2138c32a authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230924183914.51414-4-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 09f8ee81

arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts

+27 −28
Original line number Diff line number Diff line
@@ -20,6 +20,33 @@ chosen { 
		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 @@ partition@0 { 
				};

			};

		};



		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";

			};

		};



	};

};

arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi

+61 −61
Original line number Diff line number Diff line
@@ -14,57 +14,6 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	soc {

		gsbi@16300000 {

			qcom,mode = <GSBI_PROT_I2C_UART>;

			status = "okay";



			serial@16340000 {

				status = "okay";

			};

		};



		gsbi5: gsbi@1a200000 {

			qcom,mode = <GSBI_PROT_SPI>;

			status = "okay";



			spi4: spi@1a280000 {

				status = "okay";



				pinctrl-0 = <&spi_pins>;

				pinctrl-names = "default";



				cs-gpios = <&qcom_pinmux 20 0>;



				flash: flash@0 {

					compatible = "s25fl256s1";

					#address-cells = <1>;

					#size-cells = <1>;

					spi-max-frequency = <50000000>;

					reg = <0>;



					partition@0 {

						label = "rootfs";

						reg = <0x0 0x1000000>;

					};



					partition@1 {

						label = "scratch";

						reg = <0x1000000 0x1000000>;

					};

				};

			};

		};



		sata-phy@1b400000 {

			status = "okay";

		};



		sata@29000000 {

			ports-implemented = <0x1>;

			status = "okay";

		};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-0 = <&buttons_pins>;
@@ -125,5 +74,56 @@ led-4 { 
			default-state = "off";

		};

	};



	soc {

		gsbi@16300000 {

			qcom,mode = <GSBI_PROT_I2C_UART>;

			status = "okay";



			serial@16340000 {

				status = "okay";

			};

		};



		gsbi5: gsbi@1a200000 {

			qcom,mode = <GSBI_PROT_SPI>;

			status = "okay";



			spi4: spi@1a280000 {

				status = "okay";



				pinctrl-0 = <&spi_pins>;

				pinctrl-names = "default";



				cs-gpios = <&qcom_pinmux 20 0>;



				flash: flash@0 {

					compatible = "s25fl256s1";

					#address-cells = <1>;

					#size-cells = <1>;

					spi-max-frequency = <50000000>;

					reg = <0>;



					partition@0 {

						label = "rootfs";

						reg = <0x0 0x1000000>;

					};



					partition@1 {

						label = "scratch";

						reg = <0x1000000 0x1000000>;

					};

				};

			};

		};



		sata-phy@1b400000 {

			status = "okay";

		};



		sata@29000000 {

			ports-implemented = <0x1>;

			status = "okay";

		};

	};

};