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 5/5] ARM: Kirkwood: t5325: Use simple-card to instantiate audio Date: Thu, 17 Apr 2014 17:53:14 +0200 [thread overview] Message-ID: <1397749994-24983-6-git-send-email-andrew@lunn.ch> (raw) In-Reply-To: <1397749994-24983-1-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> Add device tree nodes to instantiate the audio drivers on the HP T5325 device. Remove platform driver instantiating of the audio, which results in board-t5325.c being removed. Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> --- arch/arm/boot/dts/kirkwood-t5325.dts | 25 +++++++++++++++++++++++++ arch/arm/mach-mvebu/board-t5325.c | 26 -------------------------- arch/arm/mach-mvebu/board.h | 6 ------ arch/arm/mach-mvebu/kirkwood.c | 3 --- 4 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 arch/arm/mach-mvebu/board-t5325.c diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts index dbb730642543..2cf3fe38404d 100644 --- a/arch/arm/boot/dts/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/kirkwood-t5325.dts @@ -192,6 +192,31 @@ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; }; + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Speaker", "SPKOUT", + "Speaker", "SPKOUTN", + "MIC1", "Mic Jack", + "MIC2", "Mic Jack"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Speaker", "Speaker", + "Microphone", "Mic Jack"; + + simple-audio-card,mclk-factor = <256>; + + simple-audio-card,cpu { + sound-dai = <&audio>; + }; + + simple-audio-card,codec { + sound-dai = <&alc5621>; + }; + }; }; &mdio { diff --git a/arch/arm/mach-mvebu/board-t5325.c b/arch/arm/mach-mvebu/board-t5325.c deleted file mode 100644 index f2401b298218..000000000000 --- a/arch/arm/mach-mvebu/board-t5325.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * HP T5325 Board Setup - * - * Copyright (C) 2014 - * - * Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include "board.h" - -static struct platform_device hp_t5325_audio_device = { - .name = "t5325-audio", - .id = -1, -}; - -void __init t5325_init(void) -{ - platform_device_register(&hp_t5325_audio_device); -} diff --git a/arch/arm/mach-mvebu/board.h b/arch/arm/mach-mvebu/board.h index de7f0a191394..9c7bb4386f8b 100644 --- a/arch/arm/mach-mvebu/board.h +++ b/arch/arm/mach-mvebu/board.h @@ -13,10 +13,4 @@ #ifndef __ARCH_MVEBU_BOARD_H #define __ARCH_MVEBU_BOARD_H -#ifdef CONFIG_MACH_T5325 -void t5325_init(void); -#else -static inline void t5325_init(void) {}; -#endif - #endif diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 120207fc36f1..c30bc316f40d 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -180,9 +180,6 @@ static void __init kirkwood_dt_init(void) kirkwood_pm_init(); kirkwood_dt_eth_fixup(); - if (of_machine_is_compatible("hp,t5325")) - t5325_init(); - of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); } -- 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
WARNING: multiple messages have this Message-ID (diff)
From: andrew@lunn.ch (Andrew Lunn) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/5] ARM: Kirkwood: t5325: Use simple-card to instantiate audio Date: Thu, 17 Apr 2014 17:53:14 +0200 [thread overview] Message-ID: <1397749994-24983-6-git-send-email-andrew@lunn.ch> (raw) In-Reply-To: <1397749994-24983-1-git-send-email-andrew@lunn.ch> Add device tree nodes to instantiate the audio drivers on the HP T5325 device. Remove platform driver instantiating of the audio, which results in board-t5325.c being removed. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/kirkwood-t5325.dts | 25 +++++++++++++++++++++++++ arch/arm/mach-mvebu/board-t5325.c | 26 -------------------------- arch/arm/mach-mvebu/board.h | 6 ------ arch/arm/mach-mvebu/kirkwood.c | 3 --- 4 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 arch/arm/mach-mvebu/board-t5325.c diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts index dbb730642543..2cf3fe38404d 100644 --- a/arch/arm/boot/dts/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/kirkwood-t5325.dts @@ -192,6 +192,31 @@ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; }; + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Speaker", "SPKOUT", + "Speaker", "SPKOUTN", + "MIC1", "Mic Jack", + "MIC2", "Mic Jack"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Speaker", "Speaker", + "Microphone", "Mic Jack"; + + simple-audio-card,mclk-factor = <256>; + + simple-audio-card,cpu { + sound-dai = <&audio>; + }; + + simple-audio-card,codec { + sound-dai = <&alc5621>; + }; + }; }; &mdio { diff --git a/arch/arm/mach-mvebu/board-t5325.c b/arch/arm/mach-mvebu/board-t5325.c deleted file mode 100644 index f2401b298218..000000000000 --- a/arch/arm/mach-mvebu/board-t5325.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * HP T5325 Board Setup - * - * Copyright (C) 2014 - * - * Andrew Lunn <andrew@lunn.ch> - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/platform_device.h> -#include "board.h" - -static struct platform_device hp_t5325_audio_device = { - .name = "t5325-audio", - .id = -1, -}; - -void __init t5325_init(void) -{ - platform_device_register(&hp_t5325_audio_device); -} diff --git a/arch/arm/mach-mvebu/board.h b/arch/arm/mach-mvebu/board.h index de7f0a191394..9c7bb4386f8b 100644 --- a/arch/arm/mach-mvebu/board.h +++ b/arch/arm/mach-mvebu/board.h @@ -13,10 +13,4 @@ #ifndef __ARCH_MVEBU_BOARD_H #define __ARCH_MVEBU_BOARD_H -#ifdef CONFIG_MACH_T5325 -void t5325_init(void); -#else -static inline void t5325_init(void) {}; -#endif - #endif diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index 120207fc36f1..c30bc316f40d 100644 --- a/arch/arm/mach-mvebu/kirkwood.c +++ b/arch/arm/mach-mvebu/kirkwood.c @@ -180,9 +180,6 @@ static void __init kirkwood_dt_init(void) kirkwood_pm_init(); kirkwood_dt_eth_fixup(); - if (of_machine_is_compatible("hp,t5325")) - t5325_init(); - of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); } -- 1.9.2
next prev parent reply other threads:[~2014-04-17 15:53 UTC|newest] Thread overview: 25+ 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 2014-04-17 15:53 ` 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-17 15:53 ` Andrew Lunn 2014-04-18 16:33 ` Mark Brown 2014-04-18 16:33 ` Mark Brown [not found] ` <20140418163351.GI12304-GFdadSzt00ze9xe1eoZjHA@public.gmane.org> 2014-04-18 18:17 ` Andrew Lunn 2014-04-18 18:17 ` Andrew Lunn [not found] ` <20140418181735.GB32580-g2DYL2Zd6BY@public.gmane.org> 2014-04-18 18:44 ` Mark Brown 2014-04-18 18:44 ` Mark Brown 2014-04-28 7:01 ` Anil Kumar 2014-04-17 15:53 ` [PATCH 2/5] ARM: Kirkwood: Use DT to instansiate codec Andrew Lunn 2014-04-17 15:53 ` Andrew Lunn [not found] ` <1397749994-24983-3-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> 2014-04-17 21:37 ` Jason Cooper 2014-04-17 21:37 ` 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 ` Andrew Lunn 2014-04-17 15:53 ` [PATCH 4/5] ASoC: simple-card: Support setting mclk via a fixed factor Andrew Lunn 2014-04-17 15:53 ` Andrew Lunn [not found] ` <1397749994-24983-5-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org> 2014-04-18 16:38 ` Mark Brown 2014-04-18 16:38 ` Mark Brown 2014-04-17 15:53 ` Andrew Lunn [this message] 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 2014-04-18 0:15 ` 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-6-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.