Changeset 45685


Ignore:
Timestamp:
2015-05-13T22:01:03+02:00 (3 years ago)
Author:
rmilecki
Message:

bcm53xx: replace DT patches with backports from stblinux

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

Location:
trunk/target/linux/bcm53xx/patches-3.18
Files:
2 added
4 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/bcm53xx/patches-3.18/058-ARM-BCM5301X-Add-USB-LED-for-Buffalo-WZR-1750DHP.patch

    r45684 r45685  
     1From 35ad0e50bd6683c6699586e3bd5045f0695586d9 Mon Sep 17 00:00:00 2001 
    12From: Felix Fietkau <nbd@openwrt.org> 
     3Date: Wed, 13 May 2015 09:10:51 +0200 
    24Subject: [PATCH] ARM: BCM5301X: Add USB LED for Buffalo WZR-1750DHP 
    35 
    46Signed-off-by: Felix Fietkau <nbd@openwrt.org> 
     7Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 
    58--- 
     9 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 6 ++++++ 
     10 1 file changed, 6 insertions(+) 
     11 
     12diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts 
     13index b359c1e..78e95c0 100644 
    614--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts 
    715+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts 
    8 @@ -48,6 +48,12 @@ 
     16@@ -47,6 +47,12 @@ 
    917        leds { 
    1018                compatible = "gpio-leds"; 
     
    1927                        label = "bcm53xx:red:power"; 
    2028                        gpios = <&hc595 1 GPIO_ACTIVE_HIGH>; 
     29--  
     301.8.4.5 
     31 
  • trunk/target/linux/bcm53xx/patches-3.18/059-ARM-BCM5301X-Add-DT-for-Buffalo-WXR-1900DHP.patch

    r45684 r45685  
     1From 35eecd10ee57b9d4f31e12598296b235ed2b34ae Mon Sep 17 00:00:00 2001 
    12From: Felix Fietkau <nbd@openwrt.org> 
     3Date: Wed, 13 May 2015 09:10:52 +0200 
    24Subject: [PATCH] ARM: BCM5301X: Add DT for Buffalo WXR-1900DHP 
    35MIME-Version: 1.0 
     
    68 
    79Signed-off-by: Felix Fietkau <nbd@openwrt.org> 
     10Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
     11Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 
    812--- 
     13 arch/arm/boot/dts/Makefile                        |   1 + 
     14 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 127 ++++++++++++++++++++++ 
     15 2 files changed, 128 insertions(+) 
     16 create mode 100644 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     17 
     18diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
     19index 86217db..d34785a 100644 
     20--- a/arch/arm/boot/dts/Makefile 
     21+++ b/arch/arm/boot/dts/Makefile 
     22@@ -62,6 +62,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
     23        bcm47081-asus-rt-n18u.dtb \ 
     24        bcm47081-buffalo-wzr-600dhp2.dtb \ 
     25        bcm47081-buffalo-wzr-900dhp.dtb \ 
     26+       bcm4709-buffalo-wxr-1900dhp.dtb \ 
     27        bcm4709-netgear-r8000.dtb 
     28 dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
     29 dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ 
     30diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     31new file mode 100644 
     32index 0000000..548e93b 
    933--- /dev/null 
    1034+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
    11 @@ -0,0 +1,158 @@ 
     35@@ -0,0 +1,127 @@ 
    1236+/* 
    1337+ * Broadcom BCM470X / BCM5301X ARM platform code. 
    1438+ * DTS for Buffalo WXR-1900DHP 
    1539+ * 
    16 + * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com> 
    1740+ * Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org> 
    1841+ * 
     
    2649+/ { 
    2750+       compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708"; 
    28 +       model = "Buffalo WXR-1900DHP (BCM4709)"; 
     51+       model = "Buffalo WXR-1900DHP"; 
    2952+ 
    3053+       chosen { 
    31 +               bootargs = "console=ttyS0,115200 earlyprintk"; 
     54+               bootargs = "console=ttyS0,115200"; 
    3255+       }; 
    3356+ 
    3457+       memory { 
    35 +               reg = <0x00000000 0x08000000 
    36 +                      0x88000000 0x18000000>; 
    37 +       }; 
    38 + 
    39 +       chipcommonA { 
    40 +               uart0: serial@0300 { 
    41 +                       status = "okay"; 
    42 +                       clock-frequency = <125000000>; 
    43 +               }; 
    44 + 
    45 +               uart1: serial@0400 { 
    46 +                       status = "okay"; 
    47 +                       clock-frequency = <125000000>; 
    48 +               }; 
    49 +       }; 
    50 + 
    51 +       clocks { 
    52 +               clk_periph: periph { 
    53 +                       clock-frequency = <500000000>; 
    54 +               }; 
     58+               reg = <0x00000000 0x08000000>; 
    5559+       }; 
    5660+ 
     
    6468+               }; 
    6569+ 
    66 +               power0 { 
     70+               power-amber { 
    6771+                       label = "bcm53xx:amber:power"; 
    6872+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>; 
     
    7074+               }; 
    7175+ 
    72 +               power1 { 
     76+               power-white { 
    7377+                       label = "bcm53xx:white:power"; 
    7478+                       gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>; 
     
    7680+               }; 
    7781+ 
    78 +               router0 { 
     82+               router-amber { 
     83+                       label = "bcm53xx:amber:router"; 
     84+                       gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>; 
     85+                       linux,default-trigger = "default-off"; 
     86+               }; 
     87+ 
     88+               router-white { 
    7989+                       label = "bcm53xx:white:router"; 
    8090+                       gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>; 
     
    8292+               }; 
    8393+ 
    84 +               router1 { 
    85 +                       label = "bcm53xx:amber:router"; 
    86 +                       gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>; 
     94+               wan-amber { 
     95+                       label = "bcm53xx:amber:wan"; 
     96+                       gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>; 
    8797+                       linux,default-trigger = "default-off"; 
    8898+               }; 
    8999+ 
    90 +               wan0 { 
     100+               wan-white { 
    91101+                       label = "bcm53xx:white:wan"; 
    92102+                       gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>; 
     
    94104+               }; 
    95105+ 
    96 +               wan1 { 
    97 +                       label = "bcm53xx:amber:wan"; 
    98 +                       gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>; 
    99 +                       linux,default-trigger = "default-off"; 
    100 +               }; 
    101 + 
    102 +               wireless0 { 
    103 +                       label = "bcm53xx:white:wireless"; 
    104 +                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; 
    105 +                       linux,default-trigger = "default-off"; 
    106 +               }; 
    107 + 
    108 +               wireless1 { 
     106+               wireless-amber { 
    109107+                       label = "bcm53xx:amber:wireless"; 
    110108+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>; 
    111109+                       linux,default-trigger = "default-off"; 
    112110+               }; 
    113 +       }; 
    114111+ 
    115 +       axi@18000000 { 
    116 +               usb2@21000 { 
    117 +                       reg = <0x00021000 0x1000>; 
    118 + 
    119 +                       #address-cells = <1>; 
    120 +                       #size-cells = <1>; 
    121 + 
    122 +                       vcc-gpio = <&chipcommon 13 GPIO_ACTIVE_HIGH>; 
     112+               wireless-white { 
     113+                       label = "bcm53xx:white:wireless"; 
     114+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>; 
     115+                       linux,default-trigger = "default-off"; 
    123116+               }; 
    124117+       }; 
     
    168161+       }; 
    169162+}; 
    170 --- a/arch/arm/boot/dts/Makefile 
    171 +++ b/arch/arm/boot/dts/Makefile 
    172 @@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    173         bcm47081-asus-rt-n18u.dtb \ 
    174         bcm47081-buffalo-wzr-600dhp2.dtb \ 
    175         bcm47081-buffalo-wzr-900dhp.dtb \ 
    176 +       bcm4709-buffalo-wxr-1900dhp.dtb \ 
    177         bcm4709-asus-rt-ac87u.dtb \ 
    178         bcm4709-netgear-r8000.dtb 
    179  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
     163--  
     1641.8.4.5 
     165 
  • trunk/target/linux/bcm53xx/patches-3.18/061-ARM-BCM5301X-Add-DT-for-Asus-RT-AC68U.patch

    r45684 r45685  
    1 From c2ebc30d9633d80849e99f489497e4c862e532e5 Mon Sep 17 00:00:00 2001 
     1From b5f350c790ae6aaf3dda5a825d7e3fdeed731164 Mon Sep 17 00:00:00 2001 
    22From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> 
    3 Date: Sat, 28 Mar 2015 14:51:08 +0100 
    4 Subject: [PATCH V2] ARM: BCM5301X: Add DT for Asus RT-AC68U 
     3Date: Sat, 28 Mar 2015 15:01:38 +0100 
     4Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-AC68U 
    55MIME-Version: 1.0 
    66Content-Type: text/plain; charset=UTF-8 
     
    88 
    99Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
     10Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 
    1011--- 
    1112 arch/arm/boot/dts/Makefile                  |  1 + 
     
    1415 create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts 
    1516 
     17diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
     18index 59f7970..1e8b8b7 100644 
    1619--- a/arch/arm/boot/dts/Makefile 
    1720+++ b/arch/arm/boot/dts/Makefile 
     
    2427        bcm4708-luxul-xwc-1000.dtb \ 
    2528        bcm4708-netgear-r6250.dtb \ 
     29diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts 
     30new file mode 100644 
     31index 0000000..8b62836 
    2632--- /dev/null 
    2733+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts 
     
    110116+       }; 
    111117+}; 
     118--  
     1191.8.4.5 
     120 
  • trunk/target/linux/bcm53xx/patches-3.18/062-ARM-BCM5301X-Add-DT-for-Asus-RT-AC56U.patch

    r45684 r45685  
    1 From 97734a031475d5a7e8788435f8ce8374c459ef93 Mon Sep 17 00:00:00 2001 
     1From 16dc3bac722252a10e396546f44135ae1b6a7ff3 Mon Sep 17 00:00:00 2001 
    22From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> 
    3 Date: Tue, 31 Mar 2015 17:26:17 +0200 
     3Date: Tue, 31 Mar 2015 17:29:18 +0200 
    44Subject: [PATCH] ARM: BCM5301X: Add DT for Asus RT-AC56U 
    55MIME-Version: 1.0 
     
    88 
    99Signed-off-by: Rafał Miłecki <zajec5@gmail.com> 
    10 --- 
    11 This patch is based on top of 
    12 ARM: BCM5301X: Add DT for Asus RT-AC68U 
    13 (please follow this order, to avoid Makefile conflict) 
     10Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 
    1411--- 
    1512 arch/arm/boot/dts/Makefile                  |  1 + 
     
    1815 create mode 100644 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts 
    1916 
     17diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile 
     18index 1e8b8b7..4802376 100644 
    2019--- a/arch/arm/boot/dts/Makefile 
    2120+++ b/arch/arm/boot/dts/Makefile 
     
    2827        bcm4708-buffalo-wzr-1750dhp.dtb \ 
    2928        bcm4708-luxul-xwc-1000.dtb \ 
     29diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts 
     30new file mode 100644 
     31index 0000000..71cff8d 
    3032--- /dev/null 
    3133+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts 
     
    127129+       }; 
    128130+}; 
     131--  
     1321.8.4.5 
     133 
  • trunk/target/linux/bcm53xx/patches-3.18/303-ARM-BCM5310X-Enable-earlyprintk-on-tested-devices.patch

    r45311 r45685  
    114114  
    115115        memory { 
     116--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     117+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     118@@ -16,7 +16,7 @@ 
     119        model = "Buffalo WXR-1900DHP"; 
     120  
     121        chosen { 
     122-               bootargs = "console=ttyS0,115200"; 
     123+               bootargs = "console=ttyS0,115200 earlyprintk"; 
     124        }; 
     125  
     126        memory { 
  • trunk/target/linux/bcm53xx/patches-3.18/306-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch

    r45352 r45685  
    124124  
    125125        leds { 
     126--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     127+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     128@@ -20,7 +20,8 @@ 
     129        }; 
     130  
     131        memory { 
     132-               reg = <0x00000000 0x08000000>; 
     133+               reg = <0x00000000 0x08000000 
     134+                      0x88000000 0x18000000>; 
     135        }; 
     136  
     137        leds { 
  • trunk/target/linux/bcm53xx/patches-3.18/322-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch

    r45311 r45685  
    1616--- a/arch/arm/boot/dts/Makefile 
    1717+++ b/arch/arm/boot/dts/Makefile 
    18 @@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
     18@@ -65,6 +65,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
    1919        bcm47081-asus-rt-n18u.dtb \ 
    2020        bcm47081-buffalo-wzr-600dhp2.dtb \ 
    2121        bcm47081-buffalo-wzr-900dhp.dtb \ 
    2222+       bcm4709-asus-rt-ac87u.dtb \ 
     23        bcm4709-buffalo-wxr-1900dhp.dtb \ 
    2324        bcm4709-netgear-r8000.dtb 
    2425 dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 
    25  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ 
    2626--- /dev/null 
    2727+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts 
  • trunk/target/linux/bcm53xx/patches-3.18/351-ARM-BCM5301X-Enable-ChipCommon-UART-serial-console.patch

    r45352 r45685  
    188188                compatible = "gpio-leds"; 
    189189  
     190--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     191+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts 
     192@@ -24,6 +24,18 @@ 
     193                       0x88000000 0x18000000>; 
     194        }; 
     195  
     196+       chipcommonA { 
     197+               uart0: serial@0300 { 
     198+                       status = "okay"; 
     199+                       clock-frequency = <125000000>; 
     200+               }; 
     201+ 
     202+               uart1: serial@0400 { 
     203+                       status = "okay"; 
     204+                       clock-frequency = <125000000>; 
     205+               }; 
     206+       }; 
     207+ 
     208        clocks { 
     209                clk_periph: periph { 
     210                        clock-frequency = <500000000>; 
Note: See TracChangeset for help on using the changeset viewer.