aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-12-05 02:19:08 -0500
committerOlof Johansson <olof@lixom.net>2014-12-05 02:19:08 -0500
commit83b63c699b53050a00a3ffb6c43663c4647dac30 (patch)
tree9178f41b5b53f7aa334a4ef94130986e108a206b /arch/arm/boot
parent403ea7f6c607ba61392451576caa04de7363479c (diff)
parentdd7733da69f198f576d7f52f6bc5a860fe24930d (diff)
Merge tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux into next/dt
Merge "ARM: BCM5301X: DT changes for v3.19 #2" from Hauke Mehrtens: ARM: BCM5301X: dts updates This adds the IRQ number to the main dts file and some new dts files for newly added devices. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux: ARM: BCM5301X: Add DT for Buffalo WZR-600DHP2 ARM: BCM5301X: Add DT for Asus RT-N18U ARM: BCM5301X: Add DT for Buffalo WZR-1750DHP ARM: BCM5301X: Add DT for Netgear R6300 V2 ARM: BCM5301X: Add buttons for Netgear R6250 ARM: BCM5301X: Add IRQs to Broadcom's bus-axi in DTS file Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/Makefile7
-rw-r--r--arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts64
-rw-r--r--arch/arm/boot/dts/bcm4708-netgear-r6250.dts25
-rw-r--r--arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts84
-rw-r--r--arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts78
-rw-r--r--arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts57
-rw-r--r--arch/arm/boot/dts/bcm47081.dtsi26
-rw-r--r--arch/arm/boot/dts/bcm5301x.dtsi35
8 files changed, 375 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 0dd08c9ec55d..2ca4bab3ecc4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -55,7 +55,12 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
55dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb 55dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
56dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb 56dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
57dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb 57dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
58dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb 58dtb-$(CONFIG_ARCH_BCM_5301X) += \
59 bcm4708-buffalo-wzr-1750dhp.dtb \
60 bcm4708-netgear-r6250.dtb \
61 bcm4708-netgear-r6300-v2.dtb \
62 bcm47081-asus-rt-n18u.dtb \
63 bcm47081-buffalo-wzr-600dhp2.dtb
59dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb 64dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
60dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \ 65dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
61 bcm911360k.dtb \ 66 bcm911360k.dtb \
diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
new file mode 100644
index 000000000000..5fc0fae03092
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -0,0 +1,64 @@
1/*
2 * Broadcom BCM470X / BCM5301X ARM platform code.
3 * DTS for Buffalo WZR-1750DHP
4 *
5 * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
6 *
7 * Licensed under the GNU/GPL. See COPYING for details.
8 */
9
10/dts-v1/;
11
12#include "bcm4708.dtsi"
13
14/ {
15 compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708";
16 model = "Buffalo WZR-1750DHP (BCM4708)";
17
18 chosen {
19 bootargs = "console=ttyS0,115200";
20 };
21
22 memory {
23 reg = <0x00000000 0x08000000>;
24 };
25
26 gpio-keys {
27 compatible = "gpio-keys";
28 #address-cells = <1>;
29 #size-cells = <0>;
30 poll-interval = <200>;
31
32 restart {
33 label = "Reset";
34 linux,code = <KEY_RESTART>;
35 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
36 };
37
38 aoss {
39 label = "AOSS";
40 linux,code = <KEY_WPS_BUTTON>;
41 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
42 };
43
44 /* Commit mode set by switch? */
45 mode {
46 label = "Mode";
47 linux,code = <KEY_SETUP>;
48 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
49 };
50
51 /* Switch: AP mode */
52 sw_ap {
53 label = "AP";
54 linux,code = <BTN_0>;
55 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
56 };
57
58 eject {
59 label = "USB eject";
60 linux,code = <KEY_EJECTCD>;
61 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
62 };
63 };
64};
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index 58d999d79124..4ed7de1058b7 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -66,4 +66,29 @@
66 linux,default-trigger = "default-off"; 66 linux,default-trigger = "default-off";
67 }; 67 };
68 }; 68 };
69
70 gpio-keys {
71 compatible = "gpio-keys";
72 #address-cells = <1>;
73 #size-cells = <0>;
74 poll-interval = <200>;
75
76 wps {
77 label = "WPS";
78 linux,code = <KEY_WPS_BUTTON>;
79 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
80 };
81
82 rfkill {
83 label = "WiFi";
84 linux,code = <KEY_RFKILL>;
85 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
86 };
87
88 restart {
89 label = "Reset";
90 linux,code = <KEY_RESTART>;
91 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
92 };
93 };
69}; 94};
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
new file mode 100644
index 000000000000..12fc2a01e6ab
--- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -0,0 +1,84 @@
1/*
2 * Broadcom BCM470X / BCM5301X ARM platform code.
3 * DTS for Netgear R6300 V2
4 *
5 * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
6 *
7 * Licensed under the GNU/GPL. See COPYING for details.
8 */
9
10/dts-v1/;
11
12#include "bcm4708.dtsi"
13
14/ {
15 compatible = "netgear,r6300v2", "brcm,bcm4708";
16 model = "Netgear R6300 V2 (BCM4708)";
17
18 chosen {
19 bootargs = "console=ttyS0,115200";
20 };
21
22 memory {
23 reg = <0x00000000 0x08000000>;
24 };
25
26 leds {
27 compatible = "gpio-leds";
28
29 logo {
30 label = "bcm53xx:white:logo";
31 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
32 linux,default-trigger = "default-on";
33 };
34
35 power0 {
36 label = "bcm53xx:green:power";
37 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
38 linux,default-trigger = "default-off";
39 };
40
41 power1 {
42 label = "bcm53xx:amber:power";
43 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
44 linux,default-trigger = "default-on";
45 };
46
47 usb {
48 label = "bcm53xx:blue:usb";
49 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
50 linux,default-trigger = "default-off";
51 };
52
53 wireless {
54 label = "bcm53xx:blue:wireless";
55 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
56 linux,default-trigger = "default-off";
57 };
58 };
59
60 gpio-keys {
61 compatible = "gpio-keys";
62 #address-cells = <1>;
63 #size-cells = <0>;
64 poll-interval = <200>;
65
66 wps {
67 label = "WPS";
68 linux,code = <KEY_WPS_BUTTON>;
69 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
70 };
71
72 rfkill {
73 label = "WiFi";
74 linux,code = <KEY_RFKILL>;
75 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
76 };
77
78 restart {
79 label = "Reset";
80 linux,code = <KEY_RESTART>;
81 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
82 };
83 };
84};
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
new file mode 100644
index 000000000000..fb76378bd511
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -0,0 +1,78 @@
1/*
2 * Broadcom BCM470X / BCM5301X ARM platform code.
3 * DTS for Asus RT-N18U
4 *
5 * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
6 *
7 * Licensed under the GNU/GPL. See COPYING for details.
8 */
9
10/dts-v1/;
11
12#include "bcm47081.dtsi"
13
14/ {
15 compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708";
16 model = "Asus RT-N18U (BCM47081)";
17
18 chosen {
19 bootargs = "console=ttyS0,115200";
20 };
21
22 memory {
23 reg = <0x00000000 0x08000000>;
24 };
25
26 leds {
27 compatible = "gpio-leds";
28
29 power {
30 label = "bcm53xx:blue:power";
31 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
32 linux,default-trigger = "default-on";
33 };
34
35 usb2 {
36 label = "bcm53xx:blue:usb2";
37 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
38 linux,default-trigger = "default-off";
39 };
40
41 wan {
42 label = "bcm53xx:blue:wan";
43 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
44 linux,default-trigger = "default-on";
45 };
46
47 lan {
48 label = "bcm53xx:blue:lan";
49 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
50 linux,default-trigger = "default-on";
51 };
52
53 usb3 {
54 label = "bcm53xx:blue:usb3";
55 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
56 linux,default-trigger = "default-off";
57 };
58 };
59
60 gpio-keys {
61 compatible = "gpio-keys";
62 #address-cells = <1>;
63 #size-cells = <0>;
64 poll-interval = <200>;
65
66 restart {
67 label = "Reset";
68 linux,code = <KEY_RESTART>;
69 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
70 };
71
72 wps {
73 label = "WPS";
74 linux,code = <KEY_WPS_BUTTON>;
75 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
76 };
77 };
78};
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
new file mode 100644
index 000000000000..bbb414fbad65
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -0,0 +1,57 @@
1/*
2 * Broadcom BCM470X / BCM5301X ARM platform code.
3 * DTS for Buffalo WZR-600DHP2
4 *
5 * Copyright (C) 2014 Rafał Miłecki <zajec5@gmail.com>
6 *
7 * Licensed under the GNU/GPL. See COPYING for details.
8 */
9
10/dts-v1/;
11
12#include "bcm47081.dtsi"
13
14/ {
15 compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708";
16 model = "Buffalo WZR-600DHP2 (BCM47081)";
17
18 chosen {
19 bootargs = "console=ttyS0,115200";
20 };
21
22 memory {
23 reg = <0x00000000 0x08000000>;
24 };
25
26 gpio-keys {
27 compatible = "gpio-keys";
28 #address-cells = <1>;
29 #size-cells = <0>;
30 poll-interval = <200>;
31
32 aoss {
33 label = "AOSS";
34 linux,code = <KEY_WPS_BUTTON>;
35 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
36 };
37
38 restart {
39 label = "Reset";
40 linux,code = <KEY_RESTART>;
41 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
42 };
43
44 /* Switch device mode? */
45 mode {
46 label = "Mode";
47 linux,code = <KEY_SETUP>;
48 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
49 };
50
51 eject {
52 label = "USB eject";
53 linux,code = <KEY_EJECTCD>;
54 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
55 };
56 };
57};
diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi
new file mode 100644
index 000000000000..f720012ee5ed
--- /dev/null
+++ b/arch/arm/boot/dts/bcm47081.dtsi
@@ -0,0 +1,26 @@
1/*
2 * Broadcom BCM470X / BCM5301X ARM platform code.
3 * DTS for BCM47081 SoC.
4 *
5 * Copyright © 2014 Rafał Miłecki <zajec5@gmail.com>
6 *
7 * Licensed under the GNU/GPL. See COPYING for details.
8 */
9
10#include "bcm5301x.dtsi"
11
12/ {
13 compatible = "brcm,bcm47081";
14
15 cpus {
16 #address-cells = <1>;
17 #size-cells = <0>;
18
19 cpu@0 {
20 device_type = "cpu";
21 compatible = "arm,cortex-a9";
22 next-level-cache = <&L2>;
23 reg = <0x0>;
24 };
25 };
26};
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 6d80922ce747..78aec6270c2f 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -9,6 +9,7 @@
9 */ 9 */
10 10
11#include <dt-bindings/gpio/gpio.h> 11#include <dt-bindings/gpio/gpio.h>
12#include <dt-bindings/input/input.h>
12#include <dt-bindings/interrupt-controller/irq.h> 13#include <dt-bindings/interrupt-controller/irq.h>
13#include <dt-bindings/interrupt-controller/arm-gic.h> 14#include <dt-bindings/interrupt-controller/arm-gic.h>
14#include "skeleton.dtsi" 15#include "skeleton.dtsi"
@@ -101,6 +102,40 @@
101 #address-cells = <1>; 102 #address-cells = <1>;
102 #size-cells = <1>; 103 #size-cells = <1>;
103 104
105 #interrupt-cells = <1>;
106 interrupt-map-mask = <0x000fffff 0xffff>;
107 interrupt-map =
108 /* ChipCommon */
109 <0x00000000 0 &gic GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
110
111 /* USB 2.0 Controller */
112 <0x00021000 0 &gic GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
113
114 /* USB 3.0 Controller */
115 <0x00023000 0 &gic GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
116
117 /* Ethernet Controller 0 */
118 <0x00024000 0 &gic GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>,
119
120 /* Ethernet Controller 1 */
121 <0x00025000 0 &gic GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
122
123 /* Ethernet Controller 2 */
124 <0x00026000 0 &gic GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
125
126 /* Ethernet Controller 3 */
127 <0x00027000 0 &gic GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>,
128
129 /* NAND Controller */
130 <0x00028000 0 &gic GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
131 <0x00028000 1 &gic GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
132 <0x00028000 2 &gic GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
133 <0x00028000 3 &gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
134 <0x00028000 4 &gic GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
135 <0x00028000 5 &gic GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
136 <0x00028000 6 &gic GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
137 <0x00028000 7 &gic GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
138
104 chipcommon: chipcommon@0 { 139 chipcommon: chipcommon@0 {
105 reg = <0x00000000 0x1000>; 140 reg = <0x00000000 0x1000>;
106 141
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 22:53:39 -0500