At former design, both ci13xxx_imx and usbmisc_imx are individual module, ci13xxx_imx is glue layer for imx usb driver. usbmisc_imx handles non-core registers which have different register layout for imx SoC serials, it usually supplies interface for wakeup setting, PHY setting, etc. usbmisc_imx uses symbols from ci_hdrc_imx, So, when we combile both of drivers as loadable module, usbmisc is needed to be unload first. However at ci_hdrc_imx, it needs to call usbmisc_imx's interface at its removal function once we enable wakeup/runtime pm function, so keeping two drivers together will not work at loadable module use case. To fix loadable module use case, we need to build usbmisc_imx and ci_hdrc_imx together as one module, the usbmisc_imx still handles misc setting for controllers. The first one of this serial has no relateship with this topic, but it is related to rename file, and the other patches will use the new file name, so I hope they can be queued together. Peter Chen (5): usb: chipidea: imx: rename the DT doc name usb: chipidea: usbmisc_imx: Using regmap to access register usb: chipidea: imx: build ci_hdrc_imx.c and usbmisc_imx.c together arm: dts: imx: add aliases for usb arm: dts: imx: Delete usbmisc_imx .../devicetree/bindings/usb/ci13xxx-imx.txt | 31 --- .../devicetree/bindings/usb/ci_hdrc_imx.txt | 35 +++ Documentation/devicetree/bindings/usb/mxs-phy.txt | 13 -- .../devicetree/bindings/usb/phy-mxs-usb.txt | 13 ++ .../devicetree/bindings/usb/usbmisc-imx.txt | 14 -- arch/arm/boot/dts/imx23.dtsi | 1 + arch/arm/boot/dts/imx25.dtsi | 14 +- arch/arm/boot/dts/imx28.dtsi | 2 + arch/arm/boot/dts/imx51.dtsi | 20 +- arch/arm/boot/dts/imx53.dtsi | 20 +- arch/arm/boot/dts/imx6qdl.dtsi | 20 +- drivers/usb/chipidea/ci_hdrc_imx.c | 113 +++++------ drivers/usb/chipidea/ci_hdrc_imx.h | 28 ++-- drivers/usb/chipidea/usbmisc_imx.c | 217 +++----------------- drivers/usb/chipidea/usbmisc_imx.h | 14 ++ 15 files changed, 201 insertions(+), 354 deletions(-) delete mode 100644 Documentation/devicetree/bindings/usb/ci13xxx-imx.txt create mode 100644 Documentation/devicetree/bindings/usb/ci_hdrc_imx.txt delete mode 100644 Documentation/devicetree/bindings/usb/mxs-phy.txt create mode 100644 Documentation/devicetree/bindings/usb/phy-mxs-usb.txt delete mode 100644 Documentation/devicetree/bindings/usb/usbmisc-imx.txt create mode 100644 drivers/usb/chipidea/usbmisc_imx.h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html