Add i2s nodes on Exynos5420 and enable sound support on sdmk5420

This patch removes quirks from i2s node and change the i2s compatible names.

Quoted 2 lines · Padmavathi Venna

This patch removes quirks from i2s node and change the i2s compatible names.

This needs to go along with the driver change otherwise we break bisection.

Hi Mark,

Quoted 4 lines · Mark Brown

Quoted 2 lines · Padmavathi Venna

This patch removes quirks from i2s node and change the i2s compatible names.

Quoted 2 lines

This needs to go along with the driver change otherwise we break bisection.

some of the patches at dts side are dependent on this patch. So I separated it into another set. Should I re-post this patch along with other driver side patches?

This patch adds i2c bus 1 and wm8994 codec node on i2c bus1 and the required regulator supplies and properties on smdk5420 board.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/boot/dts/exynos5420-smdk5420.dts |   58

+++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/arch/arm/boot/dts/exynos5420-smdk5420.dts index d05de7a..e86c1ae 100644

arch/arm/boot/dts/exynos5420-smdk5420.dts +20 -0

+		compatible = "regulator-fixed";
+		regulator-name = "avdd2-supply";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+	};
+
+	cpvdd: fixed-regulator at 1 {
+		compatible = "regulator-fixed";
+		regulator-name = "cpvdd-supply";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+	};
+
+	dbvdd: fixed-regulator at 2 {
+		compatible = "regulator-fixed";
+		regulator-name = "dbvdd-supply";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;

I2S nodes shares some properties across exynos5 SoCs (exynos5250 and exyno5420). Common code is moved to exynos5.dtsi which is included in exyno5250 and exynos5420 SoC files.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/boot/dts/exynos5.dtsi    |   21 +++++++++++++++++++++
 arch/arm/boot/dts/exynos5250.dtsi |   12 ------------
 2 files changed, 21 insertions(+), 12 deletions(-)

(quoted diff) +0 -0

b/arch/arm/boot/dts/exynos5.dtsi index ec384c9..c37b57d 100644

arch/arm/boot/dts/exynos5.dtsi +21 -0

@@ -191,4 +191,25 @@
 		#size-cells = <0>;
 		status = "disabled";
 	};
+
+	i2s0: i2s at 03830000 {
+		reg = <0x03830000 0x100>;
+		samsung,idma-addr = <0x03000000>;
+	};
+
+	i2s1: i2s at 12D60000 {
+		compatible = "samsung,s3c6410-i2s";
+		reg = <0x12D60000 0x100>;
+		dmas = <&pdma1 12
+			&pdma1 11>;
+		dma-names = "tx", "rx";
+	};
+
+	i2s2: i2s at 12D70000 {
+		compatible = "samsung,s3c6410-i2s";
+		reg = <0x12D70000 0x100>;
+		dmas = <&pdma0 12
+			&pdma0 11>;
+		dma-names = "tx", "rx";
+	};
 };

(quoted diff) +0 -0

b/arch/arm/boot/dts/exynos5250.dtsi index 5b36121..3873ff7 100644

arch/arm/boot/dts/exynos5250.dtsi +0 -12

