Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f639a1c authored by Kshitij's avatar Kshitij
Browse files

linux-4.9: Import ODM package for Teracube 2e

Change-Id: I3f4e676c65d2325d3dc318e9f071f1ee538ab747
parent fddc0542
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__
KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		   -fno-strict-aliasing -fno-common -fshort-wchar \
		   -Werror-implicit-function-declaration \
		   -Wno-format-security \
		   -Wno-format-security -Wno-error=format \
		   -std=gnu89
KBUILD_CPPFLAGS := -D__KERNEL__
KBUILD_AFLAGS_KERNEL :=
+401 −0
Original line number Diff line number Diff line

/* Begin:xen added by BPI BUS control by APP 20171014 mt6765 mt6762 */
&pio {
	bpibus_ctrl_bpibus0_pin_high: bpibus0_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO76__FUNC_GPIO76>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus0_pin_low: bpibus0_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO76__FUNC_GPIO76>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus1_pin_high: bpibus1_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO75__FUNC_GPIO75>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus1_pin_low: bpibus1_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO75__FUNC_GPIO75>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus2_pin_high: bpibus2_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO74__FUNC_GPIO74>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus2_pin_low: bpibus2_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO74__FUNC_GPIO74>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus3_pin_high: bpibus3_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO73__FUNC_GPIO73>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus3_pin_low: bpibus3_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO73__FUNC_GPIO73>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus4_pin_high: bpibus4_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO72__FUNC_GPIO72>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus4_pin_low: bpibus4_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO72__FUNC_GPIO72>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus5_pin_high: bpibus5_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO71__FUNC_GPIO71>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus5_pin_low: bpibus5_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO71__FUNC_GPIO71>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus6_pin_high: bpibus6_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO70__FUNC_GPIO70>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus6_pin_low: bpibus6_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO70__FUNC_GPIO70>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus7_pin_high: bpibus7_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO69__FUNC_GPIO69>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus7_pin_low: bpibus7_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO69__FUNC_GPIO69>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus8_pin_high: bpibus8_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO55__FUNC_GPIO55>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus8_pin_low: bpibus8_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO55__FUNC_GPIO55>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus9_pin_high: bpibus9_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO56__FUNC_GPIO56>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus9_pin_low: bpibus9_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO56__FUNC_GPIO56>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus10_pin_high: bpibus10_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO57__FUNC_GPIO57>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus10_pin_low: bpibus10_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO57__FUNC_GPIO57>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus11_pin_high: bpibus11_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO78__FUNC_GPIO78>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus11_pin_low: bpibus11_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO78__FUNC_GPIO78>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus12_pin_high: bpibus12_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO54__FUNC_GPIO54>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus12_pin_low: bpibus12_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO54__FUNC_GPIO54>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus13_pin_high: bpibus13_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO53__FUNC_GPIO53>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus13_pin_low: bpibus13_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO53__FUNC_GPIO53>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus14_pin_high: bpibus14_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO77__FUNC_GPIO77>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus14_pin_low: bpibus14_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO77__FUNC_GPIO77>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus15_pin_high: bpibus15_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO52__FUNC_GPIO52>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus15_pin_low: bpibus15_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO52__FUNC_GPIO52>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus16_pin_high: bpibus16_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO65__FUNC_GPIO65>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus16_pin_low: bpibus16_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO65__FUNC_GPIO65>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};

	bpibus_ctrl_bpibus17_pin_high: bpibus17_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO66__FUNC_GPIO66>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus17_pin_low: bpibus17_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO66__FUNC_GPIO66>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};
/*
	bpibus_ctrl_bpibus18_pin_high: bpibus18_pin_high {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO10__FUNC_GPIO10>;
			slew-rate = <1>;
			bias-disable;
			output-high;
		};
	};

	bpibus_ctrl_bpibus18_pin_low: bpibus18_pin_low {
	    pins_cmd_dat {
			pinmux = <PINMUX_GPIO10__FUNC_GPIO10>;
			slew-rate = <1>;
			bias-disable;
			output-low;
		};
	};
*/
	bpibus_ctrl_pin_default: bpibus_ctrl_defaultcfg {

	};
};

