ARM64: rockchip: add mach-rockchip

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 4857a6d2dbcb998a1f6a70244034f84eb0bf6b61..2f95b7434bd3e09bd485772ccf856d8029f5a90c 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -136,6 +136,8 @@ config ARCH_ROCKCHIP
        select PINCTRL_RK3368
        select ARCH_REQUIRE_GPIOLIB
 
+source "arch/arm64/mach-rockchip/Kconfig"
+
 config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index b1ca918f0f4f03249a0fd53ee5d599710d754eda..c5090fed0679b2fdeaf36353794a7e47bee461e3 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -43,6 +43,7 @@ TEXT_OFFSET := 0x00080000
 export TEXT_OFFSET GZFLAGS
 
 core-y         += arch/arm64/kernel/ arch/arm64/mm/
+core-$(CONFIG_ARCH_ROCKCHIP) += arch/arm64/mach-rockchip/
 core-$(CONFIG_KVM) += arch/arm64/kvm/
 core-$(CONFIG_CRYPTO) += arch/arm64/crypto/
 libs-y         := arch/arm64/lib/ $(libs-y)

diff --git a/arch/arm64/mach-rockchip/Kconfig b/arch/arm64/mach-rockchip/Kconfig
new file mode 100644 (file)
index 0000000..db47762
--- /dev/null
+++ b/arch/arm64/mach-rockchip/Kconfig
@@ -0,0 +1 @@
+source "arch/arm/mach-rockchip/Kconfig.common"

diff --git a/arch/arm64/mach-rockchip/Makefile b/arch/arm64/mach-rockchip/Makefile
new file mode 100644 (file)
index 0000000..c2a9526
--- /dev/null
+++ b/arch/arm64/mach-rockchip/Makefile
@@ -0,0 +1,9 @@
+obj-y += ../../arm/mach-rockchip/common.o
+obj-y += ../../arm/mach-rockchip/cpu.o
+obj-y += ../../arm/mach-rockchip/efuse.o
+obj-y += ../../arm/mach-rockchip/pvtm.o
+obj-y += ../../arm/mach-rockchip/rk_system_status.o
+obj-$(CONFIG_PM) += ../../arm/mach-rockchip/rockchip_pm.o
+obj-$(CONFIG_RK_LAST_LOG) += ../../arm/mach-rockchip/last_log.o
+obj-$(CONFIG_DVFS) += ../../arm/mach-rockchip/dvfs.o
+obj-$(CONFIG_BLOCK_RKNAND) += ../../arm/mach-rockchip/rknandbase.o