diff options
Diffstat (limited to 'sys/arm/allwinner/a10_codec.c')
| -rw-r--r-- | sys/arm/allwinner/a10_codec.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sys/arm/allwinner/a10_codec.c b/sys/arm/allwinner/a10_codec.c index c0f0862cadf4..12d389d24243 100644 --- a/sys/arm/allwinner/a10_codec.c +++ b/sys/arm/allwinner/a10_codec.c @@ -22,17 +22,12 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* * Allwinner A10/A20 and H3 Audio Codec */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -45,15 +40,14 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <dev/sound/pcm/sound.h> -#include <dev/sound/chip.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> #include <dev/gpio/gpiobusvar.h> -#include <dev/extres/clk/clk.h> -#include <dev/extres/hwreset/hwreset.h> +#include <dev/clk/clk.h> +#include <dev/hwreset/hwreset.h> #include "sunxi_dma_if.h" #include "mixer_if.h" @@ -1171,16 +1165,16 @@ a10codec_attach(device_t dev) pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); - if (pcm_register(dev, sc, 1, 1)) { - device_printf(dev, "pcm_register failed\n"); - goto fail; - } + pcm_init(dev, sc); pcm_addchan(dev, PCMDIR_PLAY, &a10codec_chan_class, sc); pcm_addchan(dev, PCMDIR_REC, &a10codec_chan_class, sc); snprintf(status, SND_STATUSLEN, "at %s", ofw_bus_get_name(dev)); - pcm_setstatus(dev, status); + if (pcm_register(dev, status)) { + device_printf(dev, "pcm_register failed\n"); + goto fail; + } return (0); |