diff options
| author | John Crispin <john@openwrt.org> | 2015-08-17 06:04:32 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-08-17 06:04:32 +0000 |
| commit | 22b3e521b5ec4022717df7ef0c532b58aaca4abe (patch) | |
| tree | caa2bcb90a9e6eeeccf5af9e7d02849c0b59285b /target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch | |
| parent | 98e122e4ccd533a5836e5dcb8a96d2d09180b8f0 (diff) | |
| download | master-31e0f0ae-22b3e521b5ec4022717df7ef0c532b58aaca4abe.tar.gz master-31e0f0ae-22b3e521b5ec4022717df7ef0c532b58aaca4abe.tar.bz2 master-31e0f0ae-22b3e521b5ec4022717df7ef0c532b58aaca4abe.zip | |
brcm2708: update 4.1 patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 46640
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch b/target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch new file mode 100644 index 0000000000..dbc387c261 --- /dev/null +++ b/target/linux/brcm2708/patches-4.1/0138-bcm2835-Add-firmware-property-to-affected-devices.patch @@ -0,0 +1,79 @@ +From 9be804b336947fd31728a74a34c7febf44d6b8a5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org> +Date: Mon, 20 Jul 2015 12:27:17 +0200 +Subject: [PATCH 138/148] bcm2835: Add firmware property to affected devices +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Also move firmware depending devices to the rpi dtsi file since +they depend on the Pi specific firmware. + +Signed-off-by: Noralf Trønnes <noralf@tronnes.org> +--- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 22 ++++++++++++++++++---- + arch/arm/boot/dts/bcm2835.dtsi | 15 --------------- + 2 files changed, 18 insertions(+), 19 deletions(-) + +--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi ++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi +@@ -32,6 +32,24 @@ + compatible = "raspberrypi,bcm2835-firmware"; + mboxes = <&mailbox>; + }; ++ ++ fb: fb { ++ compatible = "brcm,bcm2708-fb"; ++ firmware = <&firmware>; ++ }; ++ ++ thermal: thermal { ++ compatible = "brcm,bcm2835-thermal"; ++ firmware = <&firmware>; ++ }; ++ ++ vchiq: vchiq { ++ compatible = "brcm,bcm2835-vchiq"; ++ reg = <0x7e00b840 0xf>; ++ interrupts = <0 2>; ++ cache-line-size = <32>; ++ firmware = <&firmware>; ++ }; + }; + + /* Onboard audio */ +@@ -101,10 +119,6 @@ + bus-width = <4>; + }; + +-&fb { +- status = "okay"; +-}; +- + / { + __overrides__ { + i2s = <&i2s>,"status"; +--- a/arch/arm/boot/dts/bcm2835.dtsi ++++ b/arch/arm/boot/dts/bcm2835.dtsi +@@ -160,21 +160,6 @@ + arm-pmu { + compatible = "arm,arm1176-pmu"; + }; +- +- fb: fb { +- compatible = "brcm,bcm2708-fb"; +- status = "disabled"; +- }; +- +- vchiq: vchiq { +- compatible = "brcm,bcm2835-vchiq"; +- reg = <0x7e00b840 0xf>; +- interrupts = <0 2>; +- }; +- +- thermal: thermal { +- compatible = "brcm,bcm2835-thermal"; +- }; + }; + + clocks { |