* [PATCH RESEND v2 0/4] Add Cygnus audio clock support
@ 2016-01-27 1:18 Ray Jui
2016-01-27 1:18 ` [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock Ray Jui
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Ray Jui @ 2016-01-27 1:18 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd
Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai, Ray Jui
This patch series adds support for the Cygnus audio clock based on existing
iProc clock support
I re-applied this patch series to v4.5-rc1. Full kernel tree is available from
GITHUB:
repo: https://github.com/Broadcom/cygnus-linux.git
branch: cygnus-audio-clk-v2
Changes from v1:
- Remove function prototype of a non-exist function 'iproc_audiopll_clk_setup'
- Remove __init macros from all functions prototypes in iproc-clk.h
Ray Jui (1):
clk: iproc: Remove __init from header
Simran Rai (3):
Documentation: dt-bindings: Add DT bindings for Cygnus audio clock
clk: iproc: Add support for Cygnus audio clocks
ARM: dts: enable audio clock support for Cygnus
.../bindings/clock/brcm,iproc-clocks.txt | 6 +++
arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 9 ++++
drivers/clk/bcm/clk-cygnus.c | 59 ++++++++++++++++++++++
drivers/clk/bcm/clk-iproc-pll.c | 41 +++++++++++++--
drivers/clk/bcm/clk-iproc.h | 43 ++++++++++++----
include/dt-bindings/clock/bcm-cygnus.h | 6 +++
6 files changed, 148 insertions(+), 16 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock 2016-01-27 1:18 [PATCH RESEND v2 0/4] Add Cygnus audio clock support Ray Jui @ 2016-01-27 1:18 ` Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks Ray Jui ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: Ray Jui @ 2016-01-27 1:18 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai, Ray Jui From: Simran Rai <ssimran@broadcom.com> This patch adds audio clock device tree binding documentation to an existing Cygnus clock DT bindings document. Signed-off-by: Simran Rai <ssimran@broadcom.com> Reviewed-by: Ray Jui <rjui@broadcom.com> Reviewed-by: Lori Hikichi <lhikichi@broadcom.com> Reviewed-by: Scott Branden <sbranden@broadcom.com> --- Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt index 0b35e71..6f66e9a 100644 --- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt +++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt @@ -92,6 +92,7 @@ PLL and leaf clock compatible strings for Cygnus are: "brcm,cygnus-lcpll0" "brcm,cygnus-mipipll" "brcm,cygnus-asiu-clk" + "brcm,cygnus-audiopll" The following table defines the set of PLL/clock index and ID for Cygnus. These clock IDs are defined in: @@ -131,6 +132,11 @@ These clock IDs are defined in: ch4_unused mipipll 5 BCM_CYGNUS_MIPIPLL_CH4_UNUSED ch5_unused mipipll 6 BCM_CYGNUS_MIPIPLL_CH5_UNUSED + audiopll crystal 0 BCM_CYGNUS_AUDIOPLL + ch0_audio audiopll 1 BCM_CYGNUS_AUDIOPLL_CH0 + ch1_audio audiopll 2 BCM_CYGNUS_AUDIOPLL_CH1 + ch2_audio audiopll 3 BCM_CYGNUS_AUDIOPLL_CH2 + Northstar and Northstar Plus ------ PLL and leaf clock compatible strings for Northstar and Northstar Plus are: -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock 2016-01-27 1:18 ` [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock Ray Jui @ 2016-01-30 0:33 ` Stephen Boyd 0 siblings, 0 replies; 10+ messages in thread From: Stephen Boyd @ 2016-01-30 0:33 UTC (permalink / raw) To: Ray Jui Cc: Michael Turquette, linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai On 01/26, Ray Jui wrote: > From: Simran Rai <ssimran@broadcom.com> > > This patch adds audio clock device tree binding documentation to an > existing Cygnus clock DT bindings document. > > Signed-off-by: Simran Rai <ssimran@broadcom.com> > Reviewed-by: Ray Jui <rjui@broadcom.com> > Reviewed-by: Lori Hikichi <lhikichi@broadcom.com> > Reviewed-by: Scott Branden <sbranden@broadcom.com> > --- Applied to clk-iproc -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks 2016-01-27 1:18 [PATCH RESEND v2 0/4] Add Cygnus audio clock support Ray Jui 2016-01-27 1:18 ` [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock Ray Jui @ 2016-01-27 1:18 ` Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header Ray Jui 2016-01-27 1:18 ` [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus Ray Jui 3 siblings, 1 reply; 10+ messages in thread From: Ray Jui @ 2016-01-27 1:18 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai, Ray Jui From: Simran Rai <ssimran@broadcom.com> This patch adds support for Broadcom Cygnus audio PLL and leaf clocks Signed-off-by: Simran Rai <ssimran@broadcom.com> Reviewed-by: Scott Branden <sbranden@broadcom.com> Signed-off-by: Ray Jui <rjui@broadcom.com> --- drivers/clk/bcm/clk-cygnus.c | 59 ++++++++++++++++++++++++++++++++++ drivers/clk/bcm/clk-iproc-pll.c | 41 ++++++++++++++++++++--- drivers/clk/bcm/clk-iproc.h | 21 ++++++++++++ include/dt-bindings/clock/bcm-cygnus.h | 6 ++++ 4 files changed, 122 insertions(+), 5 deletions(-) diff --git a/drivers/clk/bcm/clk-cygnus.c b/drivers/clk/bcm/clk-cygnus.c index 3a228b6..464fdc4 100644 --- a/drivers/clk/bcm/clk-cygnus.c +++ b/drivers/clk/bcm/clk-cygnus.c @@ -268,3 +268,62 @@ static void __init cygnus_asiu_init(struct device_node *node) iproc_asiu_setup(node, asiu_div, asiu_gate, ARRAY_SIZE(asiu_div)); } CLK_OF_DECLARE(cygnus_asiu_clk, "brcm,cygnus-asiu-clk", cygnus_asiu_init); + +/* + * AUDIO PLL VCO frequency parameter table + * + * PLL output frequency = ((ndiv_int + ndiv_frac / 2^20) * + * (parent clock rate / pdiv) + * + * On Cygnus, parent is the 25MHz oscillator + */ +static const struct iproc_pll_vco_param audiopll_vco_params[] = { + /* rate (Hz) ndiv_int ndiv_frac pdiv */ + { 1354750204UL, 54, 199238, 1 }, + { 1769470191UL, 70, 816639, 1 }, +}; + +static const struct iproc_pll_ctrl audiopll = { + .flags = IPROC_CLK_PLL_NEEDS_SW_CFG | IPROC_CLK_PLL_HAS_NDIV_FRAC | + IPROC_CLK_PLL_USER_MODE_ON | IPROC_CLK_PLL_RESET_ACTIVE_LOW, + .reset = RESET_VAL(0x5c, 0, 1), + .dig_filter = DF_VAL(0x48, 0, 3, 6, 4, 3, 3), + .sw_ctrl = SW_CTRL_VAL(0x4, 0), + .ndiv_int = REG_VAL(0x8, 0, 10), + .ndiv_frac = REG_VAL(0x8, 10, 20), + .pdiv = REG_VAL(0x44, 0, 4), + .vco_ctrl = VCO_CTRL_VAL(0x0c, 0x10), + .status = REG_VAL(0x54, 0, 1), + .macro_mode = REG_VAL(0x0, 0, 3), +}; + +static const struct iproc_clk_ctrl audiopll_clk[] = { + [BCM_CYGNUS_AUDIOPLL_CH0] = { + .channel = BCM_CYGNUS_AUDIOPLL_CH0, + .flags = IPROC_CLK_AON | + IPROC_CLK_MCLK_DIV_BY_2, + .enable = ENABLE_VAL(0x14, 8, 10, 9), + .mdiv = REG_VAL(0x14, 0, 8), + }, + [BCM_CYGNUS_AUDIOPLL_CH1] = { + .channel = BCM_CYGNUS_AUDIOPLL_CH1, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x18, 8, 10, 9), + .mdiv = REG_VAL(0x18, 0, 8), + }, + [BCM_CYGNUS_AUDIOPLL_CH2] = { + .channel = BCM_CYGNUS_AUDIOPLL_CH2, + .flags = IPROC_CLK_AON, + .enable = ENABLE_VAL(0x1c, 8, 10, 9), + .mdiv = REG_VAL(0x1c, 0, 8), + }, +}; + +static void __init cygnus_audiopll_clk_init(struct device_node *node) +{ + iproc_pll_clk_setup(node, &audiopll, audiopll_vco_params, + ARRAY_SIZE(audiopll_vco_params), audiopll_clk, + ARRAY_SIZE(audiopll_clk)); +} +CLK_OF_DECLARE(cygnus_audiopll, "brcm,cygnus-audiopll", + cygnus_audiopll_clk_init); diff --git a/drivers/clk/bcm/clk-iproc-pll.c b/drivers/clk/bcm/clk-iproc-pll.c index afd5891..fd492a5 100644 --- a/drivers/clk/bcm/clk-iproc-pll.c +++ b/drivers/clk/bcm/clk-iproc-pll.c @@ -25,6 +25,12 @@ #define PLL_VCO_HIGH_SHIFT 19 #define PLL_VCO_LOW_SHIFT 30 +/* + * PLL MACRO_SELECT modes 0 to 5 choose pre-calculated PLL output frequencies + * from a look-up table. Mode 7 allows user to manipulate PLL clock dividers + */ +#define PLL_USER_MODE 7 + /* number of delay loops waiting for PLL to lock */ #define LOCK_DELAY 100 @@ -215,7 +221,10 @@ static void __pll_put_in_reset(struct iproc_pll *pll) const struct iproc_pll_reset_ctrl *reset = &ctrl->reset; val = readl(pll->control_base + reset->offset); - val &= ~(1 << reset->reset_shift | 1 << reset->p_reset_shift); + if (ctrl->flags & IPROC_CLK_PLL_RESET_ACTIVE_LOW) + val |= BIT(reset->reset_shift) | BIT(reset->p_reset_shift); + else + val &= ~(BIT(reset->reset_shift) | BIT(reset->p_reset_shift)); iproc_pll_write(pll, pll->control_base, reset->offset, val); } @@ -236,7 +245,10 @@ static void __pll_bring_out_reset(struct iproc_pll *pll, unsigned int kp, iproc_pll_write(pll, pll->control_base, dig_filter->offset, val); val = readl(pll->control_base + reset->offset); - val |= 1 << reset->reset_shift | 1 << reset->p_reset_shift; + if (ctrl->flags & IPROC_CLK_PLL_RESET_ACTIVE_LOW) + val &= ~(BIT(reset->reset_shift) | BIT(reset->p_reset_shift)); + else + val |= BIT(reset->reset_shift) | BIT(reset->p_reset_shift); iproc_pll_write(pll, pll->control_base, reset->offset, val); } @@ -292,6 +304,16 @@ static int pll_set_rate(struct iproc_clk *clk, unsigned int rate_index, /* put PLL in reset */ __pll_put_in_reset(pll); + /* set PLL in user mode before modifying PLL controls */ + if (ctrl->flags & IPROC_CLK_PLL_USER_MODE_ON) { + val = readl(pll->control_base + ctrl->macro_mode.offset); + val &= ~(bit_mask(ctrl->macro_mode.width) << + ctrl->macro_mode.shift); + val |= PLL_USER_MODE << ctrl->macro_mode.shift; + iproc_pll_write(pll, pll->control_base, + ctrl->macro_mode.offset, val); + } + iproc_pll_write(pll, pll->control_base, ctrl->vco_ctrl.u_offset, 0); val = readl(pll->control_base + ctrl->vco_ctrl.l_offset); @@ -505,7 +527,10 @@ static unsigned long iproc_clk_recalc_rate(struct clk_hw *hw, if (mdiv == 0) mdiv = 256; - clk->rate = parent_rate / mdiv; + if (ctrl->flags & IPROC_CLK_MCLK_DIV_BY_2) + clk->rate = parent_rate / (mdiv * 2); + else + clk->rate = parent_rate / mdiv; return clk->rate; } @@ -543,7 +568,10 @@ static int iproc_clk_set_rate(struct clk_hw *hw, unsigned long rate, if (rate == 0 || parent_rate == 0) return -EINVAL; - div = DIV_ROUND_UP(parent_rate, rate); + if (ctrl->flags & IPROC_CLK_MCLK_DIV_BY_2) + div = DIV_ROUND_UP(parent_rate, rate * 2); + else + div = DIV_ROUND_UP(parent_rate, rate); if (div > 256) return -EINVAL; @@ -555,7 +583,10 @@ static int iproc_clk_set_rate(struct clk_hw *hw, unsigned long rate, val |= div << ctrl->mdiv.shift; } iproc_pll_write(pll, pll->control_base, ctrl->mdiv.offset, val); - clk->rate = parent_rate / div; + if (ctrl->flags & IPROC_CLK_MCLK_DIV_BY_2) + clk->rate = parent_rate / (div * 2); + else + clk->rate = parent_rate / div; return 0; } diff --git a/drivers/clk/bcm/clk-iproc.h b/drivers/clk/bcm/clk-iproc.h index 8988de7..febae11 100644 --- a/drivers/clk/bcm/clk-iproc.h +++ b/drivers/clk/bcm/clk-iproc.h @@ -61,6 +61,26 @@ #define IPROC_CLK_PLL_SPLIT_STAT_CTRL BIT(6) /* + * Some PLLs have an additional divide by 2 in master clock calculation; + * MCLK = VCO_freq / (Mdiv * 2). Identify this to let the driver know + * of modified calculations + */ +#define IPROC_CLK_MCLK_DIV_BY_2 BIT(7) + +/* + * Some PLLs provide a look up table for the leaf clock frequencies and + * auto calculates VCO frequency parameters based on the provided leaf + * clock frequencies. They have a user mode that allows the divider + * controls to be determined by the user + */ +#define IPROC_CLK_PLL_USER_MODE_ON BIT(8) + +/* + * Some PLLs have an active low reset + */ +#define IPROC_CLK_PLL_RESET_ACTIVE_LOW BIT(9) + +/* * Parameters for VCO frequency configuration * * VCO frequency = @@ -149,6 +169,7 @@ struct iproc_pll_ctrl { struct iproc_clk_reg_op pdiv; struct iproc_pll_vco_ctrl vco_ctrl; struct iproc_clk_reg_op status; + struct iproc_clk_reg_op macro_mode; }; /* diff --git a/include/dt-bindings/clock/bcm-cygnus.h b/include/dt-bindings/clock/bcm-cygnus.h index 32fbc47..62ac5d7 100644 --- a/include/dt-bindings/clock/bcm-cygnus.h +++ b/include/dt-bindings/clock/bcm-cygnus.h @@ -65,4 +65,10 @@ #define BCM_CYGNUS_ASIU_ADC_CLK 1 #define BCM_CYGNUS_ASIU_PWM_CLK 2 +/* AUDIO clock ID */ +#define BCM_CYGNUS_AUDIOPLL 0 +#define BCM_CYGNUS_AUDIOPLL_CH0 1 +#define BCM_CYGNUS_AUDIOPLL_CH1 2 +#define BCM_CYGNUS_AUDIOPLL_CH2 3 + #endif /* _CLOCK_BCM_CYGNUS_H */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks 2016-01-27 1:18 ` [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks Ray Jui @ 2016-01-30 0:33 ` Stephen Boyd 0 siblings, 0 replies; 10+ messages in thread From: Stephen Boyd @ 2016-01-30 0:33 UTC (permalink / raw) To: Ray Jui Cc: Michael Turquette, linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai On 01/26, Ray Jui wrote: > From: Simran Rai <ssimran@broadcom.com> > > This patch adds support for Broadcom Cygnus audio PLL and leaf > clocks > > Signed-off-by: Simran Rai <ssimran@broadcom.com> > Reviewed-by: Scott Branden <sbranden@broadcom.com> > Signed-off-by: Ray Jui <rjui@broadcom.com> > --- Applied to clk-iproc -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header 2016-01-27 1:18 [PATCH RESEND v2 0/4] Add Cygnus audio clock support Ray Jui 2016-01-27 1:18 ` [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock Ray Jui 2016-01-27 1:18 ` [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks Ray Jui @ 2016-01-27 1:18 ` Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus Ray Jui 3 siblings, 1 reply; 10+ messages in thread From: Ray Jui @ 2016-01-27 1:18 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai, Ray Jui Remove __init macro from all function prototypes in clk-iproc.h Signed-off-by: Ray Jui <rjui@broadcom.com> --- drivers/clk/bcm/clk-iproc.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/clk/bcm/clk-iproc.h b/drivers/clk/bcm/clk-iproc.h index febae11..2148b4e 100644 --- a/drivers/clk/bcm/clk-iproc.h +++ b/drivers/clk/bcm/clk-iproc.h @@ -204,16 +204,16 @@ struct iproc_asiu_div { unsigned int low_width; }; -void __init iproc_armpll_setup(struct device_node *node); -void __init iproc_pll_clk_setup(struct device_node *node, - const struct iproc_pll_ctrl *pll_ctrl, - const struct iproc_pll_vco_param *vco, - unsigned int num_vco_entries, - const struct iproc_clk_ctrl *clk_ctrl, - unsigned int num_clks); -void __init iproc_asiu_setup(struct device_node *node, - const struct iproc_asiu_div *div, - const struct iproc_asiu_gate *gate, - unsigned int num_clks); +void iproc_armpll_setup(struct device_node *node); +void iproc_pll_clk_setup(struct device_node *node, + const struct iproc_pll_ctrl *pll_ctrl, + const struct iproc_pll_vco_param *vco, + unsigned int num_vco_entries, + const struct iproc_clk_ctrl *clk_ctrl, + unsigned int num_clks); +void iproc_asiu_setup(struct device_node *node, + const struct iproc_asiu_div *div, + const struct iproc_asiu_gate *gate, + unsigned int num_clks); #endif /* _CLK_IPROC_H */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header 2016-01-27 1:18 ` [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header Ray Jui @ 2016-01-30 0:33 ` Stephen Boyd 0 siblings, 0 replies; 10+ messages in thread From: Stephen Boyd @ 2016-01-30 0:33 UTC (permalink / raw) To: Ray Jui Cc: Michael Turquette, linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai On 01/26, Ray Jui wrote: > Remove __init macro from all function prototypes in clk-iproc.h > > Signed-off-by: Ray Jui <rjui@broadcom.com> > --- Applied to clk-iproc -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus 2016-01-27 1:18 [PATCH RESEND v2 0/4] Add Cygnus audio clock support Ray Jui ` (2 preceding siblings ...) 2016-01-27 1:18 ` [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header Ray Jui @ 2016-01-27 1:18 ` Ray Jui 2016-01-30 0:42 ` Ray Jui 3 siblings, 1 reply; 10+ messages in thread From: Ray Jui @ 2016-01-27 1:18 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai, Ray Jui From: Simran Rai <ssimran@broadcom.com> Add audio clock to the existing Broadcom Cygnus clock DT Signed-off-by: Simran Rai <ssimran@broadcom.com> Reviewed-by: Ray Jui <rjui@broadcom.com> Reviewed-by: Scott Branden <sbranden@broadcom.com> --- arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi index 32bcd45..80b6ba4 100644 --- a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi @@ -121,4 +121,13 @@ clocks { clocks = <&osc>; clock-output-names = "keypad", "adc/touch", "pwm"; }; + + audiopll: audiopll { + #clock-cells = <1>; + compatible = "brcm,cygnus-audiopll"; + reg = <0x180aeb00 0x68>; + clocks = <&osc>; + clock-output-names = "audiopll", "ch0_audio", + "ch1_audio", "ch2_audio"; + }; }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus 2016-01-27 1:18 ` [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus Ray Jui @ 2016-01-30 0:42 ` Ray Jui 2016-02-01 0:24 ` Florian Fainelli 0 siblings, 1 reply; 10+ messages in thread From: Ray Jui @ 2016-01-30 0:42 UTC (permalink / raw) To: Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai Hi Florian, With Stephen merging the first 3 patches into the clk tree, could you please take this DT patch now? Thanks, Ray On 1/26/2016 5:18 PM, Ray Jui wrote: > From: Simran Rai <ssimran@broadcom.com> > > Add audio clock to the existing Broadcom Cygnus clock DT > > Signed-off-by: Simran Rai <ssimran@broadcom.com> > Reviewed-by: Ray Jui <rjui@broadcom.com> > Reviewed-by: Scott Branden <sbranden@broadcom.com> > --- > arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi > index 32bcd45..80b6ba4 100644 > --- a/arch/arm/boot/dts/bcm-cygnus-clock.dtsi > +++ b/arch/arm/boot/dts/bcm-cygnus-clock.dtsi > @@ -121,4 +121,13 @@ clocks { > clocks = <&osc>; > clock-output-names = "keypad", "adc/touch", "pwm"; > }; > + > + audiopll: audiopll { > + #clock-cells = <1>; > + compatible = "brcm,cygnus-audiopll"; > + reg = <0x180aeb00 0x68>; > + clocks = <&osc>; > + clock-output-names = "audiopll", "ch0_audio", > + "ch1_audio", "ch2_audio"; > + }; > }; > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus 2016-01-30 0:42 ` Ray Jui @ 2016-02-01 0:24 ` Florian Fainelli 0 siblings, 0 replies; 10+ messages in thread From: Florian Fainelli @ 2016-02-01 0:24 UTC (permalink / raw) To: Ray Jui, Michael Turquette, Stephen Boyd Cc: linux-clk, linux-kernel, bcm-kernel-feedback-list, Simran Rai Le 29/01/2016 16:42, Ray Jui a écrit : > Hi Florian, > > With Stephen merging the first 3 patches into the clk tree, could you > please take this DT patch now? > > Thanks, > > Ray > > On 1/26/2016 5:18 PM, Ray Jui wrote: >> From: Simran Rai <ssimran@broadcom.com> >> >> Add audio clock to the existing Broadcom Cygnus clock DT >> >> Signed-off-by: Simran Rai <ssimran@broadcom.com> >> Reviewed-by: Ray Jui <rjui@broadcom.com> >> Reviewed-by: Scott Branden <sbranden@broadcom.com> Applied to devicetree/next, thanks everyone! -- Florian ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-02-01 0:24 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-01-27 1:18 [PATCH RESEND v2 0/4] Add Cygnus audio clock support Ray Jui 2016-01-27 1:18 ` [PATCH RESEND v2 1/4] Documentation: dt-bindings: Add DT bindings for Cygnus audio clock Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 2/4] clk: iproc: Add support for Cygnus audio clocks Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 3/4] clk: iproc: Remove __init from header Ray Jui 2016-01-30 0:33 ` Stephen Boyd 2016-01-27 1:18 ` [PATCH RESEND v2 4/4] ARM: dts: enable audio clock support for Cygnus Ray Jui 2016-01-30 0:42 ` Ray Jui 2016-02-01 0:24 ` Florian Fainelli
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.