Owersun · mad-ady · Sep 25, 2018 · Sep 4, 2018 · Aug 31, 2018 · Sep 12, 2018
diff --git a/Documentation/devicetree/bindings/media/i2c/imx323.txt b/Documentation/devicetree/bindings/media/i2c/imx323.txt
@@ -0,0 +1,35 @@
+* Sony IMX323 DVP sensor
+
+Required Properties:
+- compatible: should be "sony,imx323"
+- clocks: reference to the 37.125M xvclk input clock.
+- clock-names: should be "xvclk".
+- dovdd-supply: Digital I/O voltage supply, 1.8 volts
+- avdd-supply: Analog voltage supply, 2.8 volts
+- dvdd-supply: Digital core voltage supply, 1.2 volts
+- reset-gpios: Low active reset gpio
+
+The device node must contain one 'port' child node for its digital output
+video port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+&i2c3: imx323@1a {
+	compatible = "sony,imx323";
+	reg = <0x1a>;
+	clocks = <&cru SCLK_CIF_OUT>;
+	clock-names = "xvclk";
+	avdd-supply = <&vcc2v8_dvp>;
+	dovdd-supply = <&vcc1v8_dvp>;
+	dvdd-supply = <&vdd1v5_dvp>;
+	pwdn-gpios = <&gpio2 RK_PC4 GPIO_ACTIVE_HIGH>;
+	reset-gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&dvp_d0d1_m0 &dvp_d2d9_m0
+		&dvp_d10d11_m0 &cif_clkout_m0>;
+	port {
+		imx323_out: endpoint {
+			remote-endpoint = <&isp0_dvp_in>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-android.dts
@@ -338,7 +338,14 @@
 		pwms = <&pwm2 0 25000 1>;
 		regulator-name = "vdd_log";
 		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <1400000>;
+		/*
+		 * the firefly hardware using 3.0 v as APIO2_VDD
+		 * voltage, but the pwm divider resistance is designed
+		 * based on hardware which the APIO2_VDD is 1.8v, so we
+		 * need to change the regulator-max-microvolt from 1.4v
+		 * to 1.0v, so the pwm can output 0.9v voltage.
+		 */
+		regulator-max-microvolt = <1000000>;
 		regulator-always-on;
 		regulator-boot-on;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly-linux.dts
@@ -287,7 +287,14 @@
 		pwms = <&pwm2 0 25000 1>;
 		regulator-name = "vdd_log";
 		regulator-min-microvolt = <800000>;
-		regulator-max-microvolt = <1400000>;
+		/*
+		 * the firefly hardware using 3.0 v as APIO2_VDD
+		 * voltage, but the pwm divider resistance is designed
+		 * based on hardware which the APIO2_VDD is 1.8v, so we
+		 * need to change the regulator-max-microvolt from 1.4v
+		 * to 1.0v, so the pwm can output 0.9v voltage.
+		 */
+		regulator-max-microvolt = <1000000>;
 		regulator-always-on;
 		regulator-boot-on;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
@@ -108,6 +108,13 @@
 		regulator-max-microvolt = <1800000>;
 	};
 
+	ext_cam_clk: external-camera-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <27000000>;
+		clock-output-names = "CLK_CAMERA_27MHZ";
+		#clock-cells = <0>;
+	};
+
 	adc-keys {
 		compatible = "adc-keys";
 		io-channels = <&saradc 1>;
@@ -309,6 +316,29 @@
 		rst_gpio_number = <&gpio4 22 GPIO_ACTIVE_HIGH>;
 	};
 
+	tc358749x: tc358749x@f {
+		compatible = "toshiba,tc358749";
+		reg = <0xf>;
+		clocks = <&ext_cam_clk>;
+		clock-names = "refclk";
+		reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hdmiin_gpios>;
+		status = "disabled";
+		port {
+			hdmiin_out0: endpoint {
+				/* Unlinked mipi dphy rx0 */
+				//remote-endpoint = <&mipi_in_ucam0>;
+				data-lanes = <1 2 3 4>;
+				clock-noncontinuous;
+				link-frequencies =
+					/bits/ 64 <297000000>;
+			};
+		};
+	};
+
 	ov13850: ov13850@10 {
 		compatible = "ovti,ov13850";
 		status = "okay";
@@ -375,11 +405,12 @@
 	hdmiin {
 		hdmiin_gpios: hdmiin-gpios {
 			rockchip,pins =
-				<2 5 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 6 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 5 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 6 RK_FUNC_GPIO &pcfg_output_high>,
 				<2 7 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 8 RK_FUNC_GPIO &pcfg_pull_none>,
-				<2 9 RK_FUNC_GPIO &pcfg_pull_none>,
+				<2 8 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 9 RK_FUNC_GPIO &pcfg_output_high>,
+				<2 10 RK_FUNC_GPIO &pcfg_output_low>,
 				<2 12 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -325,7 +325,7 @@
 		vcc10-supply = <&vcc3v3_sys>;
 		vcc11-supply = <&vcc3v3_sys>;
 		vcc12-supply = <&vcc3v3_sys>;
-		vddio-supply = <&vcc1v8_pmu>;
+		vddio-supply = <&vcc_3v0>;
 
 		regulators {
 			vdd_center: DCDC_REG1 {

diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
@@ -180,11 +180,12 @@ CONFIG_USB_NET_CDC_MBIM=y
 CONFIG_LIBERTAS_THINFIRM=y
 CONFIG_USB_NET_RNDIS_WLAN=y
 CONFIG_WL_ROCKCHIP=y
+CONFIG_WIFI_BUILD_MODULE=y
 CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP=y
-CONFIG_AP6XXX=y
-CONFIG_RTL8188EU=y
-CONFIG_MWIFIEX=y
-CONFIG_MWIFIEX_SDIO=y
+CONFIG_AP6XXX=m
+CONFIG_RTL8188EU=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
 CONFIG_INPUT_FF_MEMLESS=y
 # CONFIG_INPUT_MOUSEDEV is not set
 CONFIG_INPUT_EVDEV=y
@@ -299,6 +300,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_ROCKCHIP_RGA=y
 # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 # CONFIG_VIDEO_IR_I2C is not set
+CONFIG_VIDEO_TC35874X=y
 CONFIG_VIDEO_OV4689=y
 CONFIG_VIDEO_OV13850=y
 # CONFIG_DVB_AU8522_V4L is not set

diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig
diff --git a/drivers/adc/Makefile b/drivers/adc/Makefile
diff --git a/drivers/adc/adc_priv.h b/drivers/adc/adc_priv.h