On Mon, 20 Jul 2015, Eric Anholt wrote: > This gets us a correct apb_pclk, which previously was accidentally > using the "20201000.uart" clock from clk-bcm2835.c, due to the > fallback clk_get_sys() path. > > Signed-off-by: Eric Anholt <[email protected]> > Acked-by: Stephen Warren <[email protected]> > --- > arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 +++++++ > arch/arm/boot/dts/bcm2835.dtsi | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-)
For my own reference: Acked-by: Lee Jones <[email protected]> > diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi > b/arch/arm/boot/dts/bcm2835-rpi.dtsi > index 7cc47fb..9549eb8 100644 > --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi > +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi > @@ -1,3 +1,4 @@ > +#include <dt-bindings/clk/raspberrypi.h> > #include "bcm2835.dtsi" > > / { > @@ -62,3 +63,9 @@ > status = "okay"; > bus-width = <4>; > }; > + > +&uart0 { > + clocks = <&firmware_clocks RPI_CLOCK_UART0>, > + <&firmware_clocks RPI_CLOCK_CORE>; > + clock-names = "uartclk", "apb_pclk"; > +}; > diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi > index 32f5830..5be2862 100644 > --- a/arch/arm/boot/dts/bcm2835.dtsi > +++ b/arch/arm/boot/dts/bcm2835.dtsi > @@ -92,7 +92,7 @@ > #interrupt-cells = <2>; > }; > > - uart@7e201000 { > + uart0: uart@7e201000 { > compatible = "brcm,bcm2835-pl011", "arm,pl011", > "arm,primecell"; > reg = <0x7e201000 0x1000>; > interrupts = <2 25>; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
