OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

+/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+#include "qcom-ipq4019.dtsi"
-#include "qcom-ipq4019.dtsi"
+#include "qcom-ipq4019-bus.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/soc/qcom,tcsr.h>
 		led-failsafe = &power;
 		led-running = &power;
 		led-upgrade = &power;
 	};
-	chosen {
-		bootargs-append = " ubi.mtd=UBI_DEV";
-	};
 	soc {
 		mdio@90000 {
 			status = "okay";
 			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
 		};
 		usb2@60f8800 {
+			status = "okay";
-			status = "okay";
+		};
-			dwc3@6000000 {
+		serial@78af000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
+			pinctrl-0 = <&serial_pins>;
-				usb2_port1: port@1 {
-					reg = <1>;
-					#trigger-source-cells = <0>;
-				};
+			pinctrl-names = "default";
-			};
+			status = "okay";
 		};
-		usb3@8af8800 {
-			status = "okay";
-			dwc3@8a00000 {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				usb3_port1: port@1 {
-					reg = <1>;
-					#trigger-source-cells = <0>;
-				};
-				usb3_port2: port@2 {
-					reg = <2>;
 					#trigger-source-cells = <0>;
-				};
+		usb3@8af8800 {
-			};
+			status = "okay";
 		};
 		edma@c080000 {
 			status = "okay";
 		};
 	};
-	keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 		reset {
 			gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
-	leds {
+	gpio-leds {
 		compatible = "gpio-leds";
 		power: status {
 		};
 		usb {
 			label = "rt-ac58u:blue:usb";
-			gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
-			trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>;
-			linux,default-trigger = "usbport";
+			gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
 		};
 		lan {
 			output-high;
 		};
 	};
 };
-&blsp1_spi1 { /* BLSP1 QUP1 */
+&spi_0 { /* BLSP1 QUP1 */
 	pinctrl-0 = <&spi_0_pins>;
 	pinctrl-names = "default";
 	status = "okay";
 	cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
 		   <&tlmm 59 GPIO_ACTIVE_HIGH>;
-	flash@0 {
+	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		/*
 			};
 			/* 0x00180000 - 0x00200000 unused */
 		};
 	};
-	flash@1 {
+	mt29f@1 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spinand,mt29f";
 		reg = <1>;
-		spi-max-frequency = <24000000>;
-		/*
-		 * U-boot looks for "spinand,mt29f" node,
-		 * if we don't have it, it will spit out the following warning:
-		 * "ipq: fdt fixup unable to find compatible node".
-		 */
+		spi-max-frequency = <24000000>;
 		partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			partition@0 {
+			partition0@0 {
 				label = "ubi";
 				reg = <0x00000000 0x08000000>;
 			};
-		};
-	};
-};
-&blsp1_uart1 {
-	pinctrl-0 = <&serial_pins>;
-	pinctrl-names = "default";
+		};
-	status = "okay";
+	};
 };