diff options
| author | Liang Yang <liang.yang@amlogic.com> | 2019-03-04 16:46:32 +0800 |
|---|---|---|
| committer | Dongjin Kim <tobetter@gmail.com> | 2019-05-16 13:19:21 +0900 |
| commit | 0dfed294fbc7a77cf891a6d934336a30b5577b27 (patch) | |
| tree | 88441d9167cb8f24f28165247a9a61745a09d060 /drivers | |
| parent | 9406d07b95047ac45fb7b20b0cfcb927d3bfacd5 (diff) | |
| download | u-boot-odroid-c1-0dfed294fbc7a77cf891a6d934336a30b5577b27.tar.gz | |
nand: mtd nand add SM1 cpu id checking [1/1]
PD#SWPL-5453
Problem:
When seting clock and pinmux, we need
fistly check the cpu id.
Solution:
Adding the SM1 cpu id checking
Verify:
Sm1 pxp
Change-Id: I5eb8ed101db3e480021d1be91363f326436589f8
Signed-off-by: Liang Yang <liang.yang@amlogic.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/amlogic_mtd/aml_nand.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/nand/amlogic_mtd/m3_nand.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/nand/amlogic_mtd/aml_nand.c b/drivers/mtd/nand/amlogic_mtd/aml_nand.c index 7003186e97..8b40462fdc 100644 --- a/drivers/mtd/nand/amlogic_mtd/aml_nand.c +++ b/drivers/mtd/nand/amlogic_mtd/aml_nand.c @@ -1845,7 +1845,8 @@ static void inline nand_get_chip(void ) (AMLNF_READ_REG(P_PERIPHS_PIN_MUX_1) & 0xfff00000) | 0x22222); } else if((cpu_id.family_id == MESON_CPU_MAJOR_ID_G12A) - || (cpu_id.family_id == MESON_CPU_MAJOR_ID_G12B)) { + || (cpu_id.family_id == MESON_CPU_MAJOR_ID_G12B) + || (cpu_id.family_id == MESON_CPU_MAJOR_ID_SM1)) { AMLNF_SET_REG_MASK(P_PAD_PULL_UP_EN_REG0, 0x1FFF); AMLNF_SET_REG_MASK(P_PAD_PULL_UP_REG0, 0x1F00); AMLNF_WRITE_REG(P_PERIPHS_PIN_MUX_0, 0x11111111); diff --git a/drivers/mtd/nand/amlogic_mtd/m3_nand.c b/drivers/mtd/nand/amlogic_mtd/m3_nand.c index edcfb9df46..05df11f8fa 100644 --- a/drivers/mtd/nand/amlogic_mtd/m3_nand.c +++ b/drivers/mtd/nand/amlogic_mtd/m3_nand.c @@ -183,7 +183,8 @@ void pinmux_select_chip_mtd(unsigned ce_enable, unsigned rb_enable) cpu_id_t cpu_id = get_cpu_id(); if ((cpu_id.family_id == MESON_CPU_MAJOR_ID_G12A) || - (cpu_id.family_id == MESON_CPU_MAJOR_ID_G12B)) { + (cpu_id.family_id == MESON_CPU_MAJOR_ID_G12B) || + (cpu_id.family_id == MESON_CPU_MAJOR_ID_SM1)) { if (!((ce_enable >> 10) & 1)) AMLNF_SET_REG_MASK(P_PERIPHS_PIN_MUX_1, (2 << 12)); } else if (cpu_id.family_id == MESON_CPU_MAJOR_ID_AXG) { |