target/linux/bcm27xx/patches-4.19/950-0434-BCM270X_DT-usb-Refactor-DTS-and-overlays.patch

   1 From 61c44e24ea212b92bf6a420b94070ee6fc715811 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 8 May 2019 10:08:31 +0100
   4 Subject: [PATCH] BCM270X_DT: usb: Refactor DTS and overlays
   5
   6 Move the IRQ interrupt declaration in the usb node before the FIQ
   7 declaration, so that the dwc2 driver will find it. Name the
   8 interrupts appropriately so that the dwc_otg driver can still find
   9 them. Then remove the interrupt rewriting from the overlays.
  10
  11 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  12 ---
  13  arch/arm/boot/dts/bcm270x.dtsi                 | 6 ++++--
  14  arch/arm/boot/dts/overlays/dwc-otg-overlay.dts | 6 ------
  15  arch/arm/boot/dts/overlays/dwc2-overlay.dts    | 2 --
  16  3 files changed, 4 insertions(+), 10 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/bcm270x.dtsi
  19 +++ b/arch/arm/boot/dts/bcm270x.dtsi
  20 @@ -131,8 +131,10 @@
  21                         compatible = "brcm,bcm2708-usb";
  22                         reg = <0x7e980000 0x10000>,
  23                               <0x7e006000 0x1000>;
  24 -                       interrupts = <2 0>,
  25 -                                    <1 9>;
  26 +                       interrupt-names = "usb",
  27 +                                         "soft";
  28 +                       interrupts = <1 9>,
  29 +                                    <2 0>;
  30                 };
  31
  32                 v3d@7ec00000 { /* vd3 */
  33 --- a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
  34 +++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
  35 @@ -6,14 +6,8 @@
  36
  37         fragment@0 {
  38                 target = <&usb>;
  39 -               #address-cells = <1>;
  40 -               #size-cells = <1>;
  41                 __overlay__ {
  42                         compatible = "brcm,bcm2708-usb";
  43 -                       reg = <0x7e980000 0x10000>,
  44 -                             <0x7e006000 0x1000>;
  45 -                       interrupts = <2 0>,
  46 -                                    <1 9>;
  47                         status = "okay";
  48                 };
  49         };
  50 --- a/arch/arm/boot/dts/overlays/dwc2-overlay.dts
  51 +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
  52 @@ -10,8 +10,6 @@
  53                 #size-cells = <1>;
  54                 dwc2_usb: __overlay__ {
  55                         compatible = "brcm,bcm2835-usb";
  56 -                       reg = <0x7e980000 0x10000>;
  57 -                       interrupts = <1 9>;
  58                         dr_mode = "otg";
  59                         g-np-tx-fifo-size = <32>;
  60                         g-rx-fifo-size = <256>;