Merge 4eb4c8f75732fc288751d538043670ddc65f5e02 on remote branch (c48d27cb) · Commits · e / devices / android_kernel_fairphone_FP4

bindings/arm/msm/msm.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,12 @@ SoCs:
		- SDA660
		compatible = "qcom,sda660"

		- QCM4290
		compatible = "qcom,qcm4290"

		- QCS4290
		compatible = "qcom,qcs4290"

		Generic board variants:

		- CDP device:
		@@ -226,3 +232,7 @@ compatible = "qcom,sdm660-sim"
		compatible = "qcom,sda660-mtp"
		compatible = "qcom,sda660-cdp"
		compatible = "qcom,sda660-qrd"
		compatible = "qcom,qcm4290"
		compatible = "qcom,qcs4290"
		compatible = "qcom,qcm4290-idp"
		compatible = "qcom,qcs4290-idp"

bindings/media/video/msm-vidc-vmem.txt

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		* Qualcomm Technologies Inc MSM VIDC VMEM

		Required properties:
		- compatible : "qcom,msm-vmem"
		- interrupts : Contains the interrupt that maps to the VMEM module
		- reg : A set of 2 start address and size pairs that describe the hardware
		register address space and mappable memory address space.
		- reg-names : Strings that describe the pairs in "reg". The register address
		space should be called "reg-base" and the memory space should be called "mem-base".
		- clocks : A set of clocks that correspond to the AHB and MAXI clocks that the
		hardware uses.
		- clock-names : A string that describes the "clocks" property. The AHB clock
		should be named "ahb" and the MAXI clock should be named "maxi".
		- qcom,bank-size : The size of each memory bank, in bytes.
		- vdd-supply: phandle to a regulator that is considered to be the footswitch for vmem.
		- qcom,msm-bus,(name\|num-cases,num-paths,vectors-KBps) - Bus to be voted for prior to
		issuing any IO transactions to vmem. Refer to Documentation/devicetree/bindings/arm/\
		msm/msm_bus_adhoc.txt for further details.

		Example:

		qcom,vmem@880000 {
		compatible = "qcom,msm-vmem";
		interrupts = <0 429 0>;
		reg = <0x880000 0x800>,
		<0x6800000 0x100000>;
		reg-names = "reg-base", "mem-base";

		vdd-supply = <&gdsc_mmagic_video>;
		clocks = <&clock_mmss clk_vmem_ahb_clk>,
		<&clock_mmss clk_vmem_maxi_clk>;
		clock-names = "ahb", "maxi";

		qcom,bank-size = <131072>;

		qcom,msm-bus,name = "vmem";
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;
		qcom,msm-bus,vectors-KBps =
		<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_VMEM_CFG 0 0>,
		<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_VMEM_CFG 500 800>;
		};

qcom/Makefile

+87 −2