&bpibus_ctrl {
	pinctrl-names = "pin_default", 
			"bpibus0_pin_high", "bpibus0_pin_low", "bpibus1_pin_high", "bpibus1_pin_low", 
			"bpibus2_pin_high", "bpibus2_pin_low", "bpibus3_pin_high", "bpibus3_pin_low",
			"bpibus4_pin_high", "bpibus4_pin_low", "bpibus5_pin_high", "bpibus5_pin_low", 
			"bpibus6_pin_high", "bpibus6_pin_low", "bpibus7_pin_high", "bpibus7_pin_low",
			"bpibus8_pin_high", "bpibus8_pin_low", "bpibus9_pin_high", "bpibus9_pin_low", 
			"bpibus10_pin_high", "bpibus10_pin_low", "bpibus11_pin_high", "bpibus11_pin_low",
			"bpibus12_pin_high", "bpibus12_pin_low", "bpibus13_pin_high", "bpibus13_pin_low", 
			"bpibus14_pin_high", "bpibus14_pin_low", "bpibus15_pin_high", "bpibus15_pin_low",
			"bpibus16_pin_high", "bpibus16_pin_low", "bpibus17_pin_high", "bpibus17_pin_low";
	pinctrl-0 = <&bpibus_ctrl_pin_default>;
	pinctrl-1 = <&bpibus_ctrl_bpibus0_pin_high>;
	pinctrl-2 = <&bpibus_ctrl_bpibus0_pin_low>;
	pinctrl-3 = <&bpibus_ctrl_bpibus1_pin_high>;
	pinctrl-4 = <&bpibus_ctrl_bpibus1_pin_low>;
	pinctrl-5 = <&bpibus_ctrl_bpibus2_pin_high>;
	pinctrl-6 = <&bpibus_ctrl_bpibus2_pin_low>;
	pinctrl-7 = <&bpibus_ctrl_bpibus3_pin_high>;
	pinctrl-8 = <&bpibus_ctrl_bpibus3_pin_low>;
	pinctrl-9 = <&bpibus_ctrl_bpibus4_pin_high>;
	pinctrl-10 = <&bpibus_ctrl_bpibus4_pin_low>;
	pinctrl-11 = <&bpibus_ctrl_bpibus5_pin_high>;
	pinctrl-12 = <&bpibus_ctrl_bpibus5_pin_low>;
	pinctrl-13 = <&bpibus_ctrl_bpibus6_pin_high>;
	pinctrl-14 = <&bpibus_ctrl_bpibus6_pin_low>;
	pinctrl-15 = <&bpibus_ctrl_bpibus7_pin_high>;
	pinctrl-16 = <&bpibus_ctrl_bpibus7_pin_low>;
	pinctrl-17 = <&bpibus_ctrl_bpibus8_pin_high>;
	pinctrl-18 = <&bpibus_ctrl_bpibus8_pin_low>;
	pinctrl-19 = <&bpibus_ctrl_bpibus9_pin_high>;
	pinctrl-20 = <&bpibus_ctrl_bpibus9_pin_low>;
	pinctrl-21 = <&bpibus_ctrl_bpibus10_pin_high>;
	pinctrl-22 = <&bpibus_ctrl_bpibus10_pin_low>;
	pinctrl-23 = <&bpibus_ctrl_bpibus11_pin_high>;
	pinctrl-24 = <&bpibus_ctrl_bpibus11_pin_low>;
	pinctrl-25 = <&bpibus_ctrl_bpibus12_pin_high>;
	pinctrl-26 = <&bpibus_ctrl_bpibus12_pin_low>;
	pinctrl-27 = <&bpibus_ctrl_bpibus13_pin_high>;
	pinctrl-28 = <&bpibus_ctrl_bpibus13_pin_low>;
	pinctrl-29 = <&bpibus_ctrl_bpibus14_pin_high>;
	pinctrl-30 = <&bpibus_ctrl_bpibus14_pin_low>;
	pinctrl-31 = <&bpibus_ctrl_bpibus15_pin_high>;
	pinctrl-32 = <&bpibus_ctrl_bpibus15_pin_low>;
	pinctrl-33 = <&bpibus_ctrl_bpibus16_pin_high>;
	pinctrl-34 = <&bpibus_ctrl_bpibus16_pin_low>;
	pinctrl-35 = <&bpibus_ctrl_bpibus17_pin_high>;
	pinctrl-36 = <&bpibus_ctrl_bpibus17_pin_low>;
	status = "okay";      
};
/* End:xen added by BPI BUS control by APP 20171014 */
+3 −2
Original line number Diff line number Diff line
@@ -65,9 +65,10 @@
	register_setting = <&msdc1_register_setting_default>;

	host_function = /bits/ 8 <MSDC_SD>;

	non-removable;
	cd_level_high = /bits/ 8 <MSDC_CD_HIGH>;
	cd_level = /bits/ 8 <MSDC_CD_LOW>;
	cd-gpios = <&pio 1 0>;
	cd-gpios = <&pio 56 0>;

	status = "okay";

