From 04b56da903c7aecad90de07bb947917a288ba64e Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Fri, 5 Oct 2018 16:29:47 +0900 Subject: [PATCH] [9610] arm64: dts: move SoC feature to SoC dts This patch moves SoC feature to SoC dts file to resolve VtsFirmwareDtboVerification test Change-Id: I20f541e0b7743184c53c832e02a8dc3d365ba863 Signed-off-by: Youngmin Nam --- arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts | 11 ----------- arch/arm64/boot/dts/exynos/exynos9610.dts | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts b/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts index f4b0ca0b4001..a3859806efd1 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts +++ b/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts @@ -30,17 +30,6 @@ #size-cells = <1>; model = "Samsung ERD9610 board based on EXYNOS9610"; - ect { - parameter_address = <0x90000000>; - parameter_size = <0x19000>; - }; - - chosen { - bootargs = "console=ram androidboot.dtbo_idx=0 skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff80f8e00000 androidboot.hardware=exynos9610 androidboot.selinux=permissive androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff80f9fe0000 pmic_info=0x3 ccic_info=0x1 epx_activate=true"; - linux,initrd-start = <0x84000000>; - linux,initrd-end = <0x841FFFFF>; - }; - fixed-rate-clocks { oscclk { compatible = "samsung,exynos9610-oscclk"; diff --git a/arch/arm64/boot/dts/exynos/exynos9610.dts b/arch/arm64/boot/dts/exynos/exynos9610.dts index 0dc5d73457ed..4b149bd1053c 100644 --- a/arch/arm64/boot/dts/exynos/exynos9610.dts +++ b/arch/arm64/boot/dts/exynos/exynos9610.dts @@ -113,6 +113,17 @@ mshc2 = &dwmmc_2; }; + ect { + parameter_address = <0x90000000>; + parameter_size = <0x19000>; + }; + + chosen { + bootargs = "console=ram androidboot.dtbo_idx=0 skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff80f8e00000 androidboot.hardware=exynos9610 androidboot.selinux=permissive androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff80f9fe0000 pmic_info=0x3 ccic_info=0x1 epx_activate=true"; + linux,initrd-start = <0x84000000>; + linux,initrd-end = <0x841FFFFF>; + }; + chipid@10000000 { compatible = "samsung,exynos9-chipid"; reg = <0x0 0x10000000 0x100>, <0x0 0x2038848 0x10>; -- 2.20.1