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

Commit 90435cce 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: Fix SMD ranges on msmcobalt"

parents 01d6a51a 8ec48597

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -183,14 +183,14 @@ 
	ranges = <0 0 0 0xffffffff>;

	compatible = "simple-bus";



	intc: interrupt-controller@17bc0000 {

	intc: interrupt-controller@17a00000 {

		compatible = "arm,gic-v3";

		#interrupt-cells = <3>;

		interrupt-controller;

		#redistributor-regions = <1>;

		redistributor-stride = <0x0 0x40000>;

		reg = <0x17bc0000 0x10000>,       /* GICD */

		      <0x17c00000 0x200000>;      /* GICR * 8 */

		redistributor-stride = <0x0 0x20000>;

		reg = <0x17a00000 0x10000>,       /* GICD */

		      <0x17b00000 0x100000>;      /* GICR * 8 */

		interrupts = <1 9 4>;

	};
@@ -307,7 +307,7 @@ 
		compatible = "qcom,smem";

		reg = <0x86000000 0x200000>,

			<0x17820010 0x4>,

			<0x778000 0x8000>,

			<0x778000 0x7000>,

			<0x1fd4000 0x8>;

		reg-names = "smem", "irq-reg-base", "aux-mem1",

			"smem_targ_info_reg";
@@ -435,7 +435,7 @@ 


	qcom,glink-smem-native-xprt-rpm@778000 {

		compatible = "qcom,glink-rpm-native-xprt";

		reg = <0x778000 0x8000>,

		reg = <0x778000 0x7000>,

			<0x17820010 0x4>;

		reg-names = "msgram", "irq-reg-base";

		qcom,irq-mask = <0x1>;

arch/arm64/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -438,6 +438,16 @@ config ARM64_4K_PAGES 
	help

	  This feature enables 4KB pages support.



config ARM64_64K_PAGES

	bool "64KB"

	help

	  This feature enables 64KB pages support (4KB by default)

	  allowing only two levels of page tables and faster TLB

	  look-up. AArch32 emulation is not available when this feature

	  is enabled.



endchoice



config ARM64_DCACHE_DISABLE

	bool "Disable CPU Data Caches"

	help
@@ -457,16 +467,6 @@ config ARM64_ICACHE_DISABLE 


	  If you are not sure what to do, select 'N' here.



config ARM64_64K_PAGES

	bool "64KB"

	help

	  This feature enables 64KB pages support (4KB by default)

	  allowing only two levels of page tables and faster TLB

	  look-up. AArch32 emulation is not available when this feature

	  is enabled.



endchoice



choice

	prompt "Virtual address space size"

	default ARM64_VA_BITS_39 if ARM64_4K_PAGES