Message ID | 20170417190034.71945-16-maxims@google.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On 17 April 2017 at 13:00, Maxim Sloyko <maxims@google.com> wrote: > Remove unnecessary apb and ahb nodes and just override necessary > nodes/values. > > Signed-off-by: Maxim Sloyko <maxims@google.com> > > --- > > Changes in v1: None > > > --- > arch/arm/dts/ast2500-u-boot.dtsi | 41 ++++++++++++++++++++-------------------- > 1 file changed, 21 insertions(+), 20 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Apr 17, 2017 at 12:00:34PM -0700, maxims@google.com wrote: > Remove unnecessary apb and ahb nodes and just override necessary > nodes/values. > > Signed-off-by: Maxim Sloyko <maxims@google.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi index f826646095..7f80bad7d0 100644 --- a/arch/arm/dts/ast2500-u-boot.dtsi +++ b/arch/arm/dts/ast2500-u-boot.dtsi @@ -34,32 +34,33 @@ apb { u-boot,dm-pre-reloc; + }; - timer: timer@1e782000 { - u-boot,dm-pre-reloc; - }; + }; +}; - uart1: serial@1e783000 { - clocks = <&scu PCLK_UART1>; - }; +&uart1 { + clocks = <&scu PCLK_UART1>; +}; - uart2: serial@1e78d000 { - clocks = <&scu PCLK_UART2>; - }; +&uart2 { + clocks = <&scu PCLK_UART2>; +}; - uart3: serial@1e78e000 { - clocks = <&scu PCLK_UART3>; - }; +&uart3 { + clocks = <&scu PCLK_UART3>; +}; - uart4: serial@1e78f000 { - clocks = <&scu PCLK_UART4>; - }; +&uart4 { + clocks = <&scu PCLK_UART4>; +}; - uart5: serial@1e784000 { - clocks = <&scu PCLK_UART5>; - }; - }; - }; +&uart5 { + clocks = <&scu PCLK_UART5>; +}; + +&timer { + u-boot,dm-pre-reloc; }; &mac0 {
Remove unnecessary apb and ahb nodes and just override necessary nodes/values. Signed-off-by: Maxim Sloyko <maxims@google.com> --- Changes in v1: None --- arch/arm/dts/ast2500-u-boot.dtsi | 41 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-)