| Message ID | 1588151843-2133-1-git-send-email-peng.fan@nxp.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ARM: imx: move cpu code to drivers/soc/imx | expand |
On Wed, Apr 29, 2020 at 05:17:20PM +0800, peng.fan@nxp.com wrote: > From: Peng Fan <peng.fan@nxp.com> > > V2: > Keep i.MX1/2/3/5 cpu type for completness > Correct return value in patch 1/3 > use CONFIG_ARM to guard compile soc-imx.c in patch 3/3 > > V1: > https://patchwork.kernel.org/cover/11433689/ > RFC version : > https://patchwork.kernel.org/cover/11336433/ > > Nothing changed in v1, just rename to formal patches > > Shawn, > The original concern has been eliminated in RFC discussion, > so this patchset is ready to be in next. > Thanks. > > Follow i.MX8, move the soc device register code to drivers/soc/imx > to simplify arch/arm/mach-imx/cpu.c > > I planned to use similar logic as soc-imx8m.c to restructure soc-imx.c > and merged the two files into one. But not sure, so still keep > the logic in cpu.c. > > There is one change is the platform devices are not under > /sys/devices/soc0 after patch 1/4. Actually ARM64 platform > devices are not under /sys/devices/soc0, such as i.MX8/8M. > So it should not hurt to let the platform devices under platform dir. > > Peng Fan (3): > ARM: imx: use device_initcall for imx_soc_device_init > ARM: imx: move cpu definitions into a header > soc: imx: move cpu code to drivers/soc/imx Applied all, thanks.
On Wed, May 20, 2020 at 8:57 AM Shawn Guo <shawnguo@kernel.org> wrote: > > On Wed, Apr 29, 2020 at 05:17:20PM +0800, peng.fan@nxp.com wrote: > > From: Peng Fan <peng.fan@nxp.com> > > > > V2: > > Keep i.MX1/2/3/5 cpu type for completness > > Correct return value in patch 1/3 > > use CONFIG_ARM to guard compile soc-imx.c in patch 3/3 > > > > V1: > > https://patchwork.kernel.org/cover/11433689/ > > RFC version : > > https://patchwork.kernel.org/cover/11336433/ > > > > Nothing changed in v1, just rename to formal patches > > > > Shawn, > > The original concern has been eliminated in RFC discussion, > > so this patchset is ready to be in next. > > Thanks. > > > > Follow i.MX8, move the soc device register code to drivers/soc/imx > > to simplify arch/arm/mach-imx/cpu.c > > > > I planned to use similar logic as soc-imx8m.c to restructure soc-imx.c > > and merged the two files into one. But not sure, so still keep > > the logic in cpu.c. > > > > There is one change is the platform devices are not under > > /sys/devices/soc0 after patch 1/4. Actually ARM64 platform > > devices are not under /sys/devices/soc0, such as i.MX8/8M. > > So it should not hurt to let the platform devices under platform dir. > > > > Peng Fan (3): > > ARM: imx: use device_initcall for imx_soc_device_init > > ARM: imx: move cpu definitions into a header > > soc: imx: move cpu code to drivers/soc/imx > > Applied all, thanks. Unfortunately, I have to drop this, as it turns out the series needs a rebase onto for-next. The series conflicts with 'ARM: vf610: report soc info via soc device' there. Shawn
Hi Shawn, > Subject: Re: [PATCH V2 0/3] ARM: imx: move cpu code to drivers/soc/imx > > On Wed, May 20, 2020 at 8:57 AM Shawn Guo <shawnguo@kernel.org> > wrote: > > > > On Wed, Apr 29, 2020 at 05:17:20PM +0800, peng.fan@nxp.com wrote: > > > From: Peng Fan <peng.fan@nxp.com> > > > > > > V2: > > > Keep i.MX1/2/3/5 cpu type for completness Correct return value in > > > patch 1/3 use CONFIG_ARM to guard compile soc-imx.c in patch 3/3 > > > > > > V1: > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpa > > > > tchwork.kernel.org%2Fcover%2F11433689%2F&data=02%7C01%7Cpen > g.fan > > > %40nxp.com%7C3fe49570a6824631476908d7fc6e5cd3%7C686ea1d3bc2 > b4c6fa92c > > > > d99c5c301635%7C0%7C0%7C637255423274738401&sdata=ELtEt3Nbg > kUg83w4 > > > UbCftkVMu0toYDUXJy4MgLc8qbQ%3D&reserved=0 > > > RFC version : > > > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpa > > > > tchwork.kernel.org%2Fcover%2F11336433%2F&data=02%7C01%7Cpen > g.fan > > > %40nxp.com%7C3fe49570a6824631476908d7fc6e5cd3%7C686ea1d3bc2 > b4c6fa92c > > > > d99c5c301635%7C0%7C0%7C637255423274738401&sdata=RE%2Fprw > CLb7fQpY > > > hmszlnXxTBKJVdEXsjMBrd2ZHmKc8%3D&reserved=0 > > > > > > Nothing changed in v1, just rename to formal patches > > > > > > Shawn, > > > The original concern has been eliminated in RFC discussion, so > > > this patchset is ready to be in next. > > > Thanks. > > > > > > Follow i.MX8, move the soc device register code to drivers/soc/imx > > > to simplify arch/arm/mach-imx/cpu.c > > > > > > I planned to use similar logic as soc-imx8m.c to restructure > > > soc-imx.c and merged the two files into one. But not sure, so still > > > keep the logic in cpu.c. > > > > > > There is one change is the platform devices are not under > > > /sys/devices/soc0 after patch 1/4. Actually ARM64 platform devices > > > are not under /sys/devices/soc0, such as i.MX8/8M. > > > So it should not hurt to let the platform devices under platform dir. > > > > > > Peng Fan (3): > > > ARM: imx: use device_initcall for imx_soc_device_init > > > ARM: imx: move cpu definitions into a header > > > soc: imx: move cpu code to drivers/soc/imx > > > > Applied all, thanks. > > Unfortunately, I have to drop this, as it turns out the series needs a rebase > onto for-next. The series conflicts with 'ARM: vf610: report soc info via soc > device' there. I just posted out v3 which rebased on latest next tree and resolved the conflicts. Thanks, Peng. > > Shawn
From: Peng Fan <peng.fan@nxp.com> V2: Keep i.MX1/2/3/5 cpu type for completness Correct return value in patch 1/3 use CONFIG_ARM to guard compile soc-imx.c in patch 3/3 V1: https://patchwork.kernel.org/cover/11433689/ RFC version : https://patchwork.kernel.org/cover/11336433/ Nothing changed in v1, just rename to formal patches Shawn, The original concern has been eliminated in RFC discussion, so this patchset is ready to be in next. Thanks. Follow i.MX8, move the soc device register code to drivers/soc/imx to simplify arch/arm/mach-imx/cpu.c I planned to use similar logic as soc-imx8m.c to restructure soc-imx.c and merged the two files into one. But not sure, so still keep the logic in cpu.c. There is one change is the platform devices are not under /sys/devices/soc0 after patch 1/4. Actually ARM64 platform devices are not under /sys/devices/soc0, such as i.MX8/8M. So it should not hurt to let the platform devices under platform dir. Peng Fan (3): ARM: imx: use device_initcall for imx_soc_device_init ARM: imx: move cpu definitions into a header soc: imx: move cpu code to drivers/soc/imx arch/arm/mach-imx/common.h | 1 - arch/arm/mach-imx/cpu.c | 159 ----------------------------------- arch/arm/mach-imx/mach-imx6q.c | 8 +- arch/arm/mach-imx/mach-imx6sl.c | 8 +- arch/arm/mach-imx/mach-imx6sx.c | 8 +- arch/arm/mach-imx/mach-imx6ul.c | 8 +- arch/arm/mach-imx/mach-imx7d.c | 6 -- arch/arm/mach-imx/mach-imx7ulp.c | 2 +- arch/arm/mach-imx/mxc.h | 22 +---- drivers/soc/imx/Makefile | 3 + drivers/soc/imx/soc-imx.c | 176 +++++++++++++++++++++++++++++++++++++++ include/soc/imx/cpu.h | 30 +++++++ 12 files changed, 215 insertions(+), 216 deletions(-) create mode 100644 drivers/soc/imx/soc-imx.c create mode 100644 include/soc/imx/cpu.h