Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0541c17a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: add machine driver for sa8155 based automotive platform"

parents 6fb0c679 39955471

asoc/Kbuild

+2 −0
Original line number Original line Diff line number Diff line
@@ -101,7 +101,9 @@ endif 




# for SM8150 sound card driver

# for SM8150 sound card driver

ifdef CONFIG_SND_SOC_SM8150

ifdef CONFIG_SND_SOC_SM8150

	MACHINE_OBJS += sa8155.o

	MACHINE_OBJS += sm8150.o

	MACHINE_OBJS += sm8150.o

	MACHINE_OBJS += machine_815x_init.o

endif

endif





# for SM6150 sound card driver

# for SM6150 sound card driver

asoc/machine_815x_init.c

0 → 100644
+36 −0
Original line number Original line Diff line number Diff line 
/*

Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.



This program is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License version 2 and

only version 2 as published by the Free Software Foundation.



This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU General Public License for more details.

*

*/



#include <linux/kernel.h>

#include <linux/module.h>

#include "machine_815x_init.h"



static int __init audio_machine_815x_init(void)

{

	sm8150_init();

	sa8155_init();

	return 0;

}



static void audio_machine_815x_exit(void)

{

	sm8150_exit();

	sa8155_exit();

}



module_init(audio_machine_815x_init);

module_exit(audio_machine_815x_exit);



MODULE_DESCRIPTION("Audio Machine 815X Driver");

MODULE_LICENSE("GPL v2");

asoc/machine_815x_init.h

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
/*

Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.



This program is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License version 2 and

only version 2 as published by the Free Software Foundation.



This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU General Public License for more details.

*

*/



#ifndef __MACHINE_815X_INIT_H__

#define __MACHINE_815X_INIT_H__

int sm8150_init(void);

int sa8155_init(void);



void sm8150_exit(void);

void sa8155_exit(void);

#endif

asoc/sa8155.c

0 → 100644
+7133 −0

File added.

Preview size limit exceeded, changes collapsed.

asoc/sm8150.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -7571,7 +7571,18 @@ static struct platform_driver sm8150_asoc_machine_driver = { 
	.probe = msm_asoc_machine_probe,

	.probe = msm_asoc_machine_probe,

	.remove = msm_asoc_machine_remove,

	.remove = msm_asoc_machine_remove,

};

};

module_platform_driver(sm8150_asoc_machine_driver);



int __init sm8150_init(void)

{

	pr_debug("%s\n", __func__);

	return platform_driver_register(&sm8150_asoc_machine_driver);

}



void sm8150_exit(void)

{

	pr_debug("%s\n", __func__);

	platform_driver_unregister(&sm8150_asoc_machine_driver);

}





MODULE_DESCRIPTION("ALSA SoC msm");

MODULE_DESCRIPTION("ALSA SoC msm");

MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");