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

Commit 53a5fde0 authored by Bhupesh Sharma's avatar Bhupesh Sharma Committed by Arnd Bergmann
Browse files

arm64: Use generic Layerscape SoC family naming 



Freescale will be a spinning-out a set of ARMv8 based SoCs which
will be based on a similar overall SoC architecture. So, this patch
converts the existing infrastructure in the arm64/dts, arm64/Kconfig
and arm64/configs to use the generic convention ARCH_LAYERSCAPE
in place of the more specific FSL_LS2085A, to save code duplication
later-on.

Signed-off-by: default avatarBhupesh Sharma <bhupesh.sharma@freescale.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 920c74f0

Documentation/devicetree/bindings/arm/fsl.txt

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ Example: 
		reg = <0x0 0x1ee0000 0x0 0x10000>;

	};



Freescale LS2085A SoC Device Tree Bindings

------------------------------------------

Freescale ARMv8 based Layerscape SoC family Device Tree Bindings

----------------------------------------------------------------



LS2085A ARMv8 based Simulator model

Required root node properties:

arch/arm64/Kconfig.platforms

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ config ARCH_EXYNOS7 
	help

	  This enables support for Samsung Exynos7 SoC family



config ARCH_FSL_LS2085A

	bool "Freescale LS2085A SOC"

config ARCH_LAYERSCAPE

	bool "ARMv8 based Freescale Layerscape SoC family"

	help

	  This enables support for Freescale LS2085A SOC.

	  This enables support for the Freescale Layerscape SoC family.



config ARCH_HISI

	bool "Hisilicon SoC Family"

arch/arm64/boot/dts/freescale/Makefile

+1 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_FSL_LS2085A) += fsl-ls2085a-simu.dtb

dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2085a-simu.dtb

 

always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_ARCH_BCM_IPROC=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_EXYNOS7=y

CONFIG_ARCH_FSL_LS2085A=y

CONFIG_ARCH_LAYERSCAPE=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_MEDIATEK=y

CONFIG_ARCH_ROCKCHIP=y