| Message ID | 1578608351-23289-1-git-send-email-leoyang.li@nxp.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | a9e3e12f3f58083b4c0fda7bcb95d05841e982bb |
| Headers | show |
| Series | [GIT,PULL] soc/fsl drivers changes for next(v5.6) | expand |
Hi, On Thu, Jan 09, 2020 at 04:19:11PM -0600, Li Yang wrote: > Hi soc maintainers, > > Please merge the following new changes for soc/fsl drivers. > > Regards, > Leo > > > The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: > > Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v5.6 > > for you to fetch changes up to 6e62bd36e9ad85a22d92b1adce6a0336ea549733: > > soc: fsl: qe: remove set but not used variable 'mm_gc' (2020-01-08 16:02:48 -0600) > > ---------------------------------------------------------------- > NXP/FSL SoC driver updates for v5.6 > > QUICC Engine drivers > - Improve the QE drivers to be compatible with ARM/ARM64/PPC64 > architectures > - Various cleanups to the QE drivers This branch contains a cross-section of drivers, including those who are normally sent to other maintainers/subsystems. I don't see dependencies that make them a requirement/easier to merge through the SoC tree at this time -- for example the ucc_uart driver updates are mostly independent cleanups. Am I missing some aspect here, or should those just be merged through drivers/tty as other driver changes there? At the very least, we expect drivers that aren't merged through the normal path to have acks from those maintainers. Mind following up on that? Thanks! -Olof
On Thu, Jan 16, 2020 at 12:41 PM Olof Johansson <olof@lixom.net> wrote: > > Hi, > > On Thu, Jan 09, 2020 at 04:19:11PM -0600, Li Yang wrote: > > Hi soc maintainers, > > > > Please merge the following new changes for soc/fsl drivers. > > > > Regards, > > Leo > > > > > > The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: > > > > Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v5.6 > > > > for you to fetch changes up to 6e62bd36e9ad85a22d92b1adce6a0336ea549733: > > > > soc: fsl: qe: remove set but not used variable 'mm_gc' (2020-01-08 16:02:48 -0600) > > > > ---------------------------------------------------------------- > > NXP/FSL SoC driver updates for v5.6 > > > > QUICC Engine drivers > > - Improve the QE drivers to be compatible with ARM/ARM64/PPC64 > > architectures > > - Various cleanups to the QE drivers > > This branch contains a cross-section of drivers, including those who are > normally sent to other maintainers/subsystems. I don't see dependencies that > make them a requirement/easier to merge through the SoC tree at this time -- > for example the ucc_uart driver updates are mostly independent cleanups. > > Am I missing some aspect here, or should those just be merged through > drivers/tty as other driver changes there? At the very least, we expect drivers > that aren't merged through the normal path to have acks from those maintainers. > > Mind following up on that? Thanks! Hi Olof, Some of the driver cleanups are dependent to core QE changes. Some maybe not but could have contextual dependency with other patches. I will be easier to have them all go in from the same place. We have collected the ack and confirmation from all the related maintainers. For the ucc_uart it is not a formal ack. Quoted the confirmation from Greg below: "On Wed, Nov 13, 2019 at 12:24:09PM +0100, Rasmus Villemoes wrote: > On 13/11/2019 12.19, gregkh@linuxfoundation.org wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > serial: ucc_uart: explicitly include soc/fsl/cpm.h > > So, I was planning on having all 47 patches go through Li Yang's tree, > I think it's easier that way. So if it's not too late, can you drop > those six "serial: ucc_uart:" (numbered 28/47 through 33/47) patches > and instead give your ok (not necessarily a formal ack if you don't > have time to do a review) to Li Yang picking them up? That's fine, all are now dropped from my tree. Li Yang, feel free to take them in your tree if you want to. greg k-h" Regards, Leo
On Thu, Jan 16, 2020 at 01:14:07PM -0600, Li Yang wrote: > On Thu, Jan 16, 2020 at 12:41 PM Olof Johansson <olof@lixom.net> wrote: > > > > Hi, > > > > On Thu, Jan 09, 2020 at 04:19:11PM -0600, Li Yang wrote: > > > Hi soc maintainers, > > > > > > Please merge the following new changes for soc/fsl drivers. > > > > > > Regards, > > > Leo > > > > > > > > > The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: > > > > > > Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v5.6 > > > > > > for you to fetch changes up to 6e62bd36e9ad85a22d92b1adce6a0336ea549733: > > > > > > soc: fsl: qe: remove set but not used variable 'mm_gc' (2020-01-08 16:02:48 -0600) > > > > > > ---------------------------------------------------------------- > > > NXP/FSL SoC driver updates for v5.6 > > > > > > QUICC Engine drivers > > > - Improve the QE drivers to be compatible with ARM/ARM64/PPC64 > > > architectures > > > - Various cleanups to the QE drivers > > > > This branch contains a cross-section of drivers, including those who are > > normally sent to other maintainers/subsystems. I don't see dependencies that > > make them a requirement/easier to merge through the SoC tree at this time -- > > for example the ucc_uart driver updates are mostly independent cleanups. > > > > Am I missing some aspect here, or should those just be merged through > > drivers/tty as other driver changes there? At the very least, we expect drivers > > that aren't merged through the normal path to have acks from those maintainers. > > > > Mind following up on that? Thanks! > > Hi Olof, > > Some of the driver cleanups are dependent to core QE changes. Some > maybe not but could have contextual dependency with other patches. I > will be easier to have them all go in from the same place. We have > collected the ack and confirmation from all the related maintainers. > For the ucc_uart it is not a formal ack. Quoted the confirmation from > Greg below: Ok, getting that in the pull request (tag) would be useful for future cases. Merging. Thanks! -Olof
Hi soc maintainers, Please merge the following new changes for soc/fsl drivers. Regards, Leo The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v5.6 for you to fetch changes up to 6e62bd36e9ad85a22d92b1adce6a0336ea549733: soc: fsl: qe: remove set but not used variable 'mm_gc' (2020-01-08 16:02:48 -0600) ---------------------------------------------------------------- NXP/FSL SoC driver updates for v5.6 QUICC Engine drivers - Improve the QE drivers to be compatible with ARM/ARM64/PPC64 architectures - Various cleanups to the QE drivers ---------------------------------------------------------------- Rasmus Villemoes (48): soc: fsl: qe: remove space-before-tab soc: fsl: qe: drop volatile qualifier of struct qe_ic::regs soc: fsl: qe: rename qe_(clr/set/clrset)bit* helpers soc: fsl: qe: introduce qe_io{read,write}* wrappers soc: fsl: qe: avoid ppc-specific io accessors soc: fsl: qe: replace spin_event_timeout by readx_poll_timeout_atomic soc: fsl: qe: qe.c: guard use of pvr_version_is() with CONFIG_PPC32 soc: fsl: qe: drop unneeded #includes soc: fsl: qe: drop assign-only high_active in qe_ic_init soc: fsl: qe: remove pointless sysfs registration in qe_ic.c soc: fsl: qe: use qe_ic_cascade_{low, high}_mpic also on 83xx soc: fsl: qe: move calls of qe_ic_init out of arch/powerpc/ powerpc/83xx: remove mpc83xx_ipic_and_qe_init_IRQ soc: fsl: qe: move qe_ic_cascade_* functions to qe_ic.c soc: fsl: qe: rename qe_ic_cascade_low_mpic -> qe_ic_cascade_low soc: fsl: qe: remove unused qe_ic_set_* functions soc: fsl: qe: don't use NO_IRQ in qe_ic.c soc: fsl: qe: make qe_ic_get_{low,high}_irq static soc: fsl: qe: simplify qe_ic_init() soc: fsl: qe: merge qe_ic.h headers into qe_ic.c soc: fsl: qe: qe.c: use of_property_read_* helpers soc: fsl: qe: qe_io.c: don't open-code of_parse_phandle() soc: fsl: qe: qe_io.c: access device tree property using be32_to_cpu soc: fsl: qe: qe_io.c: use of_property_read_u32() in par_io_init() soc: fsl: move cpm.h from powerpc/include/asm to include/soc/fsl soc/fsl/qe/qe.h: update include path for cpm.h serial: ucc_uart: explicitly include soc/fsl/cpm.h serial: ucc_uart: replace ppc-specific IO accessors serial: ucc_uart: factor out soft_uart initialization serial: ucc_uart: stub out soft_uart_init for !CONFIG_PPC32 serial: ucc_uart: use of_property_read_u32() in ucc_uart_probe() serial: ucc_uart: limit brg-frequency workaround to PPC32 serial: ucc_uart: access __be32 field using be32_to_cpu soc: fsl: qe: change return type of cpm_muram_alloc() to s32 soc: fsl: qe: make cpm_muram_free() return void soc: fsl: qe: make cpm_muram_free() ignore a negative offset soc: fsl: qe: drop broken lazy call of cpm_muram_init() soc: fsl: qe: refactor cpm_muram_alloc_common to prevent BUG on error path soc: fsl: qe: avoid IS_ERR_VALUE in ucc_slow.c soc: fsl: qe: drop use of IS_ERR_VALUE in qe_sdma_init() soc: fsl: qe: drop pointless check in qe_sdma_init() soc: fsl: qe: avoid IS_ERR_VALUE in ucc_fast.c net/wan/fsl_ucc_hdlc: avoid use of IS_ERR_VALUE() net/wan/fsl_ucc_hdlc: fix reading of __be16 registers net/wan/fsl_ucc_hdlc: reject muram offsets above 64K net: ethernet: freescale: make UCC_GETH explicitly depend on PPC32 soc: fsl: qe: remove unused #include of asm/irq.h from ucc.c soc: fsl: qe: remove PPC32 dependency from CONFIG_QUICC_ENGINE YueHaibing (1): soc: fsl: qe: remove set but not used variable 'mm_gc' arch/powerpc/include/asm/cpm.h | 172 +----------- arch/powerpc/platforms/83xx/km83xx.c | 3 +- arch/powerpc/platforms/83xx/misc.c | 23 -- arch/powerpc/platforms/83xx/mpc832x_mds.c | 3 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 3 +- arch/powerpc/platforms/83xx/mpc836x_mds.c | 3 +- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 +- arch/powerpc/platforms/83xx/mpc83xx.h | 7 - arch/powerpc/platforms/85xx/corenet_generic.c | 10 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 27 -- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 -- arch/powerpc/platforms/85xx/twr_p102x.c | 15 - drivers/net/ethernet/freescale/Kconfig | 2 +- drivers/net/wan/fsl_ucc_hdlc.c | 23 +- drivers/net/wan/fsl_ucc_hdlc.h | 2 +- drivers/soc/fsl/qe/Kconfig | 3 +- drivers/soc/fsl/qe/gpio.c | 36 +-- drivers/soc/fsl/qe/qe.c | 104 +++---- drivers/soc/fsl/qe/qe_common.c | 50 ++-- drivers/soc/fsl/qe/qe_ic.c | 285 +++++++++---------- drivers/soc/fsl/qe/qe_ic.h | 99 ------- drivers/soc/fsl/qe/qe_io.c | 70 +++-- drivers/soc/fsl/qe/qe_tdm.c | 8 +- drivers/soc/fsl/qe/ucc.c | 27 +- drivers/soc/fsl/qe/ucc_fast.c | 86 +++--- drivers/soc/fsl/qe/ucc_slow.c | 60 ++-- drivers/soc/fsl/qe/usb.c | 2 +- drivers/tty/serial/ucc_uart.c | 385 ++++++++++++++------------ include/soc/fsl/cpm.h | 171 ++++++++++++ include/soc/fsl/qe/qe.h | 59 ++-- include/soc/fsl/qe/qe_ic.h | 135 --------- include/soc/fsl/qe/ucc_fast.h | 4 +- include/soc/fsl/qe/ucc_slow.h | 6 +- 33 files changed, 775 insertions(+), 1128 deletions(-) delete mode 100644 drivers/soc/fsl/qe/qe_ic.h create mode 100644 include/soc/fsl/cpm.h delete mode 100644 include/soc/fsl/qe/qe_ic.h