From df65f1ff7586a8f20332140dd7447f9c8f04225d Mon Sep 17 00:00:00 2001 From: shanghai engineers Date: Sun, 24 Mar 2019 22:11:00 -0400 Subject: [PATCH] TM2: add chip id and name for tm2 [1/1] PD#SWPL-6157 Problem: TM2 bring up need to update chip version name and id Solution: add the chipid and chip version name at dts and help file Verify: on ptm board4 Change-Id: I37e44828db1821c7fd2921c3e4271a27bd715b88 Signed-off-by: pan yang --- arch/arm/boot/dts/amlogic/mesontm2.dtsi | 3 +++ arch/arm64/boot/dts/amlogic/mesontm2.dtsi | 3 +++ .../amlogic/media/common/arch/registers/register_ops_m8.c | 2 ++ include/linux/amlogic/cpu_version.h | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi index 7204b77c2d95..0ff7ebf142ca 100644 --- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi @@ -1424,6 +1424,9 @@ mem_size = <0 0x100000>; status = "okay"; }; + cpu_ver_name { + compatible = "amlogic, cpu-major-id-tm2"; + }; }; /* end of / */ &pinctrl_aobus { diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi index b9736ffded44..356d18193404 100644 --- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi @@ -1404,6 +1404,9 @@ mem_size = <0 0x100000>; status = "okay"; }; + cpu_ver_name { + compatible = "amlogic, cpu-major-id-tm2"; + }; }; /* end of / */ &pinctrl_aobus { diff --git a/drivers/amlogic/media/common/arch/registers/register_ops_m8.c b/drivers/amlogic/media/common/arch/registers/register_ops_m8.c index d8372c8a4eb6..4f7e1a2ba3ca 100644 --- a/drivers/amlogic/media/common/arch/registers/register_ops_m8.c +++ b/drivers/amlogic/media/common/arch/registers/register_ops_m8.c @@ -33,6 +33,7 @@ MESON_CPU_MAJOR_ID_G12B, \ MESON_CPU_MAJOR_ID_TL1, \ MESON_CPU_MAJOR_ID_SM1, \ + MESON_CPU_MAJOR_ID_TM2, \ 0} #define REGISTER_FOR_GXCPU {\ MESON_CPU_MAJOR_ID_GXBB, \ @@ -46,6 +47,7 @@ MESON_CPU_MAJOR_ID_G12B, \ MESON_CPU_MAJOR_ID_TL1, \ MESON_CPU_MAJOR_ID_SM1, \ + MESON_CPU_MAJOR_ID_TM2, \ 0} int codec_apb_read(unsigned int reg) { diff --git a/include/linux/amlogic/cpu_version.h b/include/linux/amlogic/cpu_version.h index b1274f9e3a81..19e505539943 100644 --- a/include/linux/amlogic/cpu_version.h +++ b/include/linux/amlogic/cpu_version.h @@ -37,6 +37,7 @@ #define MESON_CPU_MAJOR_ID_SM1 0x2B #define MESON_CPU_MAJOR_ID_TL1 0x2E +#define MESON_CPU_MAJOR_ID_TM2 0x2F #define MESON_CPU_VERSION_LVL_MAJOR 0 #define MESON_CPU_VERSION_LVL_MINOR 1 @@ -195,6 +196,10 @@ static inline bool is_meson_sm1_cpu(void) { return get_cpu_type() == MESON_CPU_MAJOR_ID_SM1; } +static inline bool is_meson_tm2_cpu(void) +{ + return get_cpu_type() == MESON_CPU_MAJOR_ID_TM2; +} static inline bool cpu_after_eq(unsigned int id) {