Merge branch 'master' of ldpinney/GnuBee-libreCMC into master

target/linux/ramips/dts/GB-PC1.dts

@@ -50,45 +50,16 @@
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
 		};
 
-		lan {
-			label = "gb-pc1:green:lan";
+		lan1 {
+			label = "gb-pc1:green:lan1";
 			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
 		};
 
-		wan {
-			label = "gb-pc1:green:wan";
+		lan2 {
+			label = "gb-pc1:green:lan2";
 			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
 		};
 	};
-
-	gpio-export {
-		compatible = "gpio-export";
-		#size-cells = <0>;
-
-		gpio26 {
-			gpio-export,name = "gpio26";
-			gpio-export,direction_may_change = <1>;
-			gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
-		};
-
-		gpio28 {
-			gpio-export,name = "gpio28";
-			gpio-export,direction_may_change = <1>;
-			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
-		};
-
-		gpio29 {
-			gpio-export,name = "gpio29";
-			gpio-export,direction_may_change = <1>;
-			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
-		};
-
-		gpio30 {
-			gpio-export,name = "gpio30";
-			gpio-export,direction_may_change = <1>;
-			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
-		};
-	};
 };
 
 &sdhci {
@@ -115,6 +86,7 @@
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
+			read-only;
 		};
 
 		factory: partition@40000 {
@@ -130,16 +102,6 @@
 	};
 };
 
-&cpuclock {
-		compatible = "fixed-clock";
-		clock-frequency = <2000000000>;
-};
-
-&sysclock {
-		compatible = "fixed-clock";
-		clock-frequency = <80000000>;
-};
-
 &pcie {
 	status = "okay";
 };