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

   1 From patchwork Mon Jul  3 07:47:13 2017
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 Subject: [v3,2/2] dts: ipq4019: Move xo and timer nodes to SoC dtsi
   6 From: Varadarajan Narayanan <varada@codeaurora.org>
   7 X-Patchwork-Id: 9822107
   8 Message-Id: <1499068033-24000-3-git-send-email-varada@codeaurora.org>
   9 To: andy.gross@linaro.org, david.brown@linaro.org, robh+dt@kernel.org,
  10  mark.rutland@arm.com, linux@armlinux.org.uk,
  11  linux-arm-msm@vger.kernel.org,
  12  linux-soc@vger.kernel.org, devicetree@vger.kernel.org,
  13  linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
  14 Cc: Varadarajan Narayanan <varada@codeaurora.org>
  15 Date: Mon,  3 Jul 2017 13:17:13 +0530
  16
  17 The node for xo and timer belong to the SoC DTS file.
  18 Else, new board DT files may not inherit these nodes.
  19
  20 Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
  21 ---
  22  arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 19 -------------------
  23  arch/arm/boot/dts/qcom-ipq4019.dtsi           | 15 +++++++++++++++
  24  2 files changed, 15 insertions(+), 19 deletions(-)
  25
  26 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
  27 +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
  28 @@ -20,26 +20,7 @@
  29         model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
  30         compatible = "qcom,ipq4019";
  31
  32 -       clocks {
  33 -                xo: xo {
  34 -                        compatible = "fixed-clock";
  35 -                        clock-frequency = <48000000>;
  36 -                        #clock-cells = <0>;
  37 -                };
  38 -       };
  39 -
  40         soc {
  41 -
  42 -
  43 -               timer {
  44 -                       compatible = "arm,armv7-timer";
  45 -                       interrupts = <1 2 0xf08>,
  46 -                                    <1 3 0xf08>,
  47 -                                    <1 4 0xf08>,
  48 -                                    <1 1 0xf08>;
  49 -                       clock-frequency = <48000000>;
  50 -               };
  51 -
  52                 pinctrl@1000000 {
  53                         serial_pins: serial_pinmux {
  54                                 mux {
  55 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
  56 +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
  57 @@ -126,6 +126,21 @@
  58                         clock-frequency = <32768>;
  59                         #clock-cells = <0>;
  60                 };
  61 +
  62 +               xo: xo {
  63 +                       compatible = "fixed-clock";
  64 +                       clock-frequency = <48000000>;
  65 +                       #clock-cells = <0>;
  66 +               };
  67 +       };
  68 +
  69 +       timer {
  70 +               compatible = "arm,armv7-timer";
  71 +               interrupts = <1 2 0xf08>,
  72 +                            <1 3 0xf08>,
  73 +                            <1 4 0xf08>,
  74 +                            <1 1 0xf08>;
  75 +               clock-frequency = <48000000>;
  76         };
  77
  78         soc {