| Message ID | 20170802093429.12572-5-jonas.gorski@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Aug 02, 2017 at 11:34:25AM +0200, Jonas Gorski wrote: > Codify using a named clock for the refclk of the uart. This makes it > easier if we might need to add a gating clock (like present on the > BCM6345). > > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> > --- > Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ > drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Greg, On 2 August 2017 at 11:34, Jonas Gorski <jonas.gorski@gmail.com> wrote: > Codify using a named clock for the refclk of the uart. This makes it > easier if we might need to add a gating clock (like present on the > BCM6345). > > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Could I please get a (N)Ack so Ralf can add this patch to his tree? Regards Jonas > --- > Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ > drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > index 5c52e5eef16d..8b2b0460259a 100644 > --- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > +++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > @@ -11,6 +11,11 @@ Required properties: > - clocks: Clock driving the hardware; used to figure out the baud rate > divisor. > > + > +Optional properties: > + > +- clock-names: Should be "refclk". > + > Example: > > uart0: serial@14e00520 { > @@ -19,6 +24,7 @@ Example: > interrupt-parent = <&periph_intc>; > interrupts = <2>; > clocks = <&periph_clk>; > + clock-names = "refclk"; > }; > > clocks { > diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c > index a2b9376ec861..f227eff28d3a 100644 > --- a/drivers/tty/serial/bcm63xx_uart.c > +++ b/drivers/tty/serial/bcm63xx_uart.c > @@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platform_device *pdev) > if (!res_irq) > return -ENODEV; > > - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : > - clk_get(&pdev->dev, "refclk"); > + clk = clk_get(&pdev->dev, "refclk"); > + if (IS_ERR(clk) && pdev->dev.of_node) > + clk = of_clk_get(pdev->dev.of_node, 0); > + > if (IS_ERR(clk)) > return -ENODEV; > > -- > 2.13.2 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 06, 2017 at 01:01:32PM +0200, Jonas Gorski wrote: > Hi Greg, > > On 2 August 2017 at 11:34, Jonas Gorski <jonas.gorski@gmail.com> wrote: > > Codify using a named clock for the refclk of the uart. This makes it > > easier if we might need to add a gating clock (like present on the > > BCM6345). > > > > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> > > Could I please get a (N)Ack so Ralf can add this patch to his tree? > > > Regards > Jonas > > > > --- > > Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ > > drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- > > 2 files changed, 10 insertions(+), 2 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > > index 5c52e5eef16d..8b2b0460259a 100644 > > --- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > > +++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt > > @@ -11,6 +11,11 @@ Required properties: > > - clocks: Clock driving the hardware; used to figure out the baud rate > > divisor. > > > > + > > +Optional properties: > > + > > +- clock-names: Should be "refclk". > > + > > Example: > > > > uart0: serial@14e00520 { > > @@ -19,6 +24,7 @@ Example: > > interrupt-parent = <&periph_intc>; > > interrupts = <2>; > > clocks = <&periph_clk>; > > + clock-names = "refclk"; > > }; > > > > clocks { I don't ack devtree changes :) > > diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c > > index a2b9376ec861..f227eff28d3a 100644 > > --- a/drivers/tty/serial/bcm63xx_uart.c > > +++ b/drivers/tty/serial/bcm63xx_uart.c > > @@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platform_device *pdev) > > if (!res_irq) > > return -ENODEV; > > > > - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : > > - clk_get(&pdev->dev, "refclk"); > > + clk = clk_get(&pdev->dev, "refclk"); > > + if (IS_ERR(clk) && pdev->dev.of_node) > > + clk = of_clk_get(pdev->dev.of_node, 0); > > + > > if (IS_ERR(clk)) > > return -ENODEV; > > This part is fine with me: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 6 September 2017 at 14:17, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > On Wed, Sep 06, 2017 at 01:01:32PM +0200, Jonas Gorski wrote: >> Hi Greg, >> >> On 2 August 2017 at 11:34, Jonas Gorski <jonas.gorski@gmail.com> wrote: >> > Codify using a named clock for the refclk of the uart. This makes it >> > easier if we might need to add a gating clock (like present on the >> > BCM6345). >> > >> > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> >> >> Could I please get a (N)Ack so Ralf can add this patch to his tree? >> >> >> Regards >> Jonas >> >> >> > --- >> > Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ >> > drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- >> > 2 files changed, 10 insertions(+), 2 deletions(-) >> > >> > diff --git a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt >> > index 5c52e5eef16d..8b2b0460259a 100644 >> > --- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt >> > +++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt >> > @@ -11,6 +11,11 @@ Required properties: >> > - clocks: Clock driving the hardware; used to figure out the baud rate >> > divisor. >> > >> > + >> > +Optional properties: >> > + >> > +- clock-names: Should be "refclk". >> > + >> > Example: >> > >> > uart0: serial@14e00520 { >> > @@ -19,6 +24,7 @@ Example: >> > interrupt-parent = <&periph_intc>; >> > interrupts = <2>; >> > clocks = <&periph_clk>; >> > + clock-names = "refclk"; >> > }; >> > >> > clocks { > > I don't ack devtree changes :) > >> > diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c >> > index a2b9376ec861..f227eff28d3a 100644 >> > --- a/drivers/tty/serial/bcm63xx_uart.c >> > +++ b/drivers/tty/serial/bcm63xx_uart.c >> > @@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platform_device *pdev) >> > if (!res_irq) >> > return -ENODEV; >> > >> > - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : >> > - clk_get(&pdev->dev, "refclk"); >> > + clk = clk_get(&pdev->dev, "refclk"); >> > + if (IS_ERR(clk) && pdev->dev.of_node) >> > + clk = of_clk_get(pdev->dev.of_node, 0); >> > + >> > if (IS_ERR(clk)) >> > return -ENODEV; >> > > > This part is fine with me: That's all I wanted :) > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thank you! Jonas -- To unsubscribe from this list: send the line "unsubscribe devicetree" 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/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt index 5c52e5eef16d..8b2b0460259a 100644 --- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt +++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt @@ -11,6 +11,11 @@ Required properties: - clocks: Clock driving the hardware; used to figure out the baud rate divisor. + +Optional properties: + +- clock-names: Should be "refclk". + Example: uart0: serial@14e00520 { @@ -19,6 +24,7 @@ Example: interrupt-parent = <&periph_intc>; interrupts = <2>; clocks = <&periph_clk>; + clock-names = "refclk"; }; clocks { diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index a2b9376ec861..f227eff28d3a 100644 --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c @@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platform_device *pdev) if (!res_irq) return -ENODEV; - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : - clk_get(&pdev->dev, "refclk"); + clk = clk_get(&pdev->dev, "refclk"); + if (IS_ERR(clk) && pdev->dev.of_node) + clk = of_clk_get(pdev->dev.of_node, 0); + if (IS_ERR(clk)) return -ENODEV;
Codify using a named clock for the refclk of the uart. This makes it easier if we might need to add a gating clock (like present on the BCM6345). Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)