* [PATCH 01/13] ARM: sun4i: Add audio PLL
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:52 ` [PATCH 02/13] ARM: sun5i: " Maxime Ripard
` (12 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The A10 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 1f3c51a08113..c8595926a721 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -195,6 +195,15 @@
clock-output-names = "pll1";
};
+ pll2: clk at 01c20008 {
+ #clock-cells = <1>;
+ compatible = "allwinner,sun4i-a10-pll2-clk";
+ reg = <0x01c20008 0x8>;
+ clocks = <&osc24M>;
+ clock-output-names = "pll2-1x", "pll2-2x",
+ "pll2-4x", "pll2-8x";
+ };
+
pll4: clk at 01c20018 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-a10-pll1-clk";
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 02/13] ARM: sun5i: Add audio PLL
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
2015-10-21 20:52 ` [PATCH 01/13] ARM: sun4i: Add audio PLL Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:52 ` [PATCH 03/13] ARM: sun7i: " Maxime Ripard
` (11 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The A13 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). However, it has a
different divider configuration than the A10, hence the difference
compatible.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun5i.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 9ffee9bb70a7..9b03eb95a390 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -102,6 +102,15 @@
clock-output-names = "pll1";
};
+ pll2: clk at 01c20008 {
+ #clock-cells = <1>;
+ compatible = "allwinner,sun5i-a13-pll2-clk";
+ reg = <0x01c20008 0x8>;
+ clocks = <&osc24M>;
+ clock-output-names = "pll2-1x", "pll2-2x",
+ "pll2-4x", "pll2-8x";
+ };
+
pll4: clk at 01c20018 {
#clock-cells = <0>;
compatible = "allwinner,sun4i-a10-pll1-clk";
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 03/13] ARM: sun7i: Add audio PLL
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
2015-10-21 20:52 ` [PATCH 01/13] ARM: sun4i: Add audio PLL Maxime Ripard
2015-10-21 20:52 ` [PATCH 02/13] ARM: sun5i: " Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:52 ` [PATCH 04/13] ARM: sun4i: Add audio codec clock Maxime Ripard
` (10 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The A20 uses the PLL2 as the audio PLL, which is the parent of all the
other audio clocks in the system (i2s, codec, etc.). Add it to the DTSI.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 3a68852f6706..433ec1415e56 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -199,6 +199,15 @@
clock-output-names = "pll1";
};
+ pll2: clk at 01c20008 {
+ #clock-cells = <1>;
+ compatible = "allwinner,sun4i-a10-pll2-clk";
+ reg = <0x01c20008 0x8>;
+ clocks = <&osc24M>;
+ clock-output-names = "pll2-1x", "pll2-2x",
+ "pll2-4x", "pll2-8x";
+ };
+
pll4: clk at 01c20018 {
#clock-cells = <0>;
compatible = "allwinner,sun7i-a20-pll4-clk";
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 04/13] ARM: sun4i: Add audio codec clock
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (2 preceding siblings ...)
2015-10-21 20:52 ` [PATCH 03/13] ARM: sun7i: " Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:52 ` [PATCH 05/13] ARM: sun5i: " Maxime Ripard
` (9 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index c8595926a721..8993dfadd18c 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -45,6 +45,7 @@
#include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/clock/sun4i-a10-pll2.h>
#include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
@@ -490,6 +491,14 @@
clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
clock-output-names = "spi3";
};
+
+ codec_clk: clk at 01c20140 {
+ #clock-cells = <0>;
+ compatible = "allwinner,sun4i-a10-codec-clk";
+ reg = <0x01c20140 0x4>;
+ clocks = <&pll2 SUN4I_A10_PLL2_1X>;
+ clock-output-names = "codec";
+ };
};
soc at 01c00000 {
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 05/13] ARM: sun5i: Add audio codec clock
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (3 preceding siblings ...)
2015-10-21 20:52 ` [PATCH 04/13] ARM: sun4i: Add audio codec clock Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:52 ` [PATCH 06/13] ARM: sun7i: " Maxime Ripard
` (8 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun5i.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 9b03eb95a390..17a6b7d58fbf 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -44,6 +44,7 @@
#include "skeleton.dtsi"
+#include <dt-bindings/clock/sun4i-a10-pll2.h>
#include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
@@ -294,6 +295,14 @@
clock-output-names = "usb_ohci0", "usb_phy";
};
+ codec_clk: clk at 01c20140 {
+ #clock-cells = <0>;
+ compatible = "allwinner,sun4i-a10-codec-clk";
+ reg = <0x01c20140 0x4>;
+ clocks = <&pll2 SUN4I_A10_PLL2_1X>;
+ clock-output-names = "codec";
+ };
+
mbus_clk: clk at 01c2015c {
#clock-cells = <0>;
compatible = "allwinner,sun5i-a13-mbus-clk";
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 06/13] ARM: sun7i: Add audio codec clock
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (4 preceding siblings ...)
2015-10-21 20:52 ` [PATCH 05/13] ARM: sun5i: " Maxime Ripard
@ 2015-10-21 20:52 ` Maxime Ripard
2015-10-21 20:53 ` [PATCH 07/13] ARM: sun4i: Add sunxi codec device node Maxime Ripard
` (7 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:52 UTC (permalink / raw)
To: linux-arm-kernel
The audio codec functional clock is a child of PLL2 and is used to control
the audio rate, enable it in the DT.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 433ec1415e56..f4440f6d9621 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -47,6 +47,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/clock/sun4i-a10-pll2.h>
#include <dt-bindings/dma/sun4i-a10.h>
#include <dt-bindings/pinctrl/sun4i-a10.h>
@@ -500,6 +501,14 @@
clock-output-names = "spi3";
};
+ codec_clk: clk at 01c20140 {
+ #clock-cells = <0>;
+ compatible = "allwinner,sun4i-a10-codec-clk";
+ reg = <0x01c20140 0x4>;
+ clocks = <&pll2 SUN4I_A10_PLL2_1X>;
+ clock-output-names = "codec";
+ };
+
mbus_clk: clk at 01c2015c {
#clock-cells = <0>;
compatible = "allwinner,sun5i-a13-mbus-clk";
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 07/13] ARM: sun4i: Add sunxi codec device node
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (5 preceding siblings ...)
2015-10-21 20:52 ` [PATCH 06/13] ARM: sun7i: " Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-21 20:53 ` [PATCH 08/13] ARM: sun5i: Add the Audio codec DT node Maxime Ripard
` (6 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
From: Marcus Cooper <codekipper@gmail.com>
The A10 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 8993dfadd18c..aa90f319309b 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -1022,6 +1022,19 @@
status = "disabled";
};
+ codec: codec at 01c22c00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun4i-a10-codec";
+ reg = <0x01c22c00 0x40>;
+ interrupts = <30>;
+ clocks = <&apb0_gates 0>, <&codec_clk>;
+ clock-names = "apb", "codec";
+ dmas = <&dma SUN4I_DMA_NORMAL 19>,
+ <&dma SUN4I_DMA_NORMAL 19>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
sid: eeprom at 01c23800 {
compatible = "allwinner,sun4i-a10-sid";
reg = <0x01c23800 0x10>;
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 08/13] ARM: sun5i: Add the Audio codec DT node
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (6 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 07/13] ARM: sun4i: Add sunxi codec device node Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-21 20:53 ` [PATCH 09/13] ARM: sun7i: Add sunxi codec device node Maxime Ripard
` (5 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
The A13 and A10s also have the audio codec present. List it in the device
tree.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun5i.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 17a6b7d58fbf..59a9426e3bd4 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -589,6 +589,19 @@
status = "disabled";
};
+ codec: codec at 01c22c00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun4i-a10-codec";
+ reg = <0x01c22c00 0x40>;
+ interrupts = <30>;
+ clocks = <&apb0_gates 0>, <&codec_clk>;
+ clock-names = "apb", "codec";
+ dmas = <&dma SUN4I_DMA_NORMAL 19>,
+ <&dma SUN4I_DMA_NORMAL 19>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
sid: eeprom at 01c23800 {
compatible = "allwinner,sun4i-a10-sid";
reg = <0x01c23800 0x10>;
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 09/13] ARM: sun7i: Add sunxi codec device node
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (7 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 08/13] ARM: sun5i: Add the Audio codec DT node Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-21 20:53 ` [PATCH 10/13] ARM: sun7i: dt: enable audio codec on Cubietruck Maxime Ripard
` (4 subsequent siblings)
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
From: Emilio L?pez <emilio@elopez.com.ar>
The A20 SoC includes the Allwinner audio codec, capable of both 24-bit
playback and capture. This commit adds a device node for it.
Signed-off-by: Emilio L?pez <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun7i-a20.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index f4440f6d9621..e02eb720c4fc 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1216,6 +1216,19 @@
status = "disabled";
};
+ codec: codec at 01c22c00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun7i-a20-codec";
+ reg = <0x01c22c00 0x40>;
+ interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&apb0_gates 0>, <&codec_clk>;
+ clock-names = "apb", "codec";
+ dmas = <&dma SUN4I_DMA_NORMAL 19>,
+ <&dma SUN4I_DMA_NORMAL 19>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
sid: eeprom at 01c23800 {
compatible = "allwinner,sun7i-a20-sid";
reg = <0x01c23800 0x200>;
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 10/13] ARM: sun7i: dt: enable audio codec on Cubietruck
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (8 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 09/13] ARM: sun7i: Add sunxi codec device node Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-22 3:41 ` Chen-Yu Tsai
2015-10-21 20:53 ` [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec Maxime Ripard
` (3 subsequent siblings)
13 siblings, 1 reply; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
From: Emilio L?pez <emilio@elopez.com.ar>
This commit enables the on-chip audio codec present on the A20 SoC
and outlines the SoC to connector routes for the Cubietruck.
Signed-off-by: Emilio L?pez <emilio@elopez.com.ar>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index e6b019232a9e..8da939ab8350 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -101,6 +101,10 @@
status = "okay";
};
+&codec {
+ status = "okay";
+};
+
&cpu0 {
cpu-supply = <®_dcdc2>;
};
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 10/13] ARM: sun7i: dt: enable audio codec on Cubietruck
2015-10-21 20:53 ` [PATCH 10/13] ARM: sun7i: dt: enable audio codec on Cubietruck Maxime Ripard
@ 2015-10-22 3:41 ` Chen-Yu Tsai
0 siblings, 0 replies; 18+ messages in thread
From: Chen-Yu Tsai @ 2015-10-22 3:41 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 22, 2015 at 4:53 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> From: Emilio L?pez <emilio@elopez.com.ar>
>
> This commit enables the on-chip audio codec present on the A20 SoC
> and outlines the SoC to connector routes for the Cubietruck.
The latter bit is no longer true since you removed the routes.
ChenYu
>
> Signed-off-by: Emilio L?pez <emilio@elopez.com.ar>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> index e6b019232a9e..8da939ab8350 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> @@ -101,6 +101,10 @@
> status = "okay";
> };
>
> +&codec {
> + status = "okay";
> +};
> +
> &cpu0 {
> cpu-supply = <®_dcdc2>;
> };
> --
> 2.6.2
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (9 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 10/13] ARM: sun7i: dt: enable audio codec on Cubietruck Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-22 4:27 ` Chen-Yu Tsai
2015-10-21 20:53 ` [PATCH 12/13] ARM: sun4i: Enable audio-codec on Mele A1000 Maxime Ripard
` (2 subsequent siblings)
13 siblings, 1 reply; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
The cubieboard uses the internal codec to output sound to its mini-jack.
Enable it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 9ff459bd38b3..1fa832d7b469 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -84,6 +84,10 @@
status = "okay";
};
+&codec {
+ status = "okay";
+};
+
&cpu0 {
cpu-supply = <®_dcdc2>;
};
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec
2015-10-21 20:53 ` [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec Maxime Ripard
@ 2015-10-22 4:27 ` Chen-Yu Tsai
2015-10-22 8:54 ` Maxime Ripard
0 siblings, 1 reply; 18+ messages in thread
From: Chen-Yu Tsai @ 2015-10-22 4:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 22, 2015 at 4:53 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The cubieboard uses the internal codec to output sound to its mini-jack.
^^^^^^^^^^
May want to change this to Cubieboard2?
ChenYu
> Enable it.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> index 9ff459bd38b3..1fa832d7b469 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
> @@ -84,6 +84,10 @@
> status = "okay";
> };
>
> +&codec {
> + status = "okay";
> +};
> +
> &cpu0 {
> cpu-supply = <®_dcdc2>;
> };
> --
> 2.6.2
>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec
2015-10-22 4:27 ` Chen-Yu Tsai
@ 2015-10-22 8:54 ` Maxime Ripard
0 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-22 8:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 22, 2015 at 12:27:23PM +0800, Chen-Yu Tsai wrote:
> On Thu, Oct 22, 2015 at 4:53 AM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > The cubieboard uses the internal codec to output sound to its mini-jack.
>
> ^^^^^^^^^^
>
> May want to change this to Cubieboard2?
Right, I've applied all your patches with your Acked-by, and fixed
both this and the other error you found in the commit log.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151022/959a05c6/attachment.sig>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 12/13] ARM: sun4i: Enable audio-codec on Mele A1000
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (10 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 11/13] ARM: sun7i: Enable cubieboard2 audio codec Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-21 20:53 ` [PATCH 13/13] ARM: sun5i: chip: Enable the audio codec Maxime Ripard
2015-10-22 3:43 ` [PATCH 00/13] ARM: sunxi: " Chen-Yu Tsai
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
From: Marcus Cooper <codekipper@gmail.com>
Enable the audio-codec on the Mele A1000 top-set box.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 2630d78d9e04..97570cb7f2fc 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -93,6 +93,10 @@
status = "okay";
};
+&codec {
+ status = "okay";
+};
+
&ehci0 {
status = "okay";
};
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 13/13] ARM: sun5i: chip: Enable the audio codec
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (11 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 12/13] ARM: sun4i: Enable audio-codec on Mele A1000 Maxime Ripard
@ 2015-10-21 20:53 ` Maxime Ripard
2015-10-22 3:43 ` [PATCH 00/13] ARM: sunxi: " Chen-Yu Tsai
13 siblings, 0 replies; 18+ messages in thread
From: Maxime Ripard @ 2015-10-21 20:53 UTC (permalink / raw)
To: linux-arm-kernel
The CHIP v0.2 has a composite output on a mini-jack connector, the audio
part being provided by the on-SoC codec. Enable it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun5i-r8-chip.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index abf3ccb1a82c..530ab28e9ca2 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -66,6 +66,10 @@
};
};
+&codec {
+ status = "okay";
+};
+
&ehci0 {
status = "okay";
};
--
2.6.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH 00/13] ARM: sunxi: Enable the audio codec
2015-10-21 20:52 [PATCH 00/13] ARM: sunxi: Enable the audio codec Maxime Ripard
` (12 preceding siblings ...)
2015-10-21 20:53 ` [PATCH 13/13] ARM: sun5i: chip: Enable the audio codec Maxime Ripard
@ 2015-10-22 3:43 ` Chen-Yu Tsai
13 siblings, 0 replies; 18+ messages in thread
From: Chen-Yu Tsai @ 2015-10-22 3:43 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 22, 2015 at 4:52 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi everyone,
>
> This serie enables the support for the audio codec in the DTSI and in
> a bunch of boards it has been tested on so far.
Except for the minor issue for the Cubietruck commit message, whole
series is
Acked-by: Chen-Yu Tsai <wens@csie.org>
Also tested on my CubieTruck with both 44.1 kHz and 48 kHz audio.
> Thanks!
> Maxime
>
> Emilio L?pez (2):
> ARM: sun7i: Add sunxi codec device node
> ARM: sun7i: dt: enable audio codec on Cubietruck
>
> Marcus Cooper (2):
> ARM: sun4i: Add sunxi codec device node
> ARM: sun4i: Enable audio-codec on Mele A1000
>
> Maxime Ripard (9):
> ARM: sun4i: Add audio PLL
> ARM: sun5i: Add audio PLL
> ARM: sun7i: Add audio PLL
> ARM: sun4i: Add audio codec clock
> ARM: sun5i: Add audio codec clock
> ARM: sun7i: Add audio codec clock
> ARM: sun5i: Add the Audio codec DT node
> ARM: sun7i: Enable cubieboard2 audio codec
> ARM: sun5i: chip: Enable the audio codec
>
> arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++
> arch/arm/boot/dts/sun4i-a10.dtsi | 31 +++++++++++++++++++++++++++++
> arch/arm/boot/dts/sun5i-r8-chip.dts | 4 ++++
> arch/arm/boot/dts/sun5i.dtsi | 31 +++++++++++++++++++++++++++++
> arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 4 ++++
> arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 ++++
> arch/arm/boot/dts/sun7i-a20.dtsi | 31 +++++++++++++++++++++++++++++
> 7 files changed, 109 insertions(+)
>
> --
> 2.6.2
>
^ permalink raw reply [flat|nested] 18+ messages in thread