Merge pull request #990 from karabek/master

Add H3-mixer1 and HDMI sound nodes

patch/kernel/sunxi-dev/general-add-HDMI-sound-nodes-DT.patch

@@ -1,10 +1,10 @@
 diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-index 8aa2befc..d3d70eac 100644
+index 1be1a02..7772d16 100644
 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
 +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
-@@ -53,6 +53,22 @@
- 	#address-cells = <1>;
- 	#size-cells = <1>;
+@@ -77,6 +77,22 @@
+ 		};
+ 	};
  
 +	sound_hdmi: sound {
 +		compatible = "simple-audio-card";
@@ -25,15 +25,7 @@ index 8aa2befc..d3d70eac 100644
  	clocks {
  		#address-cells = <1>;
  		#size-cells = <1>;
-@@ -110,6 +126,7 @@
- 		};
- 
- 		hdmi: hdmi@1ee0000 {
-+			#sound-dai-cells = <0>;
- 			compatible = "allwinner,sun8i-h3-dw-hdmi";
- 			reg = <0x01ee0000 0x10000>,
- 			      <0x01ef0000 0x10000>;
-@@ -685,6 +702,19 @@
+@@ -630,6 +646,19 @@
  			status = "disabled";
  		};
  
@@ -50,6 +42,14 @@ index 8aa2befc..d3d70eac 100644
 +			status = "disabled";
 +		};
 +
- 		codec: codec@01c22c00 {
+ 		codec: codec@1c22c00 {
  			#sound-dai-cells = <0>;
  			compatible = "allwinner,sun8i-h3-codec";
+@@ -747,6 +776,7 @@
+ 		};
+ 
+ 		hdmi: hdmi@1ee0000 {
++			#sound-dai-cells = <0>;
+ 			compatible = "allwinner,sun8i-h3-dw-hdmi",
+ 				     "allwinner,sun8i-a83t-dw-hdmi";
+ 			reg = <0x01ee0000 0x10000>;

patch/kernel/sunxi-dev/general-add-h3-mixer1.patch

@@ -0,0 +1,30 @@
+diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
+index 126899d..7fa7494 100644
+--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
++++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
+@@ -500,6 +500,14 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+ 	.vi_num		= 1,
+ };
+ 
++static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
++	.ccsc		= 1,
++	.mod_rate	= 432000000,
++	.scaler_mask	= 0xf,
++	.ui_num		= 3,
++	.vi_num		= 1,
++};
++
+ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
+ 	.vi_num = 2,
+ 	.ui_num = 1,
+@@ -522,6 +530,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
+ 		.data = &sun8i_h3_mixer0_cfg,
+ 	},
+ 	{
++		.compatible = "allwinner,sun8i-h3-de2-mixer-1",
++		.data = &sun8i_h3_mixer1_cfg,
++	},
++	{
+ 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
+ 		.data = &sun8i_v3s_mixer_cfg,
+ 	},

patch/kernel/sunxi-dev/unresolved/02-add-H3-mixers.patch

@@ -1,52 +0,0 @@
-From cf9c6a1a49beecea35f395017a0e3aa9d97f2f17 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.xyz>
-Date: Tue, 1 Aug 2017 21:12:53 +0800
-Subject: [PATCH] drm: sun4i: add support for H3 mixers
-
-Allwinner H3 SoC has two mixers, one has 1 VI channel and 3 UI channels,
-and the other has 1 VI and 1 UI. There's also some graphics post-process
-function that is missing on mixer1, however, as we currently support
-none of these functions, the only difference that is shown to us is the
-channel number difference.
-
-Add support for these two variants.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
----
- drivers/gpu/drm/sun4i/sun8i_mixer.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index cb193c5f16862..d658a3a8159a7 100644
---- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
-+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-@@ -390,11 +390,29 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
- 	.ui_num = 1,
- };
- 
-+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
-+	.vi_num = 1,
-+	.ui_num = 3,
-+};
-+
-+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
-+	.vi_num = 1,
-+	.ui_num = 1,
-+};
-+
- static const struct of_device_id sun8i_mixer_of_table[] = {
- 	{
- 		.compatible = "allwinner,sun8i-v3s-de2-mixer",
- 		.data = &sun8i_v3s_mixer_cfg,
- 	},
-+	{
-+		.compatible = "allwinner,sun8i-h3-de2-mixer0",
-+		.data = &sun8i_h3_mixer0_cfg
-+	},
-+	{
-+		.compatible = "allwinner,sun8i-h3-de2-mixer1",
-+		.data = &sun8i_h3_mixer1_cfg
-+	},
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);