| Message ID | 20220212182117.49438-4-manivannan.sadhasivam@linaro.org |
|---|---|
| State | Accepted |
| Commit | a0f5a630668cb8b2ebf5204f08e957875e991780 |
| Headers | show |
| Series | Add initial support for MHI endpoint stack | expand |
On 2/12/22 12:20 PM, Manivannan Sadhasivam wrote: > In preparation of the endpoint MHI support, let's move the host MHI code > to its own "host" directory and adjust the toplevel MHI Kconfig & Makefile. > > While at it, let's also move the "pci_generic" driver to "host" directory > as it is a host MHI controller driver. > > Reviewed-by: Hemant Kumar <hemantk@codeaurora.org> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> This is a pretty simple rename, and it looks good to me. Reviewed-by: Alex Elder <elder@linaro.org> > --- > drivers/bus/Makefile | 2 +- > drivers/bus/mhi/Kconfig | 27 ++------------------ > drivers/bus/mhi/Makefile | 8 ++---- > drivers/bus/mhi/host/Kconfig | 31 +++++++++++++++++++++++ > drivers/bus/mhi/{core => host}/Makefile | 4 ++- > drivers/bus/mhi/{core => host}/boot.c | 0 > drivers/bus/mhi/{core => host}/debugfs.c | 0 > drivers/bus/mhi/{core => host}/init.c | 0 > drivers/bus/mhi/{core => host}/internal.h | 0 > drivers/bus/mhi/{core => host}/main.c | 0 > drivers/bus/mhi/{ => host}/pci_generic.c | 0 > drivers/bus/mhi/{core => host}/pm.c | 0 > 12 files changed, 39 insertions(+), 33 deletions(-) > create mode 100644 drivers/bus/mhi/host/Kconfig > rename drivers/bus/mhi/{core => host}/Makefile (54%) > rename drivers/bus/mhi/{core => host}/boot.c (100%) > rename drivers/bus/mhi/{core => host}/debugfs.c (100%) > rename drivers/bus/mhi/{core => host}/init.c (100%) > rename drivers/bus/mhi/{core => host}/internal.h (100%) > rename drivers/bus/mhi/{core => host}/main.c (100%) > rename drivers/bus/mhi/{ => host}/pci_generic.c (100%) > rename drivers/bus/mhi/{core => host}/pm.c (100%) > > diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile > index 52c2f35a26a9..16da51130d1a 100644 > --- a/drivers/bus/Makefile > +++ b/drivers/bus/Makefile > @@ -39,4 +39,4 @@ obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o > obj-$(CONFIG_DA8XX_MSTPRI) += da8xx-mstpri.o > > # MHI > -obj-$(CONFIG_MHI_BUS) += mhi/ > +obj-y += mhi/ > diff --git a/drivers/bus/mhi/Kconfig b/drivers/bus/mhi/Kconfig > index da5cd0c9fc62..4748df7f9cd5 100644 > --- a/drivers/bus/mhi/Kconfig > +++ b/drivers/bus/mhi/Kconfig > @@ -2,30 +2,7 @@ > # > # MHI bus > # > -# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. > +# Copyright (c) 2021, Linaro Ltd. > # > > -config MHI_BUS > - tristate "Modem Host Interface (MHI) bus" > - help > - Bus driver for MHI protocol. Modem Host Interface (MHI) is a > - communication protocol used by the host processors to control > - and communicate with modem devices over a high speed peripheral > - bus or shared memory. > - > -config MHI_BUS_DEBUG > - bool "Debugfs support for the MHI bus" > - depends on MHI_BUS && DEBUG_FS > - help > - Enable debugfs support for use with the MHI transport. Allows > - reading and/or modifying some values within the MHI controller > - for debug and test purposes. > - > -config MHI_BUS_PCI_GENERIC > - tristate "MHI PCI controller driver" > - depends on MHI_BUS > - depends on PCI > - help > - This driver provides MHI PCI controller driver for devices such as > - Qualcomm SDX55 based PCIe modems. > - > +source "drivers/bus/mhi/host/Kconfig" > diff --git a/drivers/bus/mhi/Makefile b/drivers/bus/mhi/Makefile > index 0a2d778d6fb4..5f5708a249f5 100644 > --- a/drivers/bus/mhi/Makefile > +++ b/drivers/bus/mhi/Makefile > @@ -1,6 +1,2 @@ > -# core layer > -obj-y += core/ > - > -obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o > -mhi_pci_generic-y += pci_generic.o > - > +# Host MHI stack > +obj-y += host/ > diff --git a/drivers/bus/mhi/host/Kconfig b/drivers/bus/mhi/host/Kconfig > new file mode 100644 > index 000000000000..da5cd0c9fc62 > --- /dev/null > +++ b/drivers/bus/mhi/host/Kconfig > @@ -0,0 +1,31 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# MHI bus > +# > +# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. > +# > + > +config MHI_BUS > + tristate "Modem Host Interface (MHI) bus" > + help > + Bus driver for MHI protocol. Modem Host Interface (MHI) is a > + communication protocol used by the host processors to control > + and communicate with modem devices over a high speed peripheral > + bus or shared memory. > + > +config MHI_BUS_DEBUG > + bool "Debugfs support for the MHI bus" > + depends on MHI_BUS && DEBUG_FS > + help > + Enable debugfs support for use with the MHI transport. Allows > + reading and/or modifying some values within the MHI controller > + for debug and test purposes. > + > +config MHI_BUS_PCI_GENERIC > + tristate "MHI PCI controller driver" > + depends on MHI_BUS > + depends on PCI > + help > + This driver provides MHI PCI controller driver for devices such as > + Qualcomm SDX55 based PCIe modems. > + > diff --git a/drivers/bus/mhi/core/Makefile b/drivers/bus/mhi/host/Makefile > similarity index 54% > rename from drivers/bus/mhi/core/Makefile > rename to drivers/bus/mhi/host/Makefile > index c3feb4130aa3..859c2f38451c 100644 > --- a/drivers/bus/mhi/core/Makefile > +++ b/drivers/bus/mhi/host/Makefile > @@ -1,4 +1,6 @@ > obj-$(CONFIG_MHI_BUS) += mhi.o > - > mhi-y := init.o main.o pm.o boot.o > mhi-$(CONFIG_MHI_BUS_DEBUG) += debugfs.o > + > +obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o > +mhi_pci_generic-y += pci_generic.o > diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/host/boot.c > similarity index 100% > rename from drivers/bus/mhi/core/boot.c > rename to drivers/bus/mhi/host/boot.c > diff --git a/drivers/bus/mhi/core/debugfs.c b/drivers/bus/mhi/host/debugfs.c > similarity index 100% > rename from drivers/bus/mhi/core/debugfs.c > rename to drivers/bus/mhi/host/debugfs.c > diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/host/init.c > similarity index 100% > rename from drivers/bus/mhi/core/init.c > rename to drivers/bus/mhi/host/init.c > diff --git a/drivers/bus/mhi/core/internal.h b/drivers/bus/mhi/host/internal.h > similarity index 100% > rename from drivers/bus/mhi/core/internal.h > rename to drivers/bus/mhi/host/internal.h > diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/host/main.c > similarity index 100% > rename from drivers/bus/mhi/core/main.c > rename to drivers/bus/mhi/host/main.c > diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > similarity index 100% > rename from drivers/bus/mhi/pci_generic.c > rename to drivers/bus/mhi/host/pci_generic.c > diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/host/pm.c > similarity index 100% > rename from drivers/bus/mhi/core/pm.c > rename to drivers/bus/mhi/host/pm.c
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 52c2f35a26a9..16da51130d1a 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -39,4 +39,4 @@ obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o obj-$(CONFIG_DA8XX_MSTPRI) += da8xx-mstpri.o # MHI -obj-$(CONFIG_MHI_BUS) += mhi/ +obj-y += mhi/ diff --git a/drivers/bus/mhi/Kconfig b/drivers/bus/mhi/Kconfig index da5cd0c9fc62..4748df7f9cd5 100644 --- a/drivers/bus/mhi/Kconfig +++ b/drivers/bus/mhi/Kconfig @@ -2,30 +2,7 @@ # # MHI bus # -# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +# Copyright (c) 2021, Linaro Ltd. # -config MHI_BUS - tristate "Modem Host Interface (MHI) bus" - help - Bus driver for MHI protocol. Modem Host Interface (MHI) is a - communication protocol used by the host processors to control - and communicate with modem devices over a high speed peripheral - bus or shared memory. - -config MHI_BUS_DEBUG - bool "Debugfs support for the MHI bus" - depends on MHI_BUS && DEBUG_FS - help - Enable debugfs support for use with the MHI transport. Allows - reading and/or modifying some values within the MHI controller - for debug and test purposes. - -config MHI_BUS_PCI_GENERIC - tristate "MHI PCI controller driver" - depends on MHI_BUS - depends on PCI - help - This driver provides MHI PCI controller driver for devices such as - Qualcomm SDX55 based PCIe modems. - +source "drivers/bus/mhi/host/Kconfig" diff --git a/drivers/bus/mhi/Makefile b/drivers/bus/mhi/Makefile index 0a2d778d6fb4..5f5708a249f5 100644 --- a/drivers/bus/mhi/Makefile +++ b/drivers/bus/mhi/Makefile @@ -1,6 +1,2 @@ -# core layer -obj-y += core/ - -obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o -mhi_pci_generic-y += pci_generic.o - +# Host MHI stack +obj-y += host/ diff --git a/drivers/bus/mhi/host/Kconfig b/drivers/bus/mhi/host/Kconfig new file mode 100644 index 000000000000..da5cd0c9fc62 --- /dev/null +++ b/drivers/bus/mhi/host/Kconfig @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# MHI bus +# +# Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. +# + +config MHI_BUS + tristate "Modem Host Interface (MHI) bus" + help + Bus driver for MHI protocol. Modem Host Interface (MHI) is a + communication protocol used by the host processors to control + and communicate with modem devices over a high speed peripheral + bus or shared memory. + +config MHI_BUS_DEBUG + bool "Debugfs support for the MHI bus" + depends on MHI_BUS && DEBUG_FS + help + Enable debugfs support for use with the MHI transport. Allows + reading and/or modifying some values within the MHI controller + for debug and test purposes. + +config MHI_BUS_PCI_GENERIC + tristate "MHI PCI controller driver" + depends on MHI_BUS + depends on PCI + help + This driver provides MHI PCI controller driver for devices such as + Qualcomm SDX55 based PCIe modems. + diff --git a/drivers/bus/mhi/core/Makefile b/drivers/bus/mhi/host/Makefile similarity index 54% rename from drivers/bus/mhi/core/Makefile rename to drivers/bus/mhi/host/Makefile index c3feb4130aa3..859c2f38451c 100644 --- a/drivers/bus/mhi/core/Makefile +++ b/drivers/bus/mhi/host/Makefile @@ -1,4 +1,6 @@ obj-$(CONFIG_MHI_BUS) += mhi.o - mhi-y := init.o main.o pm.o boot.o mhi-$(CONFIG_MHI_BUS_DEBUG) += debugfs.o + +obj-$(CONFIG_MHI_BUS_PCI_GENERIC) += mhi_pci_generic.o +mhi_pci_generic-y += pci_generic.o diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/host/boot.c similarity index 100% rename from drivers/bus/mhi/core/boot.c rename to drivers/bus/mhi/host/boot.c diff --git a/drivers/bus/mhi/core/debugfs.c b/drivers/bus/mhi/host/debugfs.c similarity index 100% rename from drivers/bus/mhi/core/debugfs.c rename to drivers/bus/mhi/host/debugfs.c diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/host/init.c similarity index 100% rename from drivers/bus/mhi/core/init.c rename to drivers/bus/mhi/host/init.c diff --git a/drivers/bus/mhi/core/internal.h b/drivers/bus/mhi/host/internal.h similarity index 100% rename from drivers/bus/mhi/core/internal.h rename to drivers/bus/mhi/host/internal.h diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/host/main.c similarity index 100% rename from drivers/bus/mhi/core/main.c rename to drivers/bus/mhi/host/main.c diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c similarity index 100% rename from drivers/bus/mhi/pci_generic.c rename to drivers/bus/mhi/host/pci_generic.c diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/host/pm.c similarity index 100% rename from drivers/bus/mhi/core/pm.c rename to drivers/bus/mhi/host/pm.c