clk: Samsung: audss: Register audio subsytem clocks using common clk framework
Subsystems (6)
v6 cover clk: Samsung: audss: Register audio subsytem clocks using common clk framework
Samsung S5PV210 and Exynos SoC has a separate subsystem for audio. This subsystem has a internal clock controller which controls i2s0 and pcm0 clocks. This patch series adds the Samsung audio subsytem clock to the common clock framework and provides the I2S controllers clock information in the dtsi file.
This patch series is made based on Kukjin Kim for-next branch
Changes since V5:
- Added i2s_opclk0 entry for i2s1 and i2s2 nodes
- Added Acked-by: Mike Turquette <[email protected]>
- Added Reviewed-by: Doug Anderson <[email protected]>
Changes since V4:
- Reworked on the nits given by Doug.
- Removed mout_audss and mout_i2s from i2s nodes as we are not getting these clocks in the i2s driver.
- Modified the I2S binding documentation for clocks and pinmux.
Changes since V3:
- Replaced samsung with exynos in the macro prefixes and function names as this driver supports mainly exynos and s5p family.
- Added Reviewed-by:Sylwester Nawrocki <[email protected]>
Changes since V2:
- Removed s5pv210 compatible name from driver as it is not yet supported which is different from Exynos series audio subsystem clock conroller.
- Removed clkdev lookup support and added alias names in the i2s0 controller node.
Changes since V1:
- Reworked on all review comments by Sylwester Nawrocki
- Added a header file for all clock indexes as requested by Sylwester
- Added different compatible names for s5pv210, exynos4 and exynos5
- Registered the pcm clocks with common clock framework
Padmavathi Venna (6):
ARM: samsung: use #include for all device trees
clk: samsung: register audio subsystem clocks using common clock
framework
ARM: dts: add Exynos audio subsystem clock controller node
ARM: dts: add clock provider information for i2s controllers in
Exynos5250
ARM: dts: Update Samsung I2S documentation
clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
.../devicetree/bindings/clock/clk-exynos-audss.txt | 64 ++++++++++ .../devicetree/bindings/sound/samsung-i2s.txt | 46 +++---- arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- arch/arm/boot/dts/exynos4210.dtsi | 4 +- arch/arm/boot/dts/exynos4212.dtsi | 2 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/exynos4412.dtsi | 2 +- arch/arm/boot/dts/exynos4x12.dtsi | 4 +- arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 4 +- arch/arm/boot/dts/exynos5250.dtsi | 20 +++- arch/arm/boot/dts/exynos5440-sd5v1.dts | 2 +- arch/arm/boot/dts/exynos5440-ssdk5440.dts | 2 +- arch/arm/boot/dts/exynos5440.dtsi | 2 +- arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +- arch/arm/boot/dts/s3c2416.dtsi | 4 +- arch/arm/boot/dts/s3c24xx.dtsi | 2 +- drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-exynos-audss.c | 133 ++++++++++++++++++++ drivers/clk/samsung/clk-exynos5250.c | 5 +- include/dt-bindings/clk/exynos-audss-clk.h | 25 ++++ 28 files changed, 288 insertions(+), 56 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/clk-exynos-audss.txt create mode 100644 drivers/clk/samsung/clk-exynos-audss.c create mode 100644 include/dt-bindings/clk/exynos-audss-clk.h
Signature · 1 line
1.7.4.4
PATCH v6 1/6 ARM: samsung: use #include for all device trees
Replace /include/ (dtc) with #include (C pre-processor) for all Samsung DT files
--- arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4210-origen.dts | 2 +- arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- arch/arm/boot/dts/exynos4210.dtsi | 4 ++-- arch/arm/boot/dts/exynos4212.dtsi | 2 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos4412-origen.dts | 2 +- arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +- arch/arm/boot/dts/exynos4412.dtsi | 2 +- arch/arm/boot/dts/exynos4x12.dtsi | 4 ++-- arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 4 ++-- arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- arch/arm/boot/dts/exynos5440-sd5v1.dts | 2 +- arch/arm/boot/dts/exynos5440-ssdk5440.dts | 2 +- arch/arm/boot/dts/exynos5440.dtsi | 2 +- arch/arm/boot/dts/s3c2416-smdk2416.dts | 2 +- arch/arm/boot/dts/s3c2416.dtsi | 4 ++-- arch/arm/boot/dts/s3c24xx.dtsi | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +1 -1
@@ -19,7 +19,7 @@ * published by the Free Software Foundation. */ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { interrupt-parent = <&gic>;
arch/arm/boot/dts/exynos4210-origen.dts +1 -1
@@ -15,7 +15,7 @@ */ /dts-v1/; -/include/ "exynos4210.dtsi" +#include "exynos4210.dtsi" / { model = "Insignal Origen evaluation board based on Exynos4210";
arch/arm/boot/dts/exynos4210-smdkv310.dts +1 -1
@@ -15,7 +15,7 @@ */ /dts-v1/; -/include/ "exynos4210.dtsi" +#include "exynos4210.dtsi" / { model = "Samsung smdkv310 evaluation board based on Exynos4210";
arch/arm/boot/dts/exynos4210-trats.dts +1 -1
@@ -13,7 +13,7 @@ */ /dts-v1/; -/include/ "exynos4210.dtsi" +#include "exynos4210.dtsi" / { model = "Samsung Trats based on Exynos4210";
arch/arm/boot/dts/exynos4210-universal_c210.dts +1 -1
@@ -13,7 +13,7 @@ */ /dts-v1/; -/include/ "exynos4210.dtsi" +#include "exynos4210.dtsi" / { model = "Samsung Universal C210 based on Exynos4210 rev0";
arch/arm/boot/dts/exynos4210.dtsi +2 -2
@@ -19,8 +19,8 @@ * published by the Free Software Foundation. */ -/include/ "exynos4.dtsi" -/include/ "exynos4210-pinctrl.dtsi" +#include "exynos4.dtsi" +#include "exynos4210-pinctrl.dtsi" / { compatible = "samsung,exynos4210";
arch/arm/boot/dts/exynos4212.dtsi +1 -1
@@ -17,7 +17,7 @@ * published by the Free Software Foundation. */ -/include/ "exynos4x12.dtsi" +#include "exynos4x12.dtsi" / { compatible = "samsung,exynos4212";
arch/arm/boot/dts/exynos4412-odroidx.dts +1 -1
@@ -12,7 +12,7 @@ */ /dts-v1/; -/include/ "exynos4412.dtsi" +#include "exynos4412.dtsi" / { model = "Hardkernel ODROID-X board based on Exynos4412";
arch/arm/boot/dts/exynos4412-origen.dts +1 -1
@@ -13,7 +13,7 @@ */ /dts-v1/; -/include/ "exynos4412.dtsi" +#include "exynos4412.dtsi" / { model = "Insignal Origen evaluation board based on Exynos4412";
arch/arm/boot/dts/exynos4412-smdk4412.dts +1 -1
@@ -13,7 +13,7 @@ */ /dts-v1/; -/include/ "exynos4412.dtsi" +#include "exynos4412.dtsi" / { model = "Samsung SMDK evaluation board based on Exynos4412";
arch/arm/boot/dts/exynos4412.dtsi +1 -1
@@ -17,7 +17,7 @@ * published by the Free Software Foundation. */ -/include/ "exynos4x12.dtsi" +#include "exynos4x12.dtsi" / { compatible = "samsung,exynos4412";
arch/arm/boot/dts/exynos4x12.dtsi +2 -2
@@ -17,8 +17,8 @@ * published by the Free Software Foundation. */ -/include/ "exynos4.dtsi" -/include/ "exynos4x12-pinctrl.dtsi" +#include "exynos4.dtsi" +#include "exynos4x12-pinctrl.dtsi" / { aliases {
arch/arm/boot/dts/exynos5250-arndale.dts +1 -1
@@ -10,7 +10,7 @@ */ /dts-v1/; -/include/ "exynos5250.dtsi" +#include "exynos5250.dtsi" / { model = "Insignal Arndale evaluation board based on EXYNOS5250";
arch/arm/boot/dts/exynos5250-smdk5250.dts +1 -1
@@ -10,7 +10,7 @@ */ /dts-v1/; -/include/ "exynos5250.dtsi" +#include "exynos5250.dtsi" / { model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
arch/arm/boot/dts/exynos5250-snow.dts +2 -2
@@ -9,8 +9,8 @@ */ /dts-v1/; -/include/ "exynos5250.dtsi" -/include/ "cros5250-common.dtsi" +#include "exynos5250.dtsi" +#include "cros5250-common.dtsi" / { model = "Google Snow";
arch/arm/boot/dts/exynos5250.dtsi +2 -2
@@ -17,8 +17,8 @@ * published by the Free Software Foundation. */ -/include/ "skeleton.dtsi" -/include/ "exynos5250-pinctrl.dtsi" +#include "skeleton.dtsi" +#include "exynos5250-pinctrl.dtsi" / { compatible = "samsung,exynos5250";
arch/arm/boot/dts/exynos5440-sd5v1.dts +1 -1
@@ -10,7 +10,7 @@ */ /dts-v1/; -/include/ "exynos5440.dtsi" +#include "exynos5440.dtsi" / { model = "SAMSUNG SD5v1 board based on EXYNOS5440";
arch/arm/boot/dts/exynos5440-ssdk5440.dts +1 -1
@@ -10,7 +10,7 @@ */ /dts-v1/; -/include/ "exynos5440.dtsi" +#include "exynos5440.dtsi" / { model = "SAMSUNG SSDK5440 board based on EXYNOS5440";
arch/arm/boot/dts/exynos5440.dtsi +1 -1
@@ -9,7 +9,7 @@ * published by the Free Software Foundation. */ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "samsung,exynos5440";
arch/arm/boot/dts/s3c2416-smdk2416.dts +1 -1
@@ -9,7 +9,7 @@ */ /dts-v1/; -/include/ "s3c2416.dtsi" +#include "s3c2416.dtsi" / { model = "SMDK2416";
arch/arm/boot/dts/s3c2416.dtsi +2 -2
@@ -8,8 +8,8 @@ * published by the Free Software Foundation. */ -/include/ "s3c24xx.dtsi" -/include/ "s3c2416-pinctrl.dtsi" +#include "s3c24xx.dtsi" +#include "s3c2416-pinctrl.dtsi" / { model = "Samsung S3C2416 SoC";
arch/arm/boot/dts/s3c24xx.dtsi +1 -1
@@ -8,7 +8,7 @@ * published by the Free Software Foundation. */ -/include/ "skeleton.dtsi" +#include "skeleton.dtsi" / { compatible = "samsung,s3c24xx";
Signature · 1 line
1.7.4.4
PATCH v6 2/6 clk: samsung: register audio subsystem clocks using common clock framework
In reply to Padmavathi VennaAudio subsystem is introduced in s5pv210 and exynos platforms. This has seperate clock controller which can control i2s0 and pcm0 clocks. This patch registers the audio subsystem clocks with the common clock framework on Exynos family.
--- .../devicetree/bindings/clock/clk-exynos-audss.txt | 64 ++++++++++ drivers/clk/samsung/Makefile | 1 + drivers/clk/samsung/clk-exynos-audss.c | 133 ++++++++++++++++++++ include/dt-bindings/clk/exynos-audss-clk.h | 25 ++++ 4 files changed, 223 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/clk-exynos-audss.txt create mode 100644 drivers/clk/samsung/clk-exynos-audss.c create mode 100644 include/dt-bindings/clk/exynos-audss-clk.h
Documentation/devicetree/bindings/clock/clk-exynos-audss.txt new file +64 -0
@@ -0,0 +1,64 @@ +* Samsung Audio Subsystem Clock Controller + +The Samsung Audio Subsystem clock controller generates and supplies clocks +to Audio Subsystem block available in the S5PV210 and Exynos SoCs. The clock +binding described here is applicable to all SoC's in Exynos family. + +Required Properties: + +- compatible: should be one of the following: + - "samsung,exynos4210-audss-clock" - controller compatible with all Exynos4 SoCs. + - "samsung,exynos5250-audss-clock" - controller compatible with all Exynos5 SoCs. + +- reg: physical base address and length of the controller's register set. + +- #clock-cells: should be 1. + +The following is the list of clocks generated by the controller. Each clock is +assigned an identifier and client nodes use this identifier to specify the +clock which they consume. Some of the clocks are available only on a particular +Exynos4 SoC and this is specified where applicable. + +Provided clocks: + +Clock ID SoC (if specific) +----------------------------------------------- + +mout_audss 0 +mout_i2s 1 +dout_srp 2 +dout_aud_bus 3 +dout_i2s 4 +srp_clk 5 +i2s_bus 6 +sclk_i2s 7 +pcm_bus 8 +sclk_pcm 9 + +Example 1: An example of a clock controller node is listed below. + +clock_audss: audss-clock-controller@3810000 { + compatible = "samsung,exynos5250-audss-clock"; + reg = <0x03810000 0x0C>; + #clock-cells = <1>; +}; + +Example 2: I2S controller node that consumes the clock generated by the clock + controller. Refer to the standard clock bindings for information + about 'clocks' and 'clock-names' property. + +i2s0: i2s@03830000 { + compatible = "samsung,i2s-v5"; + reg = <0x03830000 0x100>; + dmas = <&pdma0 10 + &pdma0 9 + &pdma0 8>; + dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>, + <&clock_audss EXYNOS_MOUT_AUDSS>, + <&clock_audss EXYNOS_MOUT_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1", + "mout_audss", "mout_i2s"; +};
drivers/clk/samsung/Makefile +1 -0
@@ -6,3 +6,4 @@ obj-$(CONFIG_COMMON_CLK) += clk.o clk-pll.o obj-$(CONFIG_ARCH_EXYNOS4) += clk-exynos4.o obj-$(CONFIG_SOC_EXYNOS5250) += clk-exynos5250.o obj-$(CONFIG_SOC_EXYNOS5440) += clk-exynos5440.o +obj-$(CONFIG_ARCH_EXYNOS) += clk-exynos-audss.o
drivers/clk/samsung/clk-exynos-audss.c new file +133 -0
133 lines not on this page · raw message
include/dt-bindings/clk/exynos-audss-clk.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* This header provides constants for Samsung audio subsystem +* clock controller. +* +* The constants defined in this header are being used in dts +* and exynos audss driver. +*/ + +#ifndef _DT_BINDINGS_CLK_EXYNOS_AUDSS_H +#define _DT_BINDINGS_CLK_EXYNOS_AUDSS_H + +#define EXYNOS_MOUT_AUDSS 0 +#define EXYNOS_MOUT_I2S 1 +#define EXYNOS_DOUT_SRP 2 +#define EXYNOS_DOUT_AUD_BUS 3 +#define EXYNOS_DOUT_I2S 4 +#define EXYNOS_SRP_CLK 5 +#define EXYNOS_I2S_BUS 6 +#define EXYNOS_SCLK_I2S 7 +#define EXYNOS_PCM_BUS 8 +#define EXYNOS_SCLK_PCM 9 + +#define EXYNOS_AUDSS_MAX_CLKS 10 + +#endif
Signature · 1 line
1.7.4.4
PATCH v6 3/6 ARM: dts: add Exynos audio subsystem clock controller node
In reply to Padmavathi VennaAudio subsystem introduced in s5pv210 and exynos platforms which has a internal clock controller. This patch adds a node for the same on exynos5250.
--- arch/arm/boot/dts/exynos5250.dtsi | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/boot/dts/exynos5250.dtsi +6 -0
@@ -72,6 +72,12 @@ #clock-cells = <1>; }; + clock_audss: audss-clock-controller@3810000 { + compatible = "samsung,exynos5250-audss-clock"; + reg = <0x03810000 0x0C>; + #clock-cells = <1>; + }; + gic:interrupt-controller@10481000 { compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; #interrupt-cells = <3>;
Signature · 1 line
1.7.4.4
PATCH v6 4/6 ARM: dts: add clock provider information for i2s controllers in Exynos5250
In reply to Padmavathi VennaAdd clock lookup information for i2s controllers on exynos5250 SoC.
--- arch/arm/boot/dts/exynos5250.dtsi | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/boot/dts/exynos5250.dtsi +10 -0
@@ -20,6 +20,8 @@ #include "skeleton.dtsi" #include "exynos5250-pinctrl.dtsi" +#include <dt-bindings/clk/exynos-audss-clk.h> + / { compatible = "samsung,exynos5250"; interrupt-parent = <&gic>;
@@ -457,6 +459,10 @@ &pdma0 9 &pdma0 8>; dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; samsung,supports-6ch; samsung,supports-rstclr; samsung,supports-secdai;
@@ -471,6 +477,8 @@ dmas = <&pdma1 12 &pdma1 11>; dma-names = "tx", "rx"; + clocks = <&clock 307>, <&clock 157>; + clock-names = "iis", "i2s_opclk0"; pinctrl-names = "default"; pinctrl-0 = <&i2s1_bus>; };
@@ -481,6 +489,8 @@ dmas = <&pdma0 12 &pdma0 11>; dma-names = "tx", "rx"; + clocks = <&clock 308>, <&clock 158>; + clock-names = "iis", "i2s_opclk0"; pinctrl-names = "default"; pinctrl-0 = <&i2s2_bus>; };
Signature · 1 line
1.7.4.4
PATCH v6 5/6 ARM: dts: Update Samsung I2S documentation
In reply to Padmavathi VennaThis patch updates the samsung i2s documentation for pinmux and clock entries.
--- .../devicetree/bindings/sound/samsung-i2s.txt | 46 ++++++++----------- 1 files changed, 19 insertions(+), 27 deletions(-)
Documentation/devicetree/bindings/sound/samsung-i2s.txt +19 -27
@@ -8,6 +8,16 @@ Required SoC Specific Properties: - dmas: list of DMA controller phandle and DMA request line ordered pairs. - dma-names: identifier string for each DMA request line in the dmas property. These strings correspond 1:1 with the ordered pairs in dmas. +- clocks: Handle to iis clock and RCLK source clk. +- clock-names: + i2s0 uses some base clks from CMU and some are from audio subsystem internal + clock controller. The clock names for i2s0 should be "iis", "i2s_opclk0" and + "i2s_opclk1" as shown in the example below. + i2s1 and i2s2 uses clocks from CMU. The clock names for i2s1 and i2s2 should + be "iis" and "i2s_opclk0". + "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources of the root + clk. i2s0 has internal mux to select the source of root clk and i2s1 and i2s2 + doesn't have any such mux. Optional SoC Specific Properties:
@@ -20,44 +30,26 @@ Optional SoC Specific Properties: then this flag is enabled. - samsung,idma-addr: Internal DMA register base address of the audio sub system(used in secondary sound source). - -Required Board Specific Properties: - -- gpios: The gpio specifier for data out,data in, LRCLK, CDCLK and SCLK - interface lines. The format of the gpio specifier depends on the gpio - controller. - The syntax of samsung gpio specifier is - <[phandle of the gpio controller node] - [pin number within the gpio controller] - [mux function] - [flags and pull up/down] - [drive strength]> +- pinctrl-0: Should specify pin control groups used for this controller. +- pinctrl-names: Should contain only one value - "default". Example: -- SoC Specific Portion: - -i2s@03830000 { +i2s0: i2s@03830000 { compatible = "samsung,i2s-v5"; reg = <0x03830000 0x100>; dmas = <&pdma0 10 &pdma0 9 &pdma0 8>; dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; samsung,supports-6ch; samsung,supports-rstclr; samsung,supports-secdai; samsung,idma-addr = <0x03000000>; -}; - -- Board Specific Portion: - -i2s@03830000 { - gpios = <&gpz 0 2 0 0>, /* I2S_0_SCLK */ - <&gpz 1 2 0 0>, /* I2S_0_CDCLK */ - <&gpz 2 2 0 0>, /* I2S_0_LRCK */ - <&gpz 3 2 0 0>, /* I2S_0_SDI */ - <&gpz 4 2 0 0>, /* I2S_0_SDO[1] */ - <&gpz 5 2 0 0>, /* I2S_0_SDO[2] */ - <&gpz 6 2 0 0>; /* I2S_0_SDO[3] */ + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_bus>; };
Signature · 1 line
1.7.4.4
PATCH v6 6/6 clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
In reply to Padmavathi VennaThis patch adds enum entries for div_i2s1 and div_i2s2 which are required for i2s1 and i2s2 controllers.
--- drivers/clk/samsung/clk-exynos5250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/clk/samsung/clk-exynos5250.c +3 -2
@@ -87,6 +87,7 @@ enum exynos5250_clks { sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, + div_i2s1, div_i2s2,/* gate clocks */ gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0,
@@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {DIV (none,"div_pcm1" ,"sclk_audio1" ,DIV_PERIC4 ,4 ,8 ),DIV (none,"div_audio2" ,"mout_audio2" ,DIV_PERIC4 ,16 ,4 ),DIV (none,"div_pcm2" ,"sclk_audio2" ,DIV_PERIC4 ,20 ,8 ), -DIV (none,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), -DIV (none,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ), +DIV (div_i2s1,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), +DIV (div_i2s2,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ),DIV (sclk_pixel,"div_hdmi_pixel" ,"sclk_vpll" ,DIV_DISP1_0 ,28 ,4 ),DIV_A (none,"armclk" ,"div_arm" ,DIV_CPU0 ,28 ,3 ,"armclk" ), DIV_F(none, "div_mipi1_pre", "div_mipi1",
Signature · 1 line
1.7.4.4
Re: [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
Quoting Padmavathi Venna (2013-06-12 01:07:43)
Quoted 4 lines
This patch adds enum entries for
div_i2s1anddiv_i2s2which are required for i2s1 and i2s2 controllers.Signed-off-by Padmavathi Venna <[email protected]>
Looks good. Did you want me to take the clk patches or just gathering Acks?
Regards,
Mike
Quoted 29 lines
--- drivers/clk/samsung/clk-exynos5250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)drivers/clk/samsung/clk-exynos5250.c +3
-2@@ -87,6 +87,7 @@ enum exynos5250_clks { sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, + div_i2s1, div_i2s2,/* gate clocks */ gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0,@@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {DIV (none,"div_pcm1" ,"sclk_audio1" ,DIV_PERIC4 ,4 ,8 ),DIV (none,"div_audio2" ,"mout_audio2" ,DIV_PERIC4 ,16 ,4 ),DIV (none,"div_pcm2" ,"sclk_audio2" ,DIV_PERIC4 ,20 ,8 ), -DIV (none,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), -DIV (none,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ), +DIV (div_i2s1,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), +DIV (div_i2s2,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ),DIV (sclk_pixel,"div_hdmi_pixel" ,"sclk_vpll" ,DIV_DISP1_0 ,28 ,4 ),DIV_A (none,"armclk" ,"div_arm" ,DIV_CPU0 ,28 ,3 ,"armclk" ), DIV_F(none, "div_mipi1_pre", "div_mipi1",Signature · 1 line
1.7.4.4
Re: [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
Hi Mike,
Quoted 8 lines · Mike Turquette
Quoting Padmavathi Venna (2013-06-12 01:07:43)
Quoted 4 lines
This patch adds enum entries for
div_i2s1anddiv_i2s2which are required for i2s1 and i2s2 controllers.Signed-off-by Padmavathi Venna <[email protected]>Looks good. Did you want me to take the clk patches or just gathering Acks?
Please take the patches :).
Thanks
Padma
Quoted 33 lines
Regards,
MikeQuoted 29 lines
--- drivers/clk/samsung/clk-exynos5250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)drivers/clk/samsung/clk-exynos5250.c +3
-3@@ -87,6 +87,7 @@ enum exynos5250_clks { sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, + div_i2s1, div_i2s2,/* gate clocks */ gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0,@@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {DIV (none,"div_pcm1" ,"sclk_audio1" ,DIV_PERIC4 ,4 ,8 ),DIV (none,"div_audio2" ,"mout_audio2" ,DIV_PERIC4 ,16 ,4 ),DIV (none,"div_pcm2" ,"sclk_audio2" ,DIV_PERIC4 ,20 ,8 ), -DIV (none,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), -DIV (none,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ), +DIV (div_i2s1,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), +DIV (div_i2s2,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ),DIV (sclk_pixel,"div_hdmi_pixel" ,"sclk_vpll" ,DIV_DISP1_0 ,28 ,4 ),DIV_A (none,"armclk" ,"div_arm" ,DIV_CPU0 ,28 ,3 ,"armclk" ), DIV_F(none, "div_mipi1_pre", "div_mipi1", --1.7.4.4
Re: [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
Hi Mike,
Quoted 9 lines · Padma Venkat
Hi Mike,
Quoted 6 lines · Mike Turquette
Quoting Padmavathi Venna (2013-06-12 01:07:43)
Quoted 4 lines
This patch adds enum entries for
div_i2s1anddiv_i2s2which are required for i2s1 and i2s2 controllers.Signed-off-by Padmavathi Venna <[email protected]>
Quoted 7 lines
Quoted 2 lines
Looks good. Did you want me to take the clk patches or just gathering Acks?
Please take the patches :).
Thanks
Padma
clk related patches in this set has some dependency on arch side patches because one of the patch replaces all '/include's with '#include's and adds a header file in arch/arm/boot/include/dt-bindings/. So all these patches required to go into one tree.
Hi Kukjin,
Can you please take all these patches into samsung-tree?
Thanks
Padma
Quoted 34 lines
Quoted 34 lines
Regards,
MikeQuoted 29 lines
--- drivers/clk/samsung/clk-exynos5250.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)drivers/clk/samsung/clk-exynos5250.c +3
-3@@ -87,6 +87,7 @@ enum exynos5250_clks { sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_sata, sclk_usb3, sclk_jpeg, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_pwm, sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2, + div_i2s1, div_i2s2,/* gate clocks */ gscl0 = 256, gscl1, gscl2, gscl3, gscl_wa, gscl_wb, smmu_gscl0,@@ -291,8 +292,8 @@ struct samsung_div_clock exynos5250_div_clks[] __initdata = {DIV (none,"div_pcm1" ,"sclk_audio1" ,DIV_PERIC4 ,4 ,8 ),DIV (none,"div_audio2" ,"mout_audio2" ,DIV_PERIC4 ,16 ,4 ),DIV (none,"div_pcm2" ,"sclk_audio2" ,DIV_PERIC4 ,20 ,8 ), -DIV (none,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), -DIV (none,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ), +DIV (div_i2s1,"div_i2s1" ,"sclk_audio1" ,DIV_PERIC5 ,0 ,6 ), +DIV (div_i2s2,"div_i2s2" ,"sclk_audio2" ,DIV_PERIC5 ,8 ,6 ),DIV (sclk_pixel,"div_hdmi_pixel" ,"sclk_vpll" ,DIV_DISP1_0 ,28 ,4 ),DIV_A (none,"armclk" ,"div_arm" ,DIV_CPU0 ,28 ,3 ,"armclk" ), DIV_F(none, "div_mipi1_pre", "div_mipi1", --1.7.4.4
RE: [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
Quoted 28 lines · Padma Venkat
Hi Mike,
Quoted 3 lines · Padma Venkat
Hi Mike,
On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <[email protected]>
Quoted 6 lines · wrote:
Quoted 6 lines
Quoting Padmavathi Venna (2013-06-12 01:07:43)
Quoted 4 lines
This patch adds enum entries for
div_i2s1anddiv_i2s2which are required for i2s1 and i2s2 controllers.Signed-off-by Padmavathi Venna <[email protected]>Quoted 7 lines
Quoted 2 lines
Looks good. Did you want me to take the clk patches or just gathering Acks?
Please take the patches :).
Thanks
Padmaclk related patches in this set has some dependency on arch side patches because one of the patch replaces all '/include's with '#include's and adds a header file in
arch/arm/boot/include/dt-bindings/. So all these patches required to go into one tree.
Quoted 4 lines
Hi Kukjin,
Can you please take all these patches into samsung-tree?
Padma, sure, I will.
BTW, Mike, according to your reply, I may get your ack on 2nd and 6th clk patches...If any problems, please kindly let me know.
Thanks,
- Kukjin
Re: RE: [PATCH V6 6/6] clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
Quoting Kukjin Kim (2013-06-17 03:15:27)
Quoted 29 lines
Quoted 28 lines · Padma Venkat
Hi Mike,
Quoted 3 lines · Padma Venkat
Hi Mike,
On Wed, Jun 12, 2013 at 10:15 PM, Mike Turquette <[email protected]>
Quoted 6 lines · wrote:
Quoted 6 lines
Quoting Padmavathi Venna (2013-06-12 01:07:43)
Quoted 4 lines
This patch adds enum entries for
div_i2s1anddiv_i2s2which are required for i2s1 and i2s2 controllers.Signed-off-by Padmavathi Venna <[email protected]>Quoted 7 lines
Quoted 2 lines
Looks good. Did you want me to take the clk patches or just gathering Acks?
Please take the patches :).
Thanks
Padmaclk related patches in this set has some dependency on arch side patches because one of the patch replaces all '/include's with '#include's and adds a header file in
arch/arm/boot/include/dt-bindings/. So all these patches required to go into one tree.
Quoted 8 lines
Quoted 4 lines
Hi Kukjin,
Can you please take all these patches into samsung-tree?
Padma, sure, I will.
BTW, Mike, according to your reply, I may get your ack on 2nd and 6th clk patches...If any problems, please kindly let me know.
Fine by me.
Regards,
Mike
Quoted 3 lines
Thanks,
- Kukjin