Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: Move Allwinner A31 D-PHY driver to drivers/phy/

Now that our MIPI D-PHY driver has been converted to the phy framework,
let's move it into the drivers/phy directory.

Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2447609da5b80f148c79b2b2a263a0e779f3e82f.1548085432.git-series.maxime.ripard@bootlin.com

+14 -10
+1 -9
drivers/gpu/drm/sun4i/Kconfig
··· 45 45 default MACH_SUN8I 46 46 select CRC_CCITT 47 47 select DRM_MIPI_DSI 48 - select DRM_SUN6I_DPHY 48 + select PHY_SUN6I_MIPI_DPHY 49 49 help 50 50 Choose this option if you want have an Allwinner SoC with 51 51 MIPI-DSI support. If M is selected the module will be called 52 52 sun6i_mipi_dsi. 53 - 54 - config DRM_SUN6I_DPHY 55 - tristate "Allwinner A31 MIPI D-PHY Support" 56 - select GENERIC_PHY_MIPI_DPHY 57 - help 58 - Choose this option if you have an Allwinner SoC with 59 - MIPI-DSI support. If M is selected, the module will be 60 - called sun6i_mipi_dphy. 61 53 62 54 config DRM_SUN8I_DW_HDMI 63 55 tristate "Support for Allwinner version of DesignWare HDMI"
-1
drivers/gpu/drm/sun4i/Makefile
··· 34 34 obj-$(CONFIG_DRM_SUN4I) += sun4i-frontend.o 35 35 endif 36 36 obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o 37 - obj-$(CONFIG_DRM_SUN6I_DPHY) += sun6i_mipi_dphy.o 38 37 obj-$(CONFIG_DRM_SUN6I_DSI) += sun6i_mipi_dsi.o 39 38 obj-$(CONFIG_DRM_SUN8I_DW_HDMI) += sun8i-drm-hdmi.o 40 39 obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o
drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c drivers/phy/allwinner/phy-sun6i-mipi-dphy.c
+12
drivers/phy/allwinner/Kconfig
··· 17 17 This driver controls the entire USB PHY block, both the USB OTG 18 18 parts, as well as the 2 regular USB 2 host PHYs. 19 19 20 + config PHY_SUN6I_MIPI_DPHY 21 + tristate "Allwinner A31 MIPI D-PHY Support" 22 + depends on ARCH_SUNXI && HAS_IOMEM && OF 23 + depends on RESET_CONTROLLER 24 + select GENERIC_PHY 25 + select GENERIC_PHY_MIPI_DPHY 26 + select REGMAP_MMIO 27 + help 28 + Choose this option if you have an Allwinner SoC with 29 + MIPI-DSI support. If M is selected, the module will be 30 + called sun6i_mipi_dphy. 31 + 20 32 config PHY_SUN9I_USB 21 33 tristate "Allwinner sun9i SoC USB PHY driver" 22 34 depends on ARCH_SUNXI && HAS_IOMEM && OF
+1
drivers/phy/allwinner/Makefile
··· 1 1 obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o 2 + obj-$(CONFIG_PHY_SUN6I_MIPI_DPHY) += phy-sun6i-mipi-dphy.o 2 3 obj-$(CONFIG_PHY_SUN9I_USB) += phy-sun9i-usb.o