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

Commit e8d9825d authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman
Browse files

arm64: dts: exynos: Revert "Remove unneeded address space mapping for soc node" 



commit bed903167ae5b5532eda5d7db26de451bd232da5 upstream.

Commit ef72171b ("arm64: dts: exynos: Remove unneeded address space
mapping for soc node") changed the address and size cells in root node from
2 to 1, but /memory nodes for the affected boards were not updated. This
went unnoticed on Exynos5433-based TM2(e) boards, because they use u-boot,
which updates /memory node to the correct values. On the other hand, the
mentioned commit broke boot on Exynos7-based Espresso board, which
bootloader doesn't touch /memory node at all.

This patch reverts commit ef72171b ("arm64: dts: exynos: Remove
unneeded address space mapping for soc node"), so Exynos5433 and Exynos7
SoCs again matches other ARM64 platforms with 64bit mappings in root
node.

Reported-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Fixes: ef72171b ("arm64: dts: exynos: Remove unneeded address space mapping for soc node")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Cc: <stable@vger.kernel.org> # 5.3.x: 72ddcf6aa224 arm64: dts: exynos: Move GPU under /soc node for Exynos5433
Cc: <stable@vger.kernel.org> # 5.3.x: ede87c3a2bdb arm64: dts: exynos: Move GPU under /soc node for Exynos7
Cc: <stable@vger.kernel.org> # 4.18.x
Tested-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a0511ab

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


/ {

	compatible = "samsung,exynos5433";

	#address-cells = <1>;

	#size-cells = <1>;

	#address-cells = <2>;

	#size-cells = <2>;



	interrupt-parent = <&gic>;
@@ -235,7 +235,7 @@ 
		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges = <0x0 0x0 0x0 0x18000000>;



		arm_a53_pmu {

			compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";

arch/arm64/boot/dts/exynos/exynos7.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
/ {

	compatible = "samsung,exynos7";

	interrupt-parent = <&gic>;

	#address-cells = <1>;

	#size-cells = <1>;

	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		pinctrl0 = &pinctrl_alive;
@@ -70,7 +70,7 @@ 
		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges = <0 0 0 0x18000000>;



		chipid@10000000 {

			compatible = "samsung,exynos4210-chipid";