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

Commit 4c270e21 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: modify memory map for wcnss pil-loading"

parents a1492354 d30a873e

arch/arm/configs/msm8909-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ CONFIG_MSM_ISP_V1=y 
CONFIG_MSM_ISPIF=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_RADIO_IRIS=y

CONFIG_RADIO_IRIS_TRANSPORT=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_MSM=y

arch/arm/configs/msm8909_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -355,6 +355,8 @@ CONFIG_MSM_ISP_V1=y 
CONFIG_MSM_ISPIF=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_RADIO_IRIS=y

CONFIG_RADIO_IRIS_TRANSPORT=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

arch/arm64/boot/dts/qcom/msm8905-512mb-memory.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
};



&peripheral_mem {

	reg = <0x0 0x8D000000 0x0 0x0500000>;

	reg = <0x0 0x8D000000 0x0 0x0700000>;

};

arch/arm64/boot/dts/qcom/msm8905-512mb-memory_qseev4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
};



&peripheral_mem {

	reg = <0x0 0x8D000000 0x0 0x0500000>;

	reg = <0x0 0x8D000000 0x0 0x0700000>;

};



&reserved_mem {

arch/arm64/boot/dts/qcom/msm8909.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -757,6 +757,10 @@ 
		};

	};



	qcom,iris-fm {

		compatible = "qcom,iris_fm";

	};



	wcnss: qcom,wcnss-wlan@a000000 {

		compatible = "qcom,wcnss_wlan";

		reg = <0x0a000000 0x280000>,