> -----Original Message----- > From: Shawn Guo [mailto:shawnguo@xxxxxxxxxx] > Sent: 2016年1月28日 16:11 > To: b51503@xxxxxxxxxxxxx > Cc: kernel@xxxxxxxxxxxxxx; pawel.moll@xxxxxxx; robh+dt@xxxxxxxxxx; > mturquette@xxxxxxxxxxxx; sboyd@xxxxxxxxxxxxxx; linux-arm- > kernel@xxxxxxxxxxxxxxxxxxx; linux-clk@xxxxxxxxxxxxxxx; > devicetree@xxxxxxxxxxxxxxx > Subject: Re: [PATCH v2 5/5] ARM: imx: Add msl code support for imx6qp > > On Tue, Dec 15, 2015 at 02:07:53PM +0800, Bai Ping wrote: > > The i.MX6QP is a different SOC, but internally we treate it as i.MX6Q > > Rev_2.0 to maximum the code reusability. The chip silicon number we > > read from the ANADIG_DIGPROG is 0x630100. This patch add code to > > identify it as i.MX6QP Rev_1.0 when print out the silicon version. > > > > Signed-off-by: Bai Ping <b51503@xxxxxxxxxxxxx> > > --- > > arch/arm/mach-imx/anatop.c | 5 ++++- > > arch/arm/mach-imx/mach-imx6q.c | 8 ++++++-- > > 2 files changed, 10 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c > > index 231bb25..9622763 100644 > > --- a/arch/arm/mach-imx/anatop.c > > +++ b/arch/arm/mach-imx/anatop.c > > @@ -129,7 +129,10 @@ void __init imx_init_revision_from_anatop(void) > > > > switch (digprog & 0xff) { > > case 0: > > - revision = IMX_CHIP_REVISION_1_0; > > + if (digprog >> 8 & 0x01) > > + revision = IMX_CHIP_REVISION_2_0; > > + else > > + revision = IMX_CHIP_REVISION_1_0; > > Please at least add some comment here to help us remember that this is a trick > we play for i.MX6QP. > Will address this in patch V3. Thanks for your review. > Shawn > > > break; > > case 1: > > revision = IMX_CHIP_REVISION_1_1; > > diff --git a/arch/arm/mach-imx/mach-imx6q.c > > b/arch/arm/mach-imx/mach-imx6q.c index 3878494b..cb27d56 100644 > > --- a/arch/arm/mach-imx/mach-imx6q.c > > +++ b/arch/arm/mach-imx/mach-imx6q.c > > @@ -266,8 +266,11 @@ static void __init imx6q_init_machine(void) { > > struct device *parent; > > > > - imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", > > - imx_get_soc_revision()); > > + if (cpu_is_imx6q() && imx_get_soc_revision() == > IMX_CHIP_REVISION_2_0) > > + imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0); > > + else > > + imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q", > > + imx_get_soc_revision()); > > > > parent = imx_soc_device_init(); > > if (parent == NULL) > > @@ -399,6 +402,7 @@ static void __init imx6q_init_irq(void) static > > const char * const imx6q_dt_compat[] __initconst = { > > "fsl,imx6dl", > > "fsl,imx6q", > > + "fsl,imx6qp", > > NULL, > > }; > > > > -- > > 1.9.1 > > > > ?韬{.n?????%??檩??w?{.n????z谵{???塄}?财??j:+v?? ? ???2??璀??摺?囤??z夸z罐?+?????w棹f
