target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch

   1 From f6d8cf0c184e4fcde54b2507717f80acc6a4d755 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
   3 Date: Mon, 20 Jul 2015 12:27:17 +0200
   4 Subject: [PATCH 138/222] bcm2835: Add firmware property to affected devices
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Also move firmware depending devices to the rpi dtsi file since
  10 they depend on the Pi specific firmware.
  11
  12 Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  13 ---
  14  arch/arm/boot/dts/bcm2835-rpi.dtsi | 22 ++++++++++++++++++----
  15  arch/arm/boot/dts/bcm2835.dtsi     | 15 ---------------
  16  2 files changed, 18 insertions(+), 19 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
  19 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
  20 @@ -32,6 +32,24 @@
  21                         compatible = "raspberrypi,bcm2835-firmware";
  22                         mboxes = <&mailbox>;
  23                 };
  24 +
  25 +               fb: fb {
  26 +                       compatible = "brcm,bcm2708-fb";
  27 +                       firmware = <&firmware>;
  28 +               };
  29 +
  30 +               thermal: thermal {
  31 +                       compatible = "brcm,bcm2835-thermal";
  32 +                       firmware = <&firmware>;
  33 +               };
  34 +
  35 +               vchiq: vchiq {
  36 +                       compatible = "brcm,bcm2835-vchiq";
  37 +                       reg = <0x7e00b840 0xf>;
  38 +                       interrupts = <0 2>;
  39 +                       cache-line-size = <32>;
  40 +                       firmware = <&firmware>;
  41 +               };
  42         };
  43
  44         /* Onboard audio */
  45 @@ -101,10 +119,6 @@
  46         bus-width = <4>;
  47  };
  48
  49 -&fb {
  50 -       status = "okay";
  51 -};
  52 -
  53  / {
  54         __overrides__ {
  55                 i2s = <&i2s>,"status";
  56 --- a/arch/arm/boot/dts/bcm2835.dtsi
  57 +++ b/arch/arm/boot/dts/bcm2835.dtsi
  58 @@ -160,21 +160,6 @@
  59                 arm-pmu {
  60                         compatible = "arm,arm1176-pmu";
  61                 };
  62 -
  63 -               fb: fb {
  64 -                       compatible = "brcm,bcm2708-fb";
  65 -                       status = "disabled";
  66 -               };
  67 -
  68 -               vchiq: vchiq {
  69 -                       compatible = "brcm,bcm2835-vchiq";
  70 -                       reg = <0x7e00b840 0xf>;
  71 -                       interrupts = <0 2>;
  72 -               };
  73 -
  74 -               thermal: thermal {
  75 -                       compatible = "brcm,bcm2835-thermal";
  76 -               };
  77         };
  78
  79         clocks {