From: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
To: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux ARM
<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
Subject: [PATCH 2/5] ARM: Kirkwood: Use DT to instansiate codec
Date: Thu, 17 Apr 2014 17:53:11 +0200 [thread overview]
Message-ID: <1397749994-24983-3-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1397749994-24983-1-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org>
Now that the ALC5623 codec has a DT binding, instansiate it using DT
rather than a platform device.
Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
---
arch/arm/boot/dts/kirkwood-t5325.dts | 8 ++++++++
arch/arm/mach-mvebu/board-t5325.c | 15 ---------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts
index 0bd70d928c69..dbb730642543 100644
--- a/arch/arm/boot/dts/kirkwood-t5325.dts
+++ b/arch/arm/boot/dts/kirkwood-t5325.dts
@@ -127,6 +127,14 @@
i2c@11000 {
status = "okay";
+
+ alc5621: alc5621@1a {
+ compatible = "realtek,alc5621";
+ reg = <0x1a>;
+ #sound-dai-cells = <0>;
+ add-ctrl = <0x3700>;
+ jack-det-ctrl = <0x4810>;
+ };
};
serial@12000 {
diff --git a/arch/arm/mach-mvebu/board-t5325.c b/arch/arm/mach-mvebu/board-t5325.c
index 65ace6db9f28..f2401b298218 100644
--- a/arch/arm/mach-mvebu/board-t5325.c
+++ b/arch/arm/mach-mvebu/board-t5325.c
@@ -11,10 +11,8 @@
*/
#include <linux/kernel.h>
-#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <sound/alc5623.h>
#include "board.h"
static struct platform_device hp_t5325_audio_device = {
@@ -22,20 +20,7 @@ static struct platform_device hp_t5325_audio_device = {
.id = -1,
};
-static struct alc5623_platform_data alc5621_data = {
- .add_ctrl = 0x3700,
- .jack_det_ctrl = 0x4810,
-};
-
-static struct i2c_board_info i2c_board_info[] __initdata = {
- {
- I2C_BOARD_INFO("alc5621", 0x1a),
- .platform_data = &alc5621_data,
- },
-};
-
void __init t5325_init(void)
{
- i2c_register_board_info(0, i2c_board_info, ARRAY_SIZE(i2c_board_info));
platform_device_register(&hp_t5325_audio_device);
}
--
1.9.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-04-17 15:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-17 15:53 [PATCH 0/5] Simple-audio-card support for HP t5325 Andrew Lunn
[not found] ` <1397749994-24983-1-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org>
2014-04-17 15:53 ` [PATCH 1/5] ASoC: alc5623: Add device tree binding Andrew Lunn
2014-04-18 16:33 ` Mark Brown
[not found] ` <20140418163351.GI12304-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2014-04-18 18:17 ` Andrew Lunn
[not found] ` <20140418181735.GB32580-g2DYL2Zd6BY@public.gmane.org>
2014-04-18 18:44 ` Mark Brown
2014-04-28 7:01 ` Anil Kumar
2014-04-17 15:53 ` Andrew Lunn [this message]
[not found] ` <1397749994-24983-3-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org>
2014-04-17 21:37 ` [PATCH 2/5] ARM: Kirkwood: Use DT to instansiate codec Jason Cooper
2014-04-17 15:53 ` [PATCH 3/5] ARM: Kirkwood: DT: Add missing #sound-dai-cells property Andrew Lunn
2014-04-17 15:53 ` [PATCH 4/5] ASoC: simple-card: Support setting mclk via a fixed factor Andrew Lunn
[not found] ` <1397749994-24983-5-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org>
2014-04-18 16:38 ` Mark Brown
2014-04-17 15:53 ` [PATCH 5/5] ARM: Kirkwood: t5325: Use simple-card to instantiate audio Andrew Lunn
2014-04-18 0:15 ` [PATCH 0/5] Simple-audio-card support for HP t5325 Jason Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397749994-24983-3-git-send-email-andrew@lunn.ch \
--to=andrew-g2dyl2zd6by@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).