diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts')
| -rw-r--r-- | kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts index 2ed9e5794..ca92bba6a 100644 --- a/kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/kernel/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -10,6 +10,7 @@ /dts-v1/; #include "bcm4708.dtsi" +#include "bcm5301x-nand-cs0-bch8.dtsi" / { compatible = "netgear,r6250v1", "brcm,bcm4708"; @@ -23,13 +24,14 @@ reg = <0x00000000 0x08000000>; }; - chipcommonA { - uart0: serial@0300 { - status = "okay"; - }; + axi@18000000 { + usb3@23000 { + reg = <0x00023000 0x1000>; + + #address-cells = <1>; + #size-cells = <1>; - uart1: serial@0400 { - status = "okay"; + vcc-gpio = <&chipcommon 0 GPIO_ACTIVE_HIGH>; }; }; @@ -91,3 +93,7 @@ }; }; }; + +&uart0 { + status = "okay"; +}; |