+3 −2
Original line number Diff line number Diff line
@@ -63,9 +63,10 @@
	register_setting = <&msdc1_register_setting_default>;

	host_function = /bits/ 8 <MSDC_SD>;

	non-removable;
	cd_level_high = /bits/ 8 <MSDC_CD_HIGH>;
	cd_level = /bits/ 8 <MSDC_CD_LOW>;
	cd-gpios = <&pio 1 0>;
	cd-gpios = <&pio 56 0>;

	status = "okay";

+48 −13
Original line number Diff line number Diff line
@@ -225,14 +225,6 @@
			alloc-ranges = <0 0x40000000 0 0x80000000>;
		};

		gpu-reserve-memory {
			compatible = "mediatek,gpu-fw-reserve-memory";
			no-map;
			size = <0 0x3000>;
			alignment = <0 0x1000>;
			alloc-ranges = <0 0x5fc00000 0 0x3000>;
		};

#ifdef CONFIG_MICROTRUST_TEE_SUPPORT
		soter-shared-mem {
			compatible = "microtrust,shared_mem";
@@ -632,7 +624,15 @@
	accdet: accdet {
		compatible = "mediatek,pmic-accdet";
	};

	/*sw331b*/
        sunwave_fp: sunwave_fp {
		compatible = "sunwave,sunwave_fp";
	};
	/*add for cdfiger start*/
	cdfinger:cdfinger {
		compatible = "mediatek,fps1098";
	};
/*add for cdfiger end*/
	mt6357_gauge {
		compatible = "mediatek,mt6357_gauge";
		gauge_name = "gauge";
@@ -1700,7 +1700,7 @@

	spi0: spi0@1100a000 {
		compatible = "mediatek,mt6765-spi";
		mediatek,pad-select = <0>;
		mediatek,pad-select = <0>,<0>; /*modified:multi spi device by xen 20171025*/
		reg = <0 0x1100a000 0 0x1000>;
		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_LOW>;
		clocks = <&topckgen CLK_TOP_SYSPLL3_D2>,
@@ -2281,6 +2281,16 @@ mipi_rx_ana_csi0b: mipi_rx_ana_csi0b@11c11000 {
		interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_LOW>;
	};

/*added by xjl for flashlight constant 20181030*/
	flashlights_constant_gpio: flashlights_constant_gpio {
		compatible = "mediatek,flashlights_constant_gpio";
	};

/*added by xen for LCD_ID of LCD driver 20171106*/
	lcd_id_node: lcd_id {
		compatible = "mediatek,lcd_id_gpio";
	};

	mtkfb: mtkfb@0 {
		compatible = "mediatek,mtkfb";
	};
@@ -2523,21 +2533,46 @@ mipi_rx_ana_csi0b: mipi_rx_ana_csi0b@11c11000 {

	flashlights_mt6370: flashlights_mt6370 {
		compatible = "mediatek,flashlights_mt6370";
		decouple = <0>;
		decouple = <1>;/*mian led use ledcs1,sub led use ledcs2 cjc20180717*/
		channel@1 {
			type = <0>;
			ct = <0>;
			part = <0>;
		};
		channel@2 {
			type = <0>;
			ct = <1>;
			type = <1>;
			ct = <0>;
			part = <0>;
		};
	};
	flashlights_aw3644: flashlights_aw3644 {
		compatible = "mediatek,flashlights_aw3644";
	};

	gse_1: gse_1 {
		compatible = "mediatek,gsensor";
	};
 /*mhall eint,added by xen 20170918*/
	mhall: mhall {
		compatible = "mediatek, mhall-eint";
	};
 /*mhall eint,added by xen 20170918*/	
	als: als_ps@0 {
		compatible = "mediatek,als_ps";
	};
	
	mse: mse {
		compatible = "mediatek,msensor";
	};	
		
	gyro: gyro {
		compatible = "mediatek,gyroscope";
	};

	baro: baro {
		compatible = "mediatek,barometer";
	};

	venc_gcon: venc_gcon@17000000 {
		compatible = "mediatek,venc_gcon", "syscon";
		reg = <0 0x17000000 0 0x10000>;
Loading