Changeset 44932


Ignore:
Timestamp:
2015-03-22T02:57:06+01:00 (3 years ago)
Author:
rmilecki
Message:

bcm53xx: backport BCM5301X Netgear R6250/R8000 DT patches

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:
trunk/target/linux/bcm53xx/patches-3.18
Files:
1 added
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/bcm53xx/patches-3.18/056-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch

    r44931 r44932  
    1 From 302a5ef29d497449280422576a1b55c72fc0ba4c Mon Sep 17 00:00:00 2001 
     1From 4076b521cb50c411467c4ba65f82ef0079823357 Mon Sep 17 00:00:00 2001 
    22From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> 
    3 Date: Thu, 4 Dec 2014 10:22:02 +0100 
    4 Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R6300 V2 
     3Date: Wed, 18 Feb 2015 12:25:42 +0100 
     4Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R8000 
    55MIME-Version: 1.0 
    66Content-Type: text/plain; charset=UTF-8 
     
    88 
    99Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
    10 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 
     10Reported-by: Ian Kent <raven@themaw.net> 
     11Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 
    1112--- 
    12  arch/arm/boot/dts/Makefile                     |  4 +- 
    13  arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 84 ++++++++++++++++++++++++++ 
    14  2 files changed, 87 insertions(+), 1 deletion(-) 
    15  create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts 
     13 arch/arm/boot/dts/Makefile                  |  3 +- 
     14 arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 77 +++++++++++++++++++++++++++++ 
     15 2 files changed, 79 insertions(+), 1 deletion(-) 
     16 create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    1617 
     18diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
     19index 2604d7c..c6e0a4c 100644 
    1720--- a/arch/arm/boot/dts/Makefile 
    1821+++ b/arch/arm/boot/dts/Makefile 
    19 @@ -54,7 +54,9 @@ dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d4e 
    20  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb 
    21  dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb 
    22  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb 
    23 -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb 
    24 +dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    25 +       bcm4708-netgear-r6250.dtb \ 
    26 +       bcm4708-netgear-r6300-v2.dtb 
     22@@ -61,7 +61,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
     23        bcm4708-netgear-r6300-v2.dtb \ 
     24        bcm47081-asus-rt-n18u.dtb \ 
     25        bcm47081-buffalo-wzr-600dhp2.dtb \ 
     26-       bcm47081-buffalo-wzr-900dhp.dtb 
     27+       bcm47081-buffalo-wzr-900dhp.dtb \ 
     28+       bcm4709-netgear-r8000.dtb 
    2729 dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
    2830 dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ 
    2931        bcm21664-garnet.dtb 
     32diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     33new file mode 100644 
     34index 0000000..ea26dd3 
    3035--- /dev/null 
    31 +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts 
    32 @@ -0,0 +1,84 @@ 
     36+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     37@@ -0,0 +1,77 @@ 
    3338+/* 
    3439+ * Broadcom BCM470X / BCM5301X ARM platform code. 
    35 + * DTS for Netgear R6300 V2 
     40+ * DTS for Netgear R8000 
    3641+ * 
    37 + * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com> 
     42+ * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> 
    3843+ * 
    3944+ * Licensed under the GNU/GPL. See COPYING for details. 
     
    4550+ 
    4651+/ { 
    47 +       compatible = "netgear,r6300v2", "brcm,bcm4708"; 
    48 +       model = "Netgear R6300 V2 (BCM4708)"; 
     52+       compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708"; 
     53+       model = "Netgear R8000 (BCM4709)"; 
    4954+ 
    5055+       chosen { 
     
    5964+               compatible = "gpio-leds"; 
    6065+ 
    61 +               logo { 
    62 +                       label = "bcm53xx:white:logo"; 
    63 +                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>; 
     66+               power0 { 
     67+                       label = "bcm53xx:white:power"; 
     68+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; 
    6469+                       linux,default-trigger = "default-on"; 
    65 +               }; 
    66 + 
    67 +               power0 { 
    68 +                       label = "bcm53xx:green:power"; 
    69 +                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>; 
    70 +                       linux,default-trigger = "default-off"; 
    7170+               }; 
    7271+ 
     
    7473+                       label = "bcm53xx:amber:power"; 
    7574+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>; 
    76 +                       linux,default-trigger = "default-on"; 
    77 +               }; 
    78 + 
    79 +               usb { 
    80 +                       label = "bcm53xx:blue:usb"; 
    81 +                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>; 
    8275+                       linux,default-trigger = "default-off"; 
    8376+               }; 
    8477+ 
    85 +               wireless { 
    86 +                       label = "bcm53xx:blue:wireless"; 
    87 +                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>; 
     78+               5ghz-1 { 
     79+                       label = "bcm53xx:white:5ghz-1"; 
     80+                       gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>; 
     81+                       linux,default-trigger = "default-off"; 
     82+               }; 
     83+ 
     84+               2ghz { 
     85+                       label = "bcm53xx:white:2ghz"; 
     86+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>; 
    8887+                       linux,default-trigger = "default-off"; 
    8988+               }; 
     
    9493+               #address-cells = <1>; 
    9594+               #size-cells = <0>; 
    96 +               poll-interval = <200>; 
     95+ 
     96+               rfkill { 
     97+                       label = "WiFi"; 
     98+                       linux,code = <KEY_RFKILL>; 
     99+                       gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>; 
     100+               }; 
    97101+ 
    98102+               wps { 
    99103+                       label = "WPS"; 
    100104+                       linux,code = <KEY_WPS_BUTTON>; 
    101 +                       gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>; 
    102 +               }; 
    103 + 
    104 +               rfkill { 
    105 +                       label = "WiFi"; 
    106 +                       linux,code = <KEY_RFKILL>; 
    107105+                       gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>; 
    108106+               }; 
     
    115113+       }; 
    116114+}; 
     115--  
     1161.8.4.5 
     117 
  • trunk/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch

    r44070 r44932  
    7878  
    7979        memory { 
     80--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     81+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     82@@ -16,7 +16,7 @@ 
     83        model = "Netgear R8000 (BCM4709)"; 
     84  
     85        chosen { 
     86-               bootargs = "console=ttyS0,115200"; 
     87+               bootargs = "console=ttyS0,115200 earlyprintk"; 
     88        }; 
     89  
     90        memory { 
    8091--  
    81921.8.4.5 
  • trunk/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch

    r44070 r44932  
    8888  
    8989        gpio-keys { 
     90--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     91+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
     92@@ -20,7 +20,8 @@ 
     93        }; 
     94  
     95        memory { 
     96-               reg = <0x00000000 0x08000000>; 
     97+               reg = <0x00000000 0x08000000 
     98+                      0x88000000 0x08000000>; 
     99        }; 
     100  
     101        leds { 
  • trunk/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch

    r44058 r44932  
    1616--- a/arch/arm/boot/dts/Makefile 
    1717+++ b/arch/arm/boot/dts/Makefile 
    18 @@ -61,7 +61,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    19         bcm4708-netgear-r6300-v2.dtb \ 
     18@@ -62,6 +62,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    2019        bcm47081-asus-rt-n18u.dtb \ 
    2120        bcm47081-buffalo-wzr-600dhp2.dtb \ 
    22 -       bcm47081-buffalo-wzr-900dhp.dtb 
    23 +       bcm47081-buffalo-wzr-900dhp.dtb \ 
    24 +       bcm4709-asus-rt-ac87u.dtb 
     21        bcm47081-buffalo-wzr-900dhp.dtb \ 
     22+       bcm4709-asus-rt-ac87u.dtb \ 
     23        bcm4709-netgear-r8000.dtb 
    2524 dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
    2625 dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ 
    27         bcm21664-garnet.dtb 
    2826--- /dev/null 
    2927+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts 
  • trunk/target/linux/bcm53xx/patches-3.18/323-ARM-BCM5301X-Add-DT-for-Netgear-R8000.patch

    r44931 r44932  
    1414 create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    1515 
    16 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
    17 index 25445c2..e93e9e4 100644 
    18 --- a/arch/arm/boot/dts/Makefile 
    19 +++ b/arch/arm/boot/dts/Makefile 
    20 @@ -62,7 +62,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    21         bcm47081-asus-rt-n18u.dtb \ 
    22         bcm47081-buffalo-wzr-600dhp2.dtb \ 
    23         bcm47081-buffalo-wzr-900dhp.dtb \ 
    24 -       bcm4709-asus-rt-ac87u.dtb 
    25 +       bcm4709-asus-rt-ac87u.dtb \ 
    26 +       bcm4709-netgear-r8000.dtb 
    27  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
    28  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ 
    29         bcm21664-garnet.dtb 
    30 diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    31 new file mode 100644 
    32 index 0000000..2d7e388 
    33 --- /dev/null 
    34 +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    35 @@ -0,0 +1,26 @@ 
    36 +/* 
    37 + * Broadcom BCM470X / BCM5301X ARM platform code. 
    38 + * DTS for Netgear R8000 
    39 + * 
    40 + * Copyright (C) 2015 Rafał Miłecki <zajec5@gmail.com> 
    41 + * 
    42 + * Licensed under the GNU/GPL. See COPYING for details. 
    43 + */ 
    44 + 
    45 +/dts-v1/; 
    46 + 
    47 +#include "bcm4708.dtsi" 
    48 + 
    49 +/ { 
    50 +       compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708"; 
    51 +       model = "Netgear R8000 (BCM4709)"; 
    52 + 
    53 +       chosen { 
    54 +               bootargs = "console=ttyS0,115200 earlyprintk"; 
    55 +       }; 
    56 + 
    57 +       memory { 
    58 +               reg = <0x00000000 0x08000000 
    59 +                      0x88000000 0x08000000>; 
    60 +       }; 
    61 +}; 
    6216--- a/arch/arm/mach-bcm/bcm_5301x.c 
    6317+++ b/arch/arm/mach-bcm/bcm_5301x.c 
  • trunk/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch

    r44596 r44932  
    131131--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    132132+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts 
    133 @@ -23,4 +23,16 @@ 
    134                 reg = <0x00000000 0x08000000 
     133@@ -24,6 +24,18 @@ 
    135134                       0x88000000 0x08000000>; 
    136135        }; 
    137 + 
     136  
    138137+       chipcommonA { 
    139138+               uart0: serial@0300 { 
     
    147146+               }; 
    148147+       }; 
    149  }; 
     148+ 
     149        leds { 
     150                compatible = "gpio-leds"; 
     151  
Note: See TracChangeset for help on using the changeset viewer.