git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From 776461b1795b4dc4084894cf53399044aafa1d21 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Wed, 11 Nov 2020 15:55:38 +0100
   4 Subject: [PATCH] ARM: dts: BCM5301X: Move CRU devices to the CRU node
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Clocks and thermal blocks are part of the CRU ("Clock and Reset Unit" or
  10 "Central Resource Unit").
  11
  12 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  13 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  14 ---
  15  arch/arm/boot/dts/bcm5301x.dtsi | 51 +++++++++++++++++----------------
  16  1 file changed, 26 insertions(+), 25 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/bcm5301x.dtsi
  19 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  20 @@ -428,6 +428,26 @@
  21                         #address-cells = <1>;
  22                         #size-cells = <1>;
  23
  24 +                       lcpll0: lcpll0@100 {
  25 +                               #clock-cells = <1>;
  26 +                               compatible = "brcm,nsp-lcpll0";
  27 +                               reg = <0x100 0x14>;
  28 +                               clocks = <&osc>;
  29 +                               clock-output-names = "lcpll0", "pcie_phy",
  30 +                                                    "sdio", "ddr_phy";
  31 +                       };
  32 +
  33 +                       genpll: genpll@140 {
  34 +                               #clock-cells = <1>;
  35 +                               compatible = "brcm,nsp-genpll";
  36 +                               reg = <0x140 0x24>;
  37 +                               clocks = <&osc>;
  38 +                               clock-output-names = "genpll", "phy",
  39 +                                                    "ethernetclk",
  40 +                                                    "usbclk", "iprocfast",
  41 +                                                    "sata1", "sata2";
  42 +                       };
  43 +
  44                         pinctrl: pin-controller@1c0 {
  45                                 compatible = "brcm,bcm4708-pinmux";
  46                                 reg = <0x1c0 0x24>;
  47 @@ -454,32 +474,13 @@
  48                                         function = "uart1";
  49                                 };
  50                         };
  51 -               };
  52 -       };
  53
  54 -       lcpll0: lcpll0@1800c100 {
  55 -               #clock-cells = <1>;
  56 -               compatible = "brcm,nsp-lcpll0";
  57 -               reg = <0x1800c100 0x14>;
  58 -               clocks = <&osc>;
  59 -               clock-output-names = "lcpll0", "pcie_phy", "sdio",
  60 -                                    "ddr_phy";
  61 -       };
  62 -
  63 -       genpll: genpll@1800c140 {
  64 -               #clock-cells = <1>;
  65 -               compatible = "brcm,nsp-genpll";
  66 -               reg = <0x1800c140 0x24>;
  67 -               clocks = <&osc>;
  68 -               clock-output-names = "genpll", "phy", "ethernetclk",
  69 -                                    "usbclk", "iprocfast", "sata1",
  70 -                                    "sata2";
  71 -       };
  72 -
  73 -       thermal: thermal@1800c2c0 {
  74 -               compatible = "brcm,ns-thermal";
  75 -               reg = <0x1800c2c0 0x10>;
  76 -               #thermal-sensor-cells = <0>;
  77 +                       thermal: thermal@2c0 {
  78 +                               compatible = "brcm,ns-thermal";
  79 +                               reg = <0x2c0 0x10>;
  80 +                               #thermal-sensor-cells = <0>;
  81 +                       };
  82 +               };
  83         };
  84
  85         srab: srab@18007000 {