shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

TM2: add chip id and name for tm2 [1/1]

Browse Source 
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 <pan.yang@amlogic.com>
This commit is contained in:
shanghai engineers
2019-03-24 22:11:00 -04:00
committed by Jianxiong Pan
parent b73f974f2c
commit df65f1ff75
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -1424,6 +1424,9 @@
mem_size = <0 0x100000>;
status = "okay";
};
cpu_ver_name {
compatible = "amlogic, cpu-major-id-tm2";
};
}; /* end of / */
&pinctrl_aobus {

3
arch/arm64/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -1404,6 +1404,9 @@
mem_size = <0 0x100000>;
status = "okay";
};
cpu_ver_name {
compatible = "amlogic, cpu-major-id-tm2";
};
}; /* end of / */
&pinctrl_aobus {

2
drivers/amlogic/media/common/arch/registers/register_ops_m8.c
View File

@@ -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)
{

5
include/linux/amlogic/cpu_version.h
View File

@@ -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)
{