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

Commit faa440d7 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 155f39f4 on remote branch 

Change-Id: Ia92479f7b83e933e708f26122455d0152b49c551
parents b6a82471 155f39f4

bindings/interrupt-controller/qcom,mpm.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Properties: 
		"qcom,mpm-gic-sdxnightjar"

		"qcom,mpm-gic-monaco"

		"qcom,mpm-gic-qcs405"

		"qcom,mpm-gic-blair"



- interrupts:

	Usage: required

bindings/media/video/msm-vidc.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
	- "qcom,sm6150-vidc" : Invokes driver specific data for SA6155.

	- "qcom,scuba-vidc" : Invokes driver specific data for SCUBA.

	- "qcom,monaco-vidc" : Invokes driver specific data for MONACO.

	- "qcom,qcm6490-vidc" : Invokes driver specific data for YUPIK-IOT.



Optional properties:

- vidc,firmware-name : Video Firmware ELF image name to be loaded by PIL

- reg : offset and length of the register set for the device.

bindings/net/qrtr-mhi-dev.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
QTI QRTR MHI Dev transport binding



- compatible:

	Usage: required

	Value type: <stringlist>

	Definition: must be "qcom,qrtr-mhi-dev"



- qcom,net-id:

	Usage: optional

	Value type: <u32>

	Definition: indicates what subnet this transport belongs to. Should be

		    passed into the qrtr core logic to determine if forwarding

		    is needed on this endpoint.



- qcom,low-latency:

	Usage: optional

	Value type: <bool>

	Definition: indicates whether this transport receiving thread needs to

		    be set to realtime priority for enhanced performance.



= EXAMPLE

The following example represents the qrtr mhi dev transport node on a device

configured as a pcie endpoint and needs to forward data from the host to a

modem co-processor.



	qcom,mhi_dev_qrtr {

		compatible = "qcom,qrtr-mhi-dev";

		qcom,net-id = <3>;

		qcom,low-latency;

	};

qcom/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ dtbo-$(CONFIG_ARCH_HOLI) += holi-rumi-overlay.dtbo \ 
	holi-cdp-lcd-pm6125-overlay.dtbo \

	holi-mtp-usbc-pm6125-overlay.dtbo \

	holi-mtp-pm6125-nopmi-overlay.dtbo \

	holi-qrd-pm6125-overlay.dtbo

	holi-qrd-pm6125-overlay.dtbo \

	holi-qrd-pm6125-nopmi-overlay.dtbo



holi-rumi-overlay.dtbo-base := holi.dtb

holi-mtp-overlay.dtbo-base := holi.dtb
@@ -121,6 +122,7 @@ holi-cdp-lcd-pm6125-overlay.dtbo-base := holi.dtb 
holi-mtp-usbc-pm6125-overlay.dtbo-base := holi.dtb

holi-mtp-pm6125-nopmi-overlay.dtbo-base := holi.dtb

holi-qrd-pm6125-overlay.dtbo-base := holi.dtb

holi-qrd-pm6125-nopmi-overlay.dtbo-base := holi.dtb



else

dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \
@@ -135,7 +137,8 @@ dtb-$(CONFIG_ARCH_HOLI) += holi-rumi.dtb \ 
	holi-cdp-lcd-pm6125.dtb \

	holi-mtp-usbc-pm6125.dtb \

	holi-mtp-pm6125-nopmi.dtb \

	holi-qrd-pm6125.dtb

	holi-qrd-pm6125.dtb \

	holi-qrd-pm6125-nopmi.dtb



endif
@@ -406,14 +409,19 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-mtp.dtb \

	sdxlemur-mtp-mbb.dtb \

	sdxlemur-mtp-cpe.dtb \

	sdxlemur-mtp-cpe-pine1x.dtb \

	sdxlemur-mtp-cpe-pine2x.dtb \

	sdxlemur-mtp-mbb-emmc.dtb \

	sdxlemur-mtp-mbb-emmc-512mb.dtb \

	sdxlemur-mtp-mbb-ntn3-pcie.dtb \

	sdxlemur-mtp-mbb-pcie-ep.dtb \

	sdxlemur-mtp-mbb-pcie-rc-ep.dtb \

	sdxlemur-mtp-mbb-m2-ep.dtb \

	sdxlemur-mtp-mbb.dtb \

	sdxlemur-rcm-pcie-ep.dtb \

	sdxlemur-rcm-rc.dtb \

	sdxlemur-rcm-rc-pine1x.dtb \

	sdxlemur-rcm-rc-pine2x.dtb \

	sdxlemur-v2-cdp.dtb \

	sdxlemur-v2-mtp-mbb.dtb \

	sdxlemur-v2-mtp-cpe.dtb \

qcom/blair-atp.dtsi

+306 −7
Original line number Diff line number Diff line 
#include "holi-audio-overlay.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

#include "display/holi-sde-display-atp.dtsi"

#include "holi-thermal-overlay.dtsi"

#include <dt-bindings/iio/qti_power_supply_iio.h>



&rpm_bus {

	/* Delete all PM6125 and PMR735a rpm-regulators */

	/delete-node/ rpm-regulator-smpa6;
@@ -323,11 +331,6 @@ 
	};

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v4-yupik";

	vdda-phy-max-microamp = <85700>;

};



#include "pm6350-rpm-regulator.dtsi"

#include "pm6150l-rpm-regulator.dtsi"

#include "holi-regulators-pm6350.dtsi"
@@ -376,9 +379,305 @@ 
	};

};



#include "holi-atp.dtsi"



&qusb_phy0 {



&sdhc_1 {

	status = "ok";



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_on>;

	pinctrl-1 = <&sdc1_off>;



	vdd-supply = <&L7E>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L12A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <325000 325000>;

};



&sdhc_2 {

	status = "ok";



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	vdd-supply = <&L9E>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&L6E>;

	qcom,vdd-io-voltage-level = <1800000 2960000>;

	qcom,vdd-io-current-level = <0 22000>;



	cd-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>;

};



&ufsphy_mem {

		compatible = "qcom,ufs-phy-qmp-v4-yupik";



		vdda-phy-supply = <&L18A>;

		vdda-pll-supply = <&L22A>;

		vdda-phy-max-microamp = <85700>;

		vdda-pll-max-microamp = <18300>;



		status = "ok";

};



&ufshc_mem {

		vdd-hba-supply = <&gcc_ufs_phy_gdsc>;

		vdd-hba-fixed-regulator;



		vcc-supply = <&L7E>;

		vcc-voltage-level = <2950000 2960000>;

		vcc-max-microamp = <800000>;



		vccq2-supply = <&L12A>;

		vccq2-max-microamp = <800000>;

		vccq2-voltage-level = <1800000 1800000>;



		qcom,vddp-ref-clk-supply = <&L22A>;

		qcom,vddp-ref-clk-max-microamp = <100>;



		status = "ok";

};



&qupv3_se0_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,sn-nci";

		reg = <0x28>;

		qcom,sn-irq = <&tlmm 9 0x00>;

		qcom,sn-ven = <&tlmm 6 0x00>;

		qcom,sn-firm = <&tlmm 8 0x00>;

		qcom,sn-clkreq = <&tlmm 7 0x00>;

		qcom,sn-vdd-1p8-supply = <&L11A>;

		qcom,sn-vdd-1p8-voltage = <1800000 1800000>;

		qcom,sn-vdd-1p8-current = <157000>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

	};

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm6350_gpios 2 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			gpio-key,wakeup;

			debounce-interval = <15>;

			linux,can-disable;

		};

	};

};



&qupv3_se10_i2c {

	status = "disabled";

};



&pm8008_8 {

	status = "disabled";

};



&pm8008_9 {

	status = "disabled";

};



&pm6150a_amoled {

	status = "ok";

};



&pm7250b_charger {

	status = "ok";

	#io-channel-cells = <1>;

	io-channels = <&pm7250b_vadc ADC5_USB_IN_V_16>,

		      <&pm7250b_vadc ADC5_USB_IN_I>,

		      <&pm7250b_vadc ADC5_CHG_TEMP>,

		      <&pm7250b_vadc ADC5_DIE_TEMP>,

		      <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>,

		      <&pm7250b_vadc ADC5_SBUx>,

		      <&pm7250b_vadc ADC5_VPH_PWR>,

		      <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>,

		      <&pm7250b_qg PSY_IIO_RESISTANCE_ID>,

		      <&pm7250b_qg PSY_IIO_VOLTAGE_NOW>,

		      <&pm7250b_qg PSY_IIO_TEMP>,

		      <&pm7250b_qg PSY_IIO_CAPACITY>,

		      <&pm7250b_qg PSY_IIO_VOLTAGE_OCV>,

		      <&pm7250b_qg PSY_IIO_VOLTAGE_AVG>,

		      <&pm7250b_qg PSY_IIO_DEBUG_BATTERY>,

		      <&pm7250b_qg PSY_IIO_REAL_CAPACITY>,

		      <&pm7250b_qg PSY_IIO_CC_SOC>,

		      <&pm7250b_qg PSY_IIO_CURRENT_NOW>,

		      <&pm7250b_qg PSY_IIO_VOLTAGE_MAX>,

		      <&pm7250b_qg PSY_IIO_CHARGE_FULL>,

		      <&pm7250b_qg PSY_IIO_CHARGE_COUNTER>,

		      <&pm7250b_qg PSY_IIO_CYCLE_COUNT>,

		      <&pm7250b_qg PSY_IIO_CHARGE_FULL_DESIGN>,

		      <&pm7250b_qg PSY_IIO_TIME_TO_FULL_NOW>;

	io-channel-names = "usb_in_voltage",

			   "usb_in_current",

			   "chg_temp",

			   "die_temp",

			   "conn_temp",

			   "sbux_res",

			   "vph_voltage",

			   "skin_temp",

			   "resistance_id",

			   "voltage_now",

			   "temp",

			   "capacity",

			   "voltage_ocv",

			   "voltage_avg",

			   "debug_battery",

			   "real_capacity",

			   "cc_soc",

			   "current_now",

			   "voltage_max",

			   "charge_full",

			   "charge_counter",

			   "cycle_count",

			   "charge_full_design",

			   "time_to_full_now";

	qcom,batteryless-platform;

	qcom,sec-charger-config = <0>;

	qcom,auto-recharge-soc = <98>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

	qcom,charger-temp-max = <800>;

	qcom,smb-temp-max = <800>;

	qcom,suspend-input-on-debug-batt;

};



&pm7250b_qg {

	status = "ok";

	#io-channel-cells = <1>;

	io-channels = <&pm7250b_vadc ADC5_BAT_THERM_100K_PU>,

		      <&pm7250b_vadc ADC5_BAT_ID_100K_PU>,

		      <&pm7250b_charger PSY_IIO_INPUT_CURRENT_LIMITED>,

		      <&pm7250b_charger PSY_IIO_RECHARGE_SOC>,

		      <&pm7250b_charger PSY_IIO_FORCE_RECHARGE>,

		      <&pm7250b_charger PSY_IIO_CHARGE_DONE>;

	io-channel-names = "batt-therm",

			   "batt-id",

			   "input_current_limited",

			   "recharge_soc",

			   "force_recharge",

			   "charge_done";

	qcom,qg-iterm-ma = <150>;

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

	qcom,cl-feedback-on;

};



&qupv3_se8_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <22 0x2008>;

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

					"pmx_ts_release";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&pmx_ts_release>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,irq-gpio = <&tlmm 22 0x2008>;

		synaptics,irq-on-state = <0>;

		synaptics,reset-gpio = <&tlmm 21 0x00>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

		synaptics,reset-delay-ms = <200>;

		synaptics,power-delay-ms = <200>;

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware.img";



		panel = <&dsi_rm69299_visionox_amoled_video

			&dsi_rm69299_visionox_amoled_cmd>;

	};

};



&pm7250b_charger {

	dpdm-supply = <&usb2_phy0>;



	smb5_vbus: qcom,smb5-vbus {

		regulator-name = "smb5-vbus";

	};



	smb5_vconn: qcom,smb5-vconn {

		regulator-name = "smb5-vconn";

	};

};



&pm7250b_pdphy {

	vdd-pdphy-supply = <&L7E>;

	vbus-supply = <&smb5_vbus>;

	vconn-supply = <&smb5_vconn>;



	#io-channel-cells = <1>;

	io-channels = <&pm7250b_charger PSY_IIO_PD_ACTIVE>,

		      <&pm7250b_charger PSY_IIO_TYPEC_CC_ORIENTATION>,

		      <&pm7250b_charger PSY_IIO_CONNECTOR_TYPE>,

		      <&pm7250b_charger PSY_IIO_TYPEC_POWER_ROLE>,

		      <&pm7250b_charger PSY_IIO_PD_USB_SUSPEND_SUPPORTED>,

		      <&pm7250b_charger PSY_IIO_TYPEC_SRC_RP>,

		      <&pm7250b_charger PSY_IIO_PD_IN_HARD_RESET>,

		      <&pm7250b_charger PSY_IIO_PD_CURRENT_MAX>,

		      <&pm7250b_charger PSY_IIO_PR_SWAP>,

		      <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MIN>,

		      <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MAX>,

		      <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>,

		      <&pm7250b_charger PSY_IIO_TYPEC_MODE>,

		      <&pm7250b_charger PSY_IIO_PE_START>;

	io-channel-names = "pd_active",

			   "typec_cc_orientation",

			   "connector_type",

			   "typec_power_role",

			   "pd_usb_suspend_supported",

			   "typec_src_rp",

			   "pd_in_hard_reset",

			   "pr_current_max",

			   "pr_swap",

			   "pd_voltage_min",

			   "pd_voltage_max",

			   "real_type",

			   "typec_mode",

			   "pe_start";

};



&usb0 {

	extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;



	#io-channel-cells = <1>;

	io-channels= <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>;

	io-channel-names = "chg_type";

};



&usb2_phy0 {

	vdd-supply = <&L18A>;

	vdda18-supply = <&L2A>;

	vdda33-supply = <&L3A>;