Original line number	Diff line number	Diff line
		@@ -115,7 +115,14 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		bengal-idp-1gb-overlay.dtbo \
		bengal-idp-2gb-overlay.dtbo \
		bengal-idp-usbc-1gb-overlay.dtbo \
		bengal-idp-usbc-2gb-overlay.dtbo
		bengal-idp-usbc-2gb-overlay.dtbo \
		qcm4290-iot-idp-overlay.dtbo \
		qcs4290-iot-idp-overlay.dtbo \
		qcm4290-iot-idp-1gb-overlay.dtbo \
		qcm4290-iot-idp-2gb-overlay.dtbo \
		qcm4290-iot-idp-usbc-1gb-overlay.dtbo \
		qcm4290-iot-idp-usbc-2gb-overlay.dtbo \
		qcm4290-iot-idp-usbc-overlay.dtbo

		bengal-rumi-overlay.dtbo-base := bengal.dtb
		bengal-qrd-overlay.dtbo-base := bengal.dtb
		@@ -126,6 +133,13 @@ bengal-idp-1gb-overlay.dtbo-base := bengal-1gb.dtb
		bengal-idp-2gb-overlay.dtbo-base := bengal-2gb.dtb
		bengal-idp-usbc-1gb-overlay.dtbo-base := bengal-1gb.dtb
		bengal-idp-usbc-2gb-overlay.dtbo-base := bengal-2gb.dtb
		qcm4290-iot-idp-overlay.dtbo-base := qcm4290.dtb
		qcs4290-iot-idp-overlay.dtbo-base := qcs4290.dtb
		qcm4290-iot-idp-1gb-overlay.dtbo-base := qcm4290-iot-1gb.dtb
		qcm4290-iot-idp-2gb-overlay.dtbo-base := qcm4290-iot-2gb.dtb
		qcm4290-iot-idp-usbc-1gb-overlay.dtbo-base := qcm4290-iot-1gb.dtb
		qcm4290-iot-idp-usbc-2gb-overlay.dtbo-base := qcm4290-iot-2gb.dtb
		qcm4290-iot-idp-usbc-overlay.dtbo-base := qcm4290.dtb
		else
		dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \
		bengal-qrd.dtb \
		@@ -135,7 +149,14 @@ dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \
		bengal-idp-1gb.dtb \
		bengal-idp-2gb.dtb \
		bengal-idp-usbc-1gb.dtb \
		bengal-idp-usbc-2gb.dtb
		bengal-idp-usbc-2gb.dtb \
		qcm4290-iot-idp.dtb \
		qcs4290-iot-idp.dtb \
		qcm4290-iot-idp-1gb.dtb \
		qcm4290-iot-idp-2gb.dtb \
		qcm4290-iot-idp-usbc-1gb.dtb \
		qcm4290-iot-idp-usbc-2gb.dtb \
		qcm4290-iot-idp-usbc.dtb
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		@@ -163,6 +184,70 @@ dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \
		scuba-idp-usbc-2gb.dtb
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		dtbo-$(CONFIG_ARCH_SDM660) += \
		sdm660-mtp-external-codec-overlay.dtbo \
		sdm660-mtp-internal-codec-overlay.dtbo \
		sdm660-cdp-external-codec-overlay.dtbo \
		sdm660-cdp-internal-codec-overlay.dtbo \
		sdm660-qrd-external-codec-overlay.dtbo \
		sdm660-rcm-external-codec-overlay.dtbo \
		sdm660-rcm-internal-codec-overlay.dtbo \
		sda660-mtp-external-codec-overlay.dtbo \
		sda660-cdp-external-codec-overlay.dtbo \
		sda660-rcm-external-codec-overlay.dtbo

		sdm660-mtp-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-mtp-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-cdp-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-cdp-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-qrd-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-rcm-external-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sdm660-rcm-internal-codec-overlay.dtbo-base := sdm660-pm660l.dtb

		sda660-mtp-external-codec-overlay.dtbo-base := sda660-pm660l.dtb

		sda660-cdp-external-codec-overlay.dtbo-base := sda660-pm660l.dtb

		sda660-rcm-external-codec-overlay.dtbo-base := sda660-pm660l.dtb
		else
		dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
		sdm660-internal-codec-cdp.dtb \
		sdm660-internal-codec-mtp.dtb \
		sdm660-internal-codec-rcm.dtb \
		sdm660-cdp.dtb \
		sdm660-mtp.dtb \
		sdm660-qrd.dtb \
		sdm660-rcm.dtb \
		sdm660-pm660a-cdp.dtb \
		sdm660-pm660a-mtp.dtb \
		sdm660-pm660a-qrd.dtb \
		sdm660-pm660a-rcm.dtb \
		sdm660-internal-codec-pm660a-cdp.dtb \
		sdm660-internal-codec-pm660a-mtp.dtb \
		sdm660-internal-codec-pm660a-rcm.dtb \
		sdm660-pm660a-sim.dtb \
		sda660-cdp.dtb \
		sda660-mtp.dtb \
		sda660-rcm.dtb \
		sda660-pm660a-cdp.dtb \
		sda660-pm660a-mtp.dtb \
		sda660-pm660a-rcm.dtb \
		sda660-pm660a-qrd-hdk.dtb \
		sdm660-headset-jacktype-no-cdp.dtb \
		sdm660-headset-jacktype-no-rcm.dtb \
		sdm660-pm660a-headset-jacktype-no-cdp.dtb \
		sdm660-pm660a-headset-jacktype-no-rcm.dtb \
		sdm660-usbc-audio-mtp.dtb \
		sdm660-usbc-audio-rcm.dtb
		endif

		always := $(dtb-y)
		subdir-y := $(dts-dirs)
		clean-files := .dtb .dtbo

