| Message ID | 1381960030-1640-3-git-send-email-tim.kryger@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Oct 16, 2013 at 2:47 PM, Tim Kryger <tim.kryger@linaro.org> wrote: > Rather than declaring the frequency of the external clock, specify the > label of the clock such that the driver may determine the frequency on > its own. > > Signed-off-by: Tim Kryger <tim.kryger@linaro.org> > Reviewed-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Matt Porter <matt.porter@linaro.org> > --- > arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi > index c6464fb..ce65367 100644 > --- a/arch/arm/boot/dts/bcm11351.dtsi > +++ b/arch/arm/boot/dts/bcm11351.dtsi > @@ -43,7 +43,7 @@ > compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; > status = "disabled"; > reg = <0x3e000000 0x1000>; > - clock-frequency = <13000000>; > + clocks = <&uartb_clk>; > interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; > reg-shift = <2>; > reg-io-width = <4>; Hi Sebastian, this patch series (and a subsequent one from Tim) both rely on your "ARM: provide common arch init for DT clocks" patchset in order to work. Will that patchset be in 3.13 ? I don't want to pull the dt mods unless they are as they break the boot without them. Thanks, csd
On 10/17/2013 07:41 AM, Christian Daudt wrote: > On Wed, Oct 16, 2013 at 2:47 PM, Tim Kryger <tim.kryger@linaro.org> wrote: >> Rather than declaring the frequency of the external clock, specify the >> label of the clock such that the driver may determine the frequency on >> its own. >> >> Signed-off-by: Tim Kryger <tim.kryger@linaro.org> >> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> >> Reviewed-by: Matt Porter <matt.porter@linaro.org> >> --- >> arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi >> index c6464fb..ce65367 100644 >> --- a/arch/arm/boot/dts/bcm11351.dtsi >> +++ b/arch/arm/boot/dts/bcm11351.dtsi >> @@ -43,7 +43,7 @@ >> compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; >> status = "disabled"; >> reg = <0x3e000000 0x1000>; >> - clock-frequency = <13000000>; >> + clocks = <&uartb_clk>; >> interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; >> reg-shift = <2>; >> reg-io-width = <4>; > > Hi Sebastian, > this patch series (and a subsequent one from Tim) both rely on your > "ARM: provide common arch init for DT clocks" patchset in order to > work. Will that patchset be in 3.13 ? I don't want to pull the dt mods > unless they are as they break the boot without them. Christian, here is the pull request [1], pull [2], and stable commitment for the branch [3]. You can merge that branch too and name the dependency when you send your PR, arm-soc maintainers will sort it out. Besides a small section mismatch fixup for nomadik that Olof requested, I guess it is in. Sebastian [1] http://www.spinics.net/lists/arm-kernel/msg276175.html [2] http://www.spinics.net/lists/arm-kernel/msg277816.html [3] http://www.spinics.net/lists/arm-kernel/msg279736.html
On Wed, Oct 16, 2013 at 10:47:06PM +0100, Tim Kryger wrote: > Rather than declaring the frequency of the external clock, specify the > label of the clock such that the driver may determine the frequency on > its own. Nit: we're not specifying the label of the clock. Clocks are represented py a phand+args pair, and the important part is that we're specifying the clock itself. How about something like: ---->8---- Currently the rate of the external clock input to "snps,dw-apb-uart" devices is described by a clock-frequency property rather than by reference to the clock itself. This patch changes the "snps,dw-apb-uart" entries in bcm11351.dtsi to refer to the parent clock directly, following the common clock bindings. ---->8---- Also, this should probably be moved after the driver change, so as to not be unbootable temporarily. Thanks, Mark. > > Signed-off-by: Tim Kryger <tim.kryger@linaro.org> > Reviewed-by: Markus Mayer <markus.mayer@linaro.org> > Reviewed-by: Matt Porter <matt.porter@linaro.org> > --- > arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi > index c6464fb..ce65367 100644 > --- a/arch/arm/boot/dts/bcm11351.dtsi > +++ b/arch/arm/boot/dts/bcm11351.dtsi > @@ -43,7 +43,7 @@ > compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; > status = "disabled"; > reg = <0x3e000000 0x1000>; > - clock-frequency = <13000000>; > + clocks = <&uartb_clk>; > interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; > reg-shift = <2>; > reg-io-width = <4>; > @@ -53,7 +53,7 @@ > compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; > status = "disabled"; > reg = <0x3e001000 0x1000>; > - clock-frequency = <13000000>; > + clocks = <&uartb2_clk>; > interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; > reg-shift = <2>; > reg-io-width = <4>; > @@ -63,7 +63,7 @@ > compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; > status = "disabled"; > reg = <0x3e002000 0x1000>; > - clock-frequency = <13000000>; > + clocks = <&uartb3_clk>; > interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; > reg-shift = <2>; > reg-io-width = <4>; > @@ -73,7 +73,7 @@ > compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; > status = "disabled"; > reg = <0x3e003000 0x1000>; > - clock-frequency = <13000000>; > + clocks = <&uartb4_clk>; > interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; > reg-shift = <2>; > reg-io-width = <4>; > -- > 1.8.0.1 > > >
On Thu, Oct 17, 2013 at 6:56 AM, Mark Rutland <mark.rutland@arm.com> wrote: > On Wed, Oct 16, 2013 at 10:47:06PM +0100, Tim Kryger wrote: >> Rather than declaring the frequency of the external clock, specify the >> label of the clock such that the driver may determine the frequency on >> its own. > > Nit: we're not specifying the label of the clock. Clocks are represented > py a phand+args pair, and the important part is that we're specifying > the clock itself. > > How about something like: > > ---->8---- > Currently the rate of the external clock input to "snps,dw-apb-uart" > devices is described by a clock-frequency property rather than by > reference to the clock itself. > > This patch changes the "snps,dw-apb-uart" entries in bcm11351.dtsi to > refer to the parent clock directly, following the common clock bindings. > ---->8---- Would this be acceptable? The frequency property in "snps,dw-apb-uart" entries are no longer required if the rate of the external clock can be determined using the clk api (see e302cd9 serial: 8250_dw: add support for clk api). This patch replaces the frequency property in the UART nodes of bcm11351.dtsi with references to the relevant clocks following the common clock binding. > > Also, this should probably be moved after the driver change, so as to > not be unbootable temporarily. The driver change was part of v3.10 so there is no issue here. > > Thanks, > Mark. > >> >> Signed-off-by: Tim Kryger <tim.kryger@linaro.org> >> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> >> Reviewed-by: Matt Porter <matt.porter@linaro.org> >> --- >> arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi >> index c6464fb..ce65367 100644 >> --- a/arch/arm/boot/dts/bcm11351.dtsi >> +++ b/arch/arm/boot/dts/bcm11351.dtsi >> @@ -43,7 +43,7 @@ >> compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; >> status = "disabled"; >> reg = <0x3e000000 0x1000>; >> - clock-frequency = <13000000>; >> + clocks = <&uartb_clk>; >> interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; >> reg-shift = <2>; >> reg-io-width = <4>; >> @@ -53,7 +53,7 @@ >> compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; >> status = "disabled"; >> reg = <0x3e001000 0x1000>; >> - clock-frequency = <13000000>; >> + clocks = <&uartb2_clk>; >> interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; >> reg-shift = <2>; >> reg-io-width = <4>; >> @@ -63,7 +63,7 @@ >> compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; >> status = "disabled"; >> reg = <0x3e002000 0x1000>; >> - clock-frequency = <13000000>; >> + clocks = <&uartb3_clk>; >> interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; >> reg-shift = <2>; >> reg-io-width = <4>; >> @@ -73,7 +73,7 @@ >> compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; >> status = "disabled"; >> reg = <0x3e003000 0x1000>; >> - clock-frequency = <13000000>; >> + clocks = <&uartb4_clk>; >> interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; >> reg-shift = <2>; >> reg-io-width = <4>; >> -- >> 1.8.0.1 >> >> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index c6464fb..ce65367 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi @@ -43,7 +43,7 @@ compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e000000 0x1000>; - clock-frequency = <13000000>; + clocks = <&uartb_clk>; interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>; @@ -53,7 +53,7 @@ compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e001000 0x1000>; - clock-frequency = <13000000>; + clocks = <&uartb2_clk>; interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>; @@ -63,7 +63,7 @@ compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e002000 0x1000>; - clock-frequency = <13000000>; + clocks = <&uartb3_clk>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>; @@ -73,7 +73,7 @@ compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e003000 0x1000>; - clock-frequency = <13000000>; + clocks = <&uartb4_clk>; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; reg-shift = <2>; reg-io-width = <4>;