Changes made more stable

.gitignore

@@ -38,6 +38,7 @@ modules.builtin
 Module.symvers
 *.dwo
 *.su
+.config_done
 
 #
 # Top-level generic files
@@ -120,3 +121,4 @@ all.config
 
 # fetched Android config fragments
 android/configs/android-*.cfg
+nohup.out

arch/arm64/boot/dts/rockchip/rk3399-nanopi4-cifisp.dtsi

@@ -21,7 +21,7 @@
 
 &cif_isp0 {
 	rockchip,camera-modules-attached = <&ov13850p0 &ov4689p0>;
-	status = "okay";
+	status = "disabled"; //EOF:FIXED:unused
 };
 
 &isp0_mmu {
@@ -30,7 +30,7 @@
 
 &cif_isp1 {
 	rockchip,camera-modules-attached = <&ov13850p1 &ov4689p1>;
-	status = "okay";
+	status = "disabled"; //EOF:FIXED:unused
 };
 
 &isp1_mmu {
@@ -39,7 +39,7 @@
 
 &i2c1 {
 	ov13850p0: ov13850@10 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED:unused
 		compatible = "omnivision,ov13850-v4l2-i2c-subdev";
 		reg = <0x10>;
 		device_type = "v4l2-i2c-subdev";
@@ -73,7 +73,7 @@
 	};
 
 	ov4689p0: ov4689@36 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED:unused
 		compatible = "omnivision,ov4689-v4l2-i2c-subdev";
 		reg = <0x36>;
 		device_type = "v4l2-i2c-subdev";
@@ -107,7 +107,7 @@
 
 &i2c2 {
 	ov13850p1: ov13850@10 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED:unused
 		compatible = "omnivision,ov13850-v4l2-i2c-subdev";
 		reg = <0x10>;
 		device_type = "v4l2-i2c-subdev";
@@ -141,7 +141,7 @@
 	};
 
 	ov4689p1: ov4689@36 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED:unused
 		compatible = "omnivision,ov4689-v4l2-i2c-subdev";
 		reg = <0x36>;
 		device_type = "v4l2-i2c-subdev";

arch/arm64/boot/dts/rockchip/rk3399-nanopi4-common.dtsi

@@ -58,7 +58,7 @@
 		   "rockchip,rk3399";
 
 	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 rootwait coherent_pool=1m";
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 swiotlb=1 console=ttyFIQ0 rootwait coherent_pool=1m systemd.gpt_auto=0 rd.systemd.gpt_auto=0";
 	};
 
 	cpuinfo {
@@ -313,14 +313,14 @@
 		};
 	};
 