@@ -394,7 +394,6 @@
 
 	i2s0: i2s at 03830000 {
 		compatible = "samsung,s5pv210-i2s";
-		reg = <0x03830000 0x100>;
 		dmas = <&pdma0 10
 			&pdma0 9
 			&pdma0 8>;

@@ -403,17 +402,11 @@
 			<&clock_audss EXYNOS_I2S_BUS>,
 			<&clock_audss EXYNOS_SCLK_I2S>;
 		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-		samsung,idma-addr = <0x03000000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&i2s0_bus>;
 	};
 
 	i2s1: i2s at 12D60000 {
-		compatible = "samsung,s3c6410-i2s";
-		reg = <0x12D60000 0x100>;
-		dmas = <&pdma1 12
-			&pdma1 11>;
-		dma-names = "tx", "rx";
 		clocks = <&clock 307>, <&clock 157>;
 		clock-names = "iis", "i2s_opclk0";
 		pinctrl-names = "default";

@@ -421,11 +414,6 @@
 	};
 
 	i2s2: i2s at 12D70000 {
-		compatible = "samsung,s3c6410-i2s";
-		reg = <0x12D70000 0x100>;
-		dmas = <&pdma0 12
-			&pdma0 11>;
-		dma-names = "tx", "rx";
 		clocks = <&clock 308>, <&clock 158>;
 		clock-names = "iis", "i2s_opclk0";
 		pinctrl-names = "default";

This patch adds 16MHz oscillator clock node required for audio on smdk5420 and adds the phandle of the same in wm8994 clock info.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/boot/dts/exynos5420-smdk5420.dts |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/arch/arm/boot/dts/exynos5420-smdk5420.dts index e86c1ae..3c56a91 100644

arch/arm/boot/dts/exynos5420-smdk5420.dts +8 -0

+		#clock-cells = <0>;
+		clock-frequency = <16934400>;
+		clock-output-names = "osc3_clk16mhz";
+	};
+
 	dwmmc0 at 12200000 {
 		status = "okay";
 		num-slots = <1>;

@@ -123,6 +130,9 @@
 			DBVDD-supply = <&dbvdd>;
 			SPKVDD1-supply = <&spkvdd>;
 			SPKVDD2-supply = <&spkvdd>;
+
+			clocks = <&osc3_clk16mhz>;
+			clock-names = "mclk1";
 		};
 	};

This patch registers the 16MHz oscillator clock as fixed clk.

sound/soc/samsung/smdk_wm8994.c +9 -0

+/* 16.9MHz fixed oscillator clock */
+static void init_osc_clock(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "osc3_clk16mhz");
+	of_fixed_clk_setup(np);
+}
+
 static int smdk_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params)
 {

Quoted 18 lines · Padmavathi Venna

This patch registers the 16MHz oscillator clock as fixed clk.

sound/soc/samsung/smdk_wm8994.c +9 -0

+/* 16.9MHz fixed oscillator clock */
+static void init_osc_clock(void)
+{
+     struct device_node *np;
+
+     np = of_find_compatible_node(NULL, NULL, "osc3_clk16mhz");
+     of_fixed_clk_setup(np);
+}
+
 static int smdk_hw_params(struct snd_pcm_substream *substream,
      struct snd_pcm_hw_params *params)
 {

@@ -173,6 +183,8 @@ static int smdk_audio_probe(struct platform_device *pdev)
              smdk_dai[0].platform_of_node = smdk_dai[0].cpu_of_node;
      }
 

sound/soc/samsung/smdk_wm8994.c static int smdk_audio_probe(struct platform_device *pdev) · line 187

Quoted 2 lines

sound/soc/samsung/smdk_wm8994.c +2 -0

+     init_osc_clock();
+

This doesn't seem great - it means that this machine driver needs to

know about a specifically named fixed clock which makes it hard to reuse on other similar boards. For example I'm intending to reuse this on Arndale. Mike?

This patch registers the 16MHz oscillator clock as fixed clk.

Signed-off-by Padmavathi Venna <[email protected]>

---
 sound/soc/samsung/smdk_wm8994.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

(quoted diff) +0 -0

b/sound/soc/samsung/smdk_wm8994.c index 581ea4a..a6edded 100644

sound/soc/samsung/smdk_wm8994.c +10 -0

@@ -9,6 +9,7 @@
 
 #include "../codecs/wm8994.h"
 #include <sound/pcm_params.h>
+#include <linux/clk-provider.h>
 #include <linux/module.h>
 #include <linux/of.h>
 

@@ -37,6 +38,15 @@
 /* SMDK has a 16.934MHZ crystal attached to WM8994 */
 #define SMDK_WM8994_FREQ 16934000
 
+/* 16.9MHz fixed oscillator clock */
+static void init_osc_clock(void)
+{
+	struct device_node *np;
+
+	np = of_find_compatible_node(NULL, NULL, "osc3_clk16mhz");
+	of_fixed_clk_setup(np);
+}
+
 static int smdk_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params)
 {

I don't think this patch is needed at all. You can use generic fixed rate clock bindings[1] to define a fixed rate clock using device tree.