| Message ID | 1390315061-14441-1-git-send-email-sre@debian.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Sebastian Reichel <sre@debian.org> [140121 06:39]: > update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick > to make them consistent for omap34xx and omap36xx. This makes it > possible to reference the clocks from generic omap3 dts files. Is this needed as a fix for v3.14-rc? If so, please let me know and ack if you want me to take it. Tony > Signed-off-by: Sebastian Reichel <sre@debian.org> > --- > arch/arm/boot/dts/omap3430es1-clocks.dtsi | 10 +++++----- > arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 10 +++++----- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3430es1-clocks.dtsi b/arch/arm/boot/dts/omap3430es1-clocks.dtsi > index 02f6c7f..6f31954 100644 > --- a/arch/arm/boot/dts/omap3430es1-clocks.dtsi > +++ b/arch/arm/boot/dts/omap3430es1-clocks.dtsi > @@ -82,16 +82,16 @@ > ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>; > }; > > - ssi_ssr_fck_3430es1: ssi_ssr_fck_3430es1 { > + ssi_ssr_fck: ssi_ssr_fck_3430es1 { > #clock-cells = <0>; > compatible = "ti,composite-clock"; > clocks = <&ssi_ssr_gate_fck_3430es1>, <&ssi_ssr_div_fck_3430es1>; > }; > > - ssi_sst_fck_3430es1: ssi_sst_fck_3430es1 { > + ssi_sst_fck: ssi_sst_fck_3430es1 { > #clock-cells = <0>; > compatible = "fixed-factor-clock"; > - clocks = <&ssi_ssr_fck_3430es1>; > + clocks = <&ssi_ssr_fck>; > clock-mult = <1>; > clock-div = <2>; > }; > @@ -120,7 +120,7 @@ > clock-div = <1>; > }; > > - ssi_ick_3430es1: ssi_ick_3430es1 { > + ssi_ick: ssi_ick_3430es1 { > #clock-cells = <0>; > compatible = "ti,omap3-no-wait-interface-clock"; > clocks = <&ssi_l4_ick>; > @@ -203,6 +203,6 @@ > <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>, > <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>, > <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, > - <&fshostusb_fck>, <&fac_ick>, <&ssi_ick_3430es1>; > + <&fshostusb_fck>, <&fac_ick>, <&ssi_ick>; > }; > }; > diff --git a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi > index 8ed475d..877318c 100644 > --- a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi > +++ b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi > @@ -25,16 +25,16 @@ > ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>; > }; > > - ssi_ssr_fck_3430es2: ssi_ssr_fck_3430es2 { > + ssi_ssr_fck: ssi_ssr_fck_3430es2 { > #clock-cells = <0>; > compatible = "ti,composite-clock"; > clocks = <&ssi_ssr_gate_fck_3430es2>, <&ssi_ssr_div_fck_3430es2>; > }; > > - ssi_sst_fck_3430es2: ssi_sst_fck_3430es2 { > + ssi_sst_fck: ssi_sst_fck_3430es2 { > #clock-cells = <0>; > compatible = "fixed-factor-clock"; > - clocks = <&ssi_ssr_fck_3430es2>; > + clocks = <&ssi_ssr_fck>; > clock-mult = <1>; > clock-div = <2>; > }; > @@ -55,7 +55,7 @@ > clock-div = <1>; > }; > > - ssi_ick_3430es2: ssi_ick_3430es2 { > + ssi_ick: ssi_ick_3430es2 { > #clock-cells = <0>; > compatible = "ti,omap3-ssi-interface-clock"; > clocks = <&ssi_l4_ick>; > @@ -193,6 +193,6 @@ > <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>, > <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>, > <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, > - <&ssi_ick_3430es2>; > + <&ssi_ick>; > }; > }; > -- > 1.8.5.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Feb 13, 2014 at 02:49:14PM -0800, Tony Lindgren wrote: > * Sebastian Reichel <sre@debian.org> [140121 06:39]: > > update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick > > to make them consistent for omap34xx and omap36xx. This makes it > > possible to reference the clocks from generic omap3 dts files. > > Is this needed as a fix for v3.14-rc? If so, please let me know > and ack if you want me to take it. The SSI driver will not arrive before 3.15 and 3.14 dts files do not contain any SSI nodes. Thus it should be enough to queue it for 3.15 if it goes via the same tree as the SSI dts patches. -- Sebastian
On 02/14/2014 03:25 AM, Sebastian Reichel wrote: > On Thu, Feb 13, 2014 at 02:49:14PM -0800, Tony Lindgren wrote: >> * Sebastian Reichel <sre@debian.org> [140121 06:39]: >>> update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick >>> to make them consistent for omap34xx and omap36xx. This makes it >>> possible to reference the clocks from generic omap3 dts files. >> >> Is this needed as a fix for v3.14-rc? If so, please let me know >> and ack if you want me to take it. > > The SSI driver will not arrive before 3.15 and 3.14 dts files do not > contain any SSI nodes. > > Thus it should be enough to queue it for 3.15 if it goes via the > same tree as the SSI dts patches. > > -- Sebastian > The patch itself looks good to me, so acked. -Tero -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Tero Kristo <t-kristo@ti.com> [140214 05:50]: > On 02/14/2014 03:25 AM, Sebastian Reichel wrote: > >On Thu, Feb 13, 2014 at 02:49:14PM -0800, Tony Lindgren wrote: > >>* Sebastian Reichel <sre@debian.org> [140121 06:39]: > >>>update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick > >>>to make them consistent for omap34xx and omap36xx. This makes it > >>>possible to reference the clocks from generic omap3 dts files. > >> > >>Is this needed as a fix for v3.14-rc? If so, please let me know > >>and ack if you want me to take it. > > > >The SSI driver will not arrive before 3.15 and 3.14 dts files do not > >contain any SSI nodes. > > > >Thus it should be enough to queue it for 3.15 if it goes via the > >same tree as the SSI dts patches. > > > >-- Sebastian > > > > The patch itself looks good to me, so acked. Thanks applying into omap-for-v3.15/dt with Tero's ack. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/omap3430es1-clocks.dtsi b/arch/arm/boot/dts/omap3430es1-clocks.dtsi index 02f6c7f..6f31954 100644 --- a/arch/arm/boot/dts/omap3430es1-clocks.dtsi +++ b/arch/arm/boot/dts/omap3430es1-clocks.dtsi @@ -82,16 +82,16 @@ ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>; }; - ssi_ssr_fck_3430es1: ssi_ssr_fck_3430es1 { + ssi_ssr_fck: ssi_ssr_fck_3430es1 { #clock-cells = <0>; compatible = "ti,composite-clock"; clocks = <&ssi_ssr_gate_fck_3430es1>, <&ssi_ssr_div_fck_3430es1>; }; - ssi_sst_fck_3430es1: ssi_sst_fck_3430es1 { + ssi_sst_fck: ssi_sst_fck_3430es1 { #clock-cells = <0>; compatible = "fixed-factor-clock"; - clocks = <&ssi_ssr_fck_3430es1>; + clocks = <&ssi_ssr_fck>; clock-mult = <1>; clock-div = <2>; }; @@ -120,7 +120,7 @@ clock-div = <1>; }; - ssi_ick_3430es1: ssi_ick_3430es1 { + ssi_ick: ssi_ick_3430es1 { #clock-cells = <0>; compatible = "ti,omap3-no-wait-interface-clock"; clocks = <&ssi_l4_ick>; @@ -203,6 +203,6 @@ <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>, <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>, <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, - <&fshostusb_fck>, <&fac_ick>, <&ssi_ick_3430es1>; + <&fshostusb_fck>, <&fac_ick>, <&ssi_ick>; }; }; diff --git a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi index 8ed475d..877318c 100644 --- a/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi +++ b/arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi @@ -25,16 +25,16 @@ ti,dividers = <0>, <1>, <2>, <3>, <4>, <0>, <6>, <0>, <8>; }; - ssi_ssr_fck_3430es2: ssi_ssr_fck_3430es2 { + ssi_ssr_fck: ssi_ssr_fck_3430es2 { #clock-cells = <0>; compatible = "ti,composite-clock"; clocks = <&ssi_ssr_gate_fck_3430es2>, <&ssi_ssr_div_fck_3430es2>; }; - ssi_sst_fck_3430es2: ssi_sst_fck_3430es2 { + ssi_sst_fck: ssi_sst_fck_3430es2 { #clock-cells = <0>; compatible = "fixed-factor-clock"; - clocks = <&ssi_ssr_fck_3430es2>; + clocks = <&ssi_ssr_fck>; clock-mult = <1>; clock-div = <2>; }; @@ -55,7 +55,7 @@ clock-div = <1>; }; - ssi_ick_3430es2: ssi_ick_3430es2 { + ssi_ick: ssi_ick_3430es2 { #clock-cells = <0>; compatible = "ti,omap3-ssi-interface-clock"; clocks = <&ssi_l4_ick>; @@ -193,6 +193,6 @@ <&i2c1_ick>, <&uart2_ick>, <&uart1_ick>, <&gpt11_ick>, <&gpt10_ick>, <&mcbsp5_ick>, <&mcbsp1_ick>, <&omapctrl_ick>, <&aes2_ick>, <&sha12_ick>, - <&ssi_ick_3430es2>; + <&ssi_ick>; }; };
update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick to make them consistent for omap34xx and omap36xx. This makes it possible to reference the clocks from generic omap3 dts files. Signed-off-by: Sebastian Reichel <sre@debian.org> --- arch/arm/boot/dts/omap3430es1-clocks.dtsi | 10 +++++----- arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)