-	gpio-keys {
+	gpio_keys: gpio-keys {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		autorepeat;
 
 		pinctrl-names = "default";
-		pinctrl-0 = <&power_key>;
+		pinctrl-0 = <&pcb_buttons>;
 
 		button@0 {
 			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
@@ -330,14 +330,44 @@
 			gpio-key,wakeup = <1>;
 			debounce-interval = <100>;
 		};
+
+		/* --------------------------------------------------- */
+		button@1 {
+			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; // GPIO1_A1
+			linux,code = <KEY_F1>;
+			label = "GPIO Button 1";
+			linux,input-type = <1>;
+			gpio-key,wakeup = <1>;
+			debounce-interval = <100>;
+		};
+
+		button@2 {
+			gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; // GPIO1_A3
+			linux,code = <KEY_F2>;
+			label = "GPIO Button 2";
+			linux,input-type = <1>;
+			gpio-key,wakeup = <1>;
+			debounce-interval = <100>;
+		};
+
+		button@3 {
+			gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; // GPIO1_A4
+			linux,code = <KEY_F3>;
+			label = "GPIO Button 3";
+			linux,input-type = <1>;
+			gpio-key,wakeup = <1>;
+			debounce-interval = <100>;
+		};
+		/* ---------------------------------------------------- */
 	};
 
-	adc-keys {
+	adc_keys: adc-keys {
 		compatible = "adc-keys";
 		io-channels = <&saradc 1>;
 		io-channel-names = "buttons";
 		poll-interval = <100>;
 		keyup-threshold-microvolt = <1800000>;
+		autorepeat = <1>;
 
 		button-up {
 			label = "Volume Up";
@@ -954,6 +984,19 @@
 	enable-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
 };
 
+&saradc {
+	status = "okay";
+	vref-supply = <&vccadc_ref>; /* TBD */
+};
+
+&adc_keys {
+	status = "okay";
+};
+
+&gpio_keys {
+	status = "okay";
+};
+
 &pwm0 {
 	status = "okay";
 };
@@ -997,11 +1040,6 @@
 		<&gpio1 14 GPIO_ACTIVE_HIGH>;
 };
 
-&saradc {
-	status = "okay";
-	vref-supply = <&vccadc_ref>; /* TBD */
-};
-
 &sdhci {
 	bus-width = <8>;
 	mmc-hs400-1_8v;
@@ -1176,8 +1214,11 @@
 	};
 
 	rockchip-key {
-		power_key: power-key {
-			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+		pcb_buttons: pcb-buttons {
+			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>,
+							<1 1 RK_FUNC_GPIO &pcfg_pull_up>,
+							<1 3 RK_FUNC_GPIO &pcfg_pull_up>,
+							<1 4 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 

arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev06.dts

@@ -21,7 +21,7 @@
 #include <dt-bindings/sensor-dev.h>
 
 / {
-	model = "FriendlyElec SOM-RK3399";
+	model = "FriendlyElec SOM-RK3399 Rev. 6";
 	compatible = "friendlyelec,som-rk3399", "rockchip,rk3399";
 };
 
@@ -37,7 +37,7 @@
 	clock-frequency = <400000>;
 
 	sensor@18 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED:Does not work in kernel
 		compatible = "gs_lis3dh";
 		reg = <0x18>;
 		type = <SENSOR_TYPE_ACCEL>;

arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rev07.dts

@@ -21,7 +21,7 @@
 #include <dt-bindings/sensor-dev.h>
 
 / {
-	model = "FriendlyElec SOM-RK3399";
+	model = "FriendlyElec SOM-RK3399 Rev. 7";
 	compatible = "friendlyelec,som-rk3399", "rockchip,rk3399";
 };
 
@@ -37,7 +37,7 @@
 	clock-frequency = <400000>;
 
 	sensor@18 {
-		status = "okay";
+		status = "disabled"; //EOF:FIXED: does not work in kernel
 		compatible = "gs_lis3dh";
 		reg = <0x18>;
 		type = <SENSOR_TYPE_ACCEL>;
@@ -84,7 +84,7 @@
 };
 
 &dmc {
-	status = "disabled";
+	status = "okay";
 	system-status-freq = <
 		/*system status         freq(KHz)*/
 		SYS_STATUS_NORMAL       856000

arch/arm64/boot/dts/rockchip/rk3399-nanopi4-rkisp1.dtsi

@@ -100,6 +100,7 @@
 	status = "okay";
 	resets = <&cru SRST_H_ISP0>, <&cru SRST_ISP0>;
 	reset-names = "h_isp0", "isp0";
+	rockchip,grf = <&grf>;
 
 	port {
 		#address-cells = <1>;
@@ -209,7 +210,8 @@
 	status = "okay";
 	resets = <&cru SRST_H_ISP1>, <&cru SRST_ISP1>;
 	reset-names = "h_isp1", "isp1";
-
+	rockchip,grf = <&grf>;
+
 	port {
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm64/boot/dts/rockchip/rk3399.dtsi

@@ -1833,6 +1833,7 @@
 		resets = <&cru SRST_A_VOP1>, <&cru SRST_H_VOP1>, <&cru SRST_D_VOP1>;
 		reset-names = "axi", "ahb", "dclk";
 		status = "disabled";
+		rockchip,grf = <&grf>;
 
 		vopl_out: port {
 			#address-cells = <1>;
@@ -1902,7 +1903,8 @@
 		power-domains = <&power RK3399_PD_VOPB>;
 		iommus = <&vopb_mmu>;
 		status = "disabled";
-
+		rockchip,grf = <&grf>;
+
 		vopb_out: port {
 			#address-cells = <1>;
 			#size-cells = <0>;