qcom/bengal-idp.dtsi

+22 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,25 @@
		qcom,platform-bklight-en-gpio = <&pmi632_gpios 6 0>;
		};

		&dsi_r66451_amoled_hd_90hz_video {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-reset-gpio = <&tlmm 82 0>;
		qcom,platform-en-gpio = <&tlmm 83 0>;
		};

		&dsi_r66451_amoled_hd_90hz_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,mdss-dsi-bl-min-level = <1>;
		qcom,mdss-dsi-bl-max-level = <4095>;
		qcom,platform-te-gpio = <&tlmm 81 0>;
		qcom,platform-reset-gpio = <&tlmm 82 0>;
		qcom,platform-en-gpio = <&tlmm 83 0>;
		};

		&sde_dsi {
		qcom,dsi-default-panel = <&dsi_td4330_truly_v2_video>;
		};
		@@ -425,5 +444,8 @@
		pinctrl-0 = <&ts_int_active &ts_reset_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&ts_release>;

		panel = <&dsi_r66451_amoled_hd_90hz_video
		&dsi_r66451_amoled_hd_90hz_cmd>;
		};
		};

qcom/bengal-sde-display.dtsi

+48 −0

Original line number	Diff line number	Diff line
		#include "dsi-panel-td4330-truly-v2-singlemipi-fhd-cmd.dtsi"
		#include "dsi-panel-td4330-truly-v2-singlemipi-fhd-vid.dtsi"
		#include "dsi-panel-nt36525-truly-hd-plus-vid.dtsi"
		#include "dsi-panel-r66451-hd-plus-90hz-video.dtsi"
		#include "dsi-panel-r66451-hd-plus-90hz-cmd.dtsi"
		#include <dt-bindings/clock/mdss-14nm-pll-clk.h>

		&pmi632_gpios {
		@@ -127,6 +129,12 @@
		cell-index = <0>;
		label = "wb_display";
		};

		msm_notifier: qcom,msm_notifier@0 {
		compatible = "qcom,msm-notifier";
		panel = <&dsi_r66451_amoled_hd_90hz_video
		&dsi_r66451_amoled_hd_90hz_cmd>;
		};
		};

		&mdss_mdp {
		@@ -239,3 +247,43 @@
		};
		};
		};

		&dsi_r66451_amoled_hd_90hz_video {
		qcom,mdss-dsi-t-clk-post = <0x0c>;
		qcom,mdss-dsi-t-clk-pre = <0x2a>;
		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0",
		"src_byte_clk0", "src_pixel_clk0",
		"shadow_byte_clk0", "shadow_pixel_clk0";
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings =
		[22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 17 06 07 04 02 04 a0];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};

		&dsi_r66451_amoled_hd_90hz_cmd {
		qcom,mdss-dsi-t-clk-post = <0x0c>;
		qcom,mdss-dsi-t-clk-pre = <0x2a>;
		qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0",
		"src_byte_clk0", "src_pixel_clk0",
		"shadow_byte_clk0", "shadow_pixel_clk0";
		qcom,mdss-dsi-display-timings {
		timing@0 {
		qcom,mdss-dsi-panel-phy-timings =
		[22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 1E 07 08 04 02 04 a0
		22 17 06 07 04 02 04 a0];
		qcom,display-topology = <1 0 1>;
		qcom,default-topology-index = <0>;
		};
		};
		};