diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-16 20:17:22 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-16 20:17:22 +0100 |
| commit | ca75f110bc88c5fae16d2eb326d6b660966ed9a1 (patch) | |
| tree | d73f747c943110665afb8442d66516be31364429 /bcm2837-initial-support.patch | |
| parent | 11694b34819e3f7559a12f68f6c1b06fb9e0b977 (diff) | |
| parent | 6f694dee179a7fb29f4fa2f9d47edd3a2ba9a73d (diff) | |
| download | kernel-4.9.4-100.vanilla.knurd.1.fc24.tar.gz kernel-4.9.4-100.vanilla.knurd.1.fc24.tar.xz kernel-4.9.4-100.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.9.4-100.vanilla.knurd.1.fc24
Diffstat (limited to 'bcm2837-initial-support.patch')
| -rw-r--r-- | bcm2837-initial-support.patch | 66 |
1 files changed, 60 insertions, 6 deletions
diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch index 0e641d693..dd64598aa 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-initial-support.patch @@ -1,4 +1,4 @@ -From a2858804c7f5f4585b718543236b7ba3b3ec813a Mon Sep 17 00:00:00 2001 +From cdb86691df26e0962f081981f4bfa97ee43bd391 Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> Date: Mon, 29 Aug 2016 09:14:15 +0100 Subject: [PATCH] ARM: bcm283x: Add devicetree for the Raspberry Pi 3. @@ -18,15 +18,15 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com> create mode 100644 arch/arm/boot/dts/bcm2837.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index faacd52..ec41888 100644 +index befcd26..c96fb38 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ - bcm2835-rpi-b-rev2.dtb \ +@@ -70,7 +70,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2835-rpi-b-plus.dtb \ bcm2835-rpi-a-plus.dtb \ -- bcm2836-rpi-2-b.dtb -+ bcm2836-rpi-2-b.dtb \ + bcm2836-rpi-2-b.dtb \ +- bcm2835-rpi-zero.dtb ++ bcm2835-rpi-zero.dtb \ + bcm2837-rpi-3-b.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-asus-rt-ac56u.dtb \ @@ -150,4 +150,58 @@ index 0000000..8216bbb + interrupts = <8>; +}; -- +2.7.4 + +From 345863374ebec9aa11ea97b99f5adbf97f99bbdf Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Mon, 16 Jan 2017 06:38:08 +0000 +Subject: [PATCH] add upstream RPi3 fixes from arm64 DT + +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 8 +------- + arch/arm/boot/dts/bcm2837.dtsi | 8 +++++++- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +index 7841b72..c309633 100644 +--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +@@ -2,6 +2,7 @@ + #include "bcm2837.dtsi" + #include "bcm2835-rpi.dtsi" + #include "bcm283x-rpi-smsc9514.dtsi" ++#include "bcm283x-rpi-usb-host.dtsi" + + / { + compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; +@@ -15,13 +16,6 @@ + act { + gpios = <&gpio 47 0>; + }; +- +- pwr { +- label = "PWR"; +- gpios = <&gpio 35 0>; +- default-state = "keep"; +- linux,default-trigger = "default-on"; +- }; + }; + }; + +diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi +index 8216bbb..19f2fe6 100644 +--- a/arch/arm/boot/dts/bcm2837.dtsi ++++ b/arch/arm/boot/dts/bcm2837.dtsi +@@ -1,7 +1,7 @@ + #include "bcm283x.dtsi" + + / { +- compatible = "brcm,bcm2836"; ++ compatible = "brcm,bcm2837"; + + soc { + ranges = <0x7e000000 0x3f000000 0x1000000>, +-- 2.9.3 + |