| Message ID | 1447968149-10979-8-git-send-email-heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mike, On Friday 20 November 2015 02:52 AM, Heiko Stuebner wrote: > The otgphy clocks really only drive the phy blocks. These in turn > contain plls that then generate the 480m clocks the clock controller > uses to supply some other clocks like uart0, gpu or the video-codec. > > So fix this structure to actually respect that hirarchy and removed > that usb480m fixed-rate clock working as a placeholder till now, as > this wouldn't even work if the supplying phy gets turned off while > its pll-output gets used elsewhere. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > Reviewed-by: Douglas Anderson <dianders@chromium.org> I saw you've given your Acked-by in a previous version of this patch. Do you want me to take this in linux-phy tree? Thanks Kishon > --- > arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- > drivers/clk/rockchip/clk-rk3188.c | 11 +++-------- > drivers/clk/rockchip/clk-rk3288.c | 16 +++++----------- > 3 files changed, 9 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi > index 5e61f07..0a43e21 100644 > --- a/arch/arm/boot/dts/rk3288-veyron.dtsi > +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi > @@ -416,7 +416,7 @@ > status = "okay"; > > assigned-clocks = <&cru SCLK_USBPHY480M_SRC>; > - assigned-clock-parents = <&cru SCLK_OTGPHY0>; > + assigned-clock-parents = <&usbphy0>; > dr_mode = "host"; > }; > > diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c > index abb4760..7836a97 100644 > --- a/drivers/clk/rockchip/clk-rk3188.c > +++ b/drivers/clk/rockchip/clk-rk3188.c > @@ -319,9 +319,9 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { > * the 480m are generated inside the usb block from these clocks, > * but they are also a source for the hsicphy clock. > */ > - GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED, > + GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED, > RK2928_CLKGATE_CON(1), 5, GFLAGS), > - GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED, > + GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED, > RK2928_CLKGATE_CON(1), 6, GFLAGS), > > COMPOSITE(0, "mac_src", mux_mac_p, 0, > @@ -635,7 +635,7 @@ static struct clk_div_table div_rk3188_aclk_core_t[] = { > { /* sentinel */ }, > }; > > -PNAME(mux_hsicphy_p) = { "sclk_otgphy0", "sclk_otgphy1", > +PNAME(mux_hsicphy_p) = { "sclk_otgphy0_480m", "sclk_otgphy1_480m", > "gpll", "cpll" }; > > static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { > @@ -739,11 +739,6 @@ static void __init rk3188_common_clk_init(struct device_node *np) > pr_warn("%s: could not register clock xin12m: %ld\n", > __func__, PTR_ERR(clk)); > > - clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1); > - if (IS_ERR(clk)) > - pr_warn("%s: could not register clock usb480m: %ld\n", > - __func__, PTR_ERR(clk)); > - > rockchip_clk_register_branches(common_clk_branches, > ARRAY_SIZE(common_clk_branches)); > > diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c > index 9040878..7c8a3e9 100644 > --- a/drivers/clk/rockchip/clk-rk3288.c > +++ b/drivers/clk/rockchip/clk-rk3288.c > @@ -195,8 +195,8 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" }; > PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" }; > PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" }; > > -PNAME(mux_usbphy480m_p) = { "sclk_otgphy1", "sclk_otgphy2", > - "sclk_otgphy0" }; > +PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m", > + "sclk_otgphy0_480m" }; > PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" }; > PNAME(mux_hsicphy12m_p) = { "hsicphy12m_xin12m", "hsicphy12m_usbphy" }; > > @@ -506,11 +506,11 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { > RK3288_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS, > RK3288_CLKGATE_CON(4), 10, GFLAGS), > > - GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED, > + GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED, > RK3288_CLKGATE_CON(13), 4, GFLAGS), > - GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED, > + GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED, > RK3288_CLKGATE_CON(13), 5, GFLAGS), > - GATE(SCLK_OTGPHY2, "sclk_otgphy2", "usb480m", CLK_IGNORE_UNUSED, > + GATE(SCLK_OTGPHY2, "sclk_otgphy2", "xin24m", CLK_IGNORE_UNUSED, > RK3288_CLKGATE_CON(13), 6, GFLAGS), > GATE(SCLK_OTG_ADP, "sclk_otg_adp", "xin32k", CLK_IGNORE_UNUSED, > RK3288_CLKGATE_CON(13), 7, GFLAGS), > @@ -874,12 +874,6 @@ static void __init rk3288_clk_init(struct device_node *np) > pr_warn("%s: could not register clock xin12m: %ld\n", > __func__, PTR_ERR(clk)); > > - > - clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1); > - if (IS_ERR(clk)) > - pr_warn("%s: could not register clock usb480m: %ld\n", > - __func__, PTR_ERR(clk)); > - > clk = clk_register_fixed_factor(NULL, "hclk_vcodec_pre", > "hclk_vcodec_pre_v", 0, 1, 4); > if (IS_ERR(clk)) >
Hi Kishon, Am Dienstag, 15. Dezember 2015, 16:22:32 schrieb Kishon Vijay Abraham I: > On Friday 20 November 2015 02:52 AM, Heiko Stuebner wrote: > > The otgphy clocks really only drive the phy blocks. These in turn > > contain plls that then generate the 480m clocks the clock controller > > uses to supply some other clocks like uart0, gpu or the video-codec. > > > > So fix this structure to actually respect that hirarchy and removed > > that usb480m fixed-rate clock working as a placeholder till now, as > > this wouldn't even work if the supplying phy gets turned off while > > its pll-output gets used elsewhere. > > > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > > Reviewed-by: Douglas Anderson <dianders@chromium.org> > > I saw you've given your Acked-by in a previous version of this patch. > Do you want me to take this in linux-phy tree? from my POV, this series should probably go through your tree in one go, as this patch depends on the newly exposed clocks from the previous patch. So to keep bisectability, it should most likely stay together. Heiko
Hi, On Saturday 19 December 2015 10:51 PM, Heiko Stübner wrote: > Hi Kishon, > > Am Dienstag, 15. Dezember 2015, 16:22:32 schrieb Kishon Vijay Abraham I: >> On Friday 20 November 2015 02:52 AM, Heiko Stuebner wrote: >>> The otgphy clocks really only drive the phy blocks. These in turn >>> contain plls that then generate the 480m clocks the clock controller >>> uses to supply some other clocks like uart0, gpu or the video-codec. >>> >>> So fix this structure to actually respect that hirarchy and removed >>> that usb480m fixed-rate clock working as a placeholder till now, as >>> this wouldn't even work if the supplying phy gets turned off while >>> its pll-output gets used elsewhere. >>> >>> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >>> Reviewed-by: Douglas Anderson <dianders@chromium.org> >> >> I saw you've given your Acked-by in a previous version of this patch. >> Do you want me to take this in linux-phy tree? > > from my POV, this series should probably go through your tree in one go, as > this patch depends on the newly exposed clocks from the previous patch. So to > keep bisectability, it should most likely stay together. I agree. But I can't take another subsystem patch without getting a clear nod from the maintainer. I'll wait till tomorrow for Turquette to give his Acked-by. Thanks Kishon
Kishon, Am Donnerstag, 19. November 2015, 22:22:28 schrieb Heiko Stuebner: > The otgphy clocks really only drive the phy blocks. These in turn > contain plls that then generate the 480m clocks the clock controller > uses to supply some other clocks like uart0, gpu or the video-codec. > > So fix this structure to actually respect that hirarchy and removed > that usb480m fixed-rate clock working as a placeholder till now, as > this wouldn't even work if the supplying phy gets turned off while > its pll-output gets used elsewhere. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > Reviewed-by: Douglas Anderson <dianders@chromium.org> it looks like this patch didn't make your cutoff time for sending your stuff to Greg. As the core phy series up to patch 5 is in mainline now, I've just applied this patch to my clk-branch for 4.6. Heiko
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 5e61f07..0a43e21 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -416,7 +416,7 @@ status = "okay"; assigned-clocks = <&cru SCLK_USBPHY480M_SRC>; - assigned-clock-parents = <&cru SCLK_OTGPHY0>; + assigned-clock-parents = <&usbphy0>; dr_mode = "host"; }; diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index abb4760..7836a97 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -319,9 +319,9 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { * the 480m are generated inside the usb block from these clocks, * but they are also a source for the hsicphy clock. */ - GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED, + GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(1), 5, GFLAGS), - GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED, + GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(1), 6, GFLAGS), COMPOSITE(0, "mac_src", mux_mac_p, 0, @@ -635,7 +635,7 @@ static struct clk_div_table div_rk3188_aclk_core_t[] = { { /* sentinel */ }, }; -PNAME(mux_hsicphy_p) = { "sclk_otgphy0", "sclk_otgphy1", +PNAME(mux_hsicphy_p) = { "sclk_otgphy0_480m", "sclk_otgphy1_480m", "gpll", "cpll" }; static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { @@ -739,11 +739,6 @@ static void __init rk3188_common_clk_init(struct device_node *np) pr_warn("%s: could not register clock xin12m: %ld\n", __func__, PTR_ERR(clk)); - clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1); - if (IS_ERR(clk)) - pr_warn("%s: could not register clock usb480m: %ld\n", - __func__, PTR_ERR(clk)); - rockchip_clk_register_branches(common_clk_branches, ARRAY_SIZE(common_clk_branches)); diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c index 9040878..7c8a3e9 100644 --- a/drivers/clk/rockchip/clk-rk3288.c +++ b/drivers/clk/rockchip/clk-rk3288.c @@ -195,8 +195,8 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" }; PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" }; PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" }; -PNAME(mux_usbphy480m_p) = { "sclk_otgphy1", "sclk_otgphy2", - "sclk_otgphy0" }; +PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m", + "sclk_otgphy0_480m" }; PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" }; PNAME(mux_hsicphy12m_p) = { "hsicphy12m_xin12m", "hsicphy12m_usbphy" }; @@ -506,11 +506,11 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = { RK3288_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS, RK3288_CLKGATE_CON(4), 10, GFLAGS), - GATE(SCLK_OTGPHY0, "sclk_otgphy0", "usb480m", CLK_IGNORE_UNUSED, + GATE(SCLK_OTGPHY0, "sclk_otgphy0", "xin24m", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(13), 4, GFLAGS), - GATE(SCLK_OTGPHY1, "sclk_otgphy1", "usb480m", CLK_IGNORE_UNUSED, + GATE(SCLK_OTGPHY1, "sclk_otgphy1", "xin24m", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(13), 5, GFLAGS), - GATE(SCLK_OTGPHY2, "sclk_otgphy2", "usb480m", CLK_IGNORE_UNUSED, + GATE(SCLK_OTGPHY2, "sclk_otgphy2", "xin24m", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(13), 6, GFLAGS), GATE(SCLK_OTG_ADP, "sclk_otg_adp", "xin32k", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(13), 7, GFLAGS), @@ -874,12 +874,6 @@ static void __init rk3288_clk_init(struct device_node *np) pr_warn("%s: could not register clock xin12m: %ld\n", __func__, PTR_ERR(clk)); - - clk = clk_register_fixed_factor(NULL, "usb480m", "xin24m", 0, 20, 1); - if (IS_ERR(clk)) - pr_warn("%s: could not register clock usb480m: %ld\n", - __func__, PTR_ERR(clk)); - clk = clk_register_fixed_factor(NULL, "hclk_vcodec_pre", "hclk_vcodec_pre_v", 0, 1, 4); if (IS_ERR(clk))