drm: apple: audio: move the audio driver into the DCP module

Those two drivers are closely linked and should always exists together.

Signed-off-by: Janne Grunau <j@jannau.net>

Author: jannau

drivers/gpu/drm/apple/Makefile

@@ -5,20 +5,16 @@ CFLAGS_trace.o = -I$(src)
 appledrm-y := apple_drv.o
 
 apple_dcp-y := afk.o dcp.o dcp_backlight.o dptxep.o iomfb.o parser.o systemep.o
+apple_dcp-$(CONFIG_DRM_APPLE_AUDIO) += audio.o
 apple_dcp-$(CONFIG_DRM_APPLE_AUDIO) += av.o
 apple_dcp-y += connector.o
 apple_dcp-y += ibootep.o
 apple_dcp-y += iomfb_v12_3.o
 apple_dcp-y += iomfb_v13_3.o
 apple_dcp-$(CONFIG_TRACING) += trace.o
 
-apple_dcp_audio-y := audio.o
-
 obj-$(CONFIG_DRM_APPLE) += appledrm.o
 obj-$(CONFIG_DRM_APPLE) += apple_dcp.o
-ifeq ($(CONFIG_DRM_APPLE_AUDIO),y)
-obj-$(CONFIG_DRM_APPLE) += apple_dcp_audio.o
-endif
 
 # header test
 

drivers/gpu/drm/apple/audio.c

@@ -600,9 +600,13 @@ static struct platform_driver dcpaud_driver = {
 	.remove = dcpaud_remove,
 };
 
-module_platform_driver(dcpaud_driver);
+void __init dcp_audio_register(void)
+{
+        platform_driver_register(&dcpaud_driver);
+}
+
+void __exit dcp_audio_unregister(void)
+{
+        platform_driver_unregister(&dcpaud_driver);
+}
 
-MODULE_AUTHOR("Martin Povišer <povik+lin@cutebit.org>");
-MODULE_DESCRIPTION("Apple DCP HDMI Audio Driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" DRV_NAME);

drivers/gpu/drm/apple/dcp.c

@@ -1138,7 +1138,27 @@ static struct platform_driver apple_platform_driver = {
 	},
 };
 
-drm_module_platform_driver(apple_platform_driver);
+static int __init apple_dcp_register(void)
+{
+	if (drm_firmware_drivers_only())
+		return -ENODEV;
+
+#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
+	dcp_audio_register();
+#endif
+	return platform_driver_register(&apple_platform_driver);
+}
+
+static void __exit apple_dcp_unregister(void)
+{
+	platform_driver_unregister(&apple_platform_driver);
+#if IS_ENABLED(CONFIG_DRM_APPLE_AUDIO)
+	dcp_audio_unregister();
+#endif
+}
+
+module_init(apple_dcp_register);
+module_exit(apple_dcp_unregister);
 
 MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
 MODULE_DESCRIPTION("Apple Display Controller DRM driver");

drivers/gpu/drm/apple/dcp.h

@@ -62,4 +62,8 @@ int dptxep_init(struct apple_dcp *dcp);
 int ibootep_init(struct apple_dcp *dcp);
 int avep_init(struct apple_dcp *dcp);
 
+
+void __init dcp_audio_register(void);
+void __exit dcp_audio_unregister(void);
+
 #endif