Skip to content

Commit 527d147

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM device-tree updates from Arnd Bergmann: "We add device tree files for a couple of additional SoCs in various areas: Allwinner R40/V40 for entertainment, Broadcom Hurricane 2 for networking, Amlogic A113D for audio, and Renesas R-Car V3M for automotive. As usual, lots of new boards get added based on those and other SoCs: - Actions S500 based CubieBoard6 single-board computer - Amlogic Meson-AXG A113D based development board - Amlogic S912 based Khadas VIM2 single-board computer - Amlogic S912 based Tronsmart Vega S96 set-top-box - Allwinner H5 based NanoPi NEO Plus2 single-board computer - Allwinner R40 based Banana Pi M2 Ultra and Berry single-board computers - Allwinner A83T based TBS A711 Tablet - Broadcom Hurricane 2 based Ubiquiti UniFi Switch 8 - Broadcom bcm47xx based Luxul XAP-1440/XAP-810/ABR-4500/XBR-4500 wireless access points and routers - NXP i.MX51 based Zodiac Inflight Innovations RDU1 board - NXP i.MX53 based GE Healthcare PPD biometric monitor - NXP i.MX6 based Pistachio single-board computer - NXP i.MX6 based Vining-2000 automotive diagnostic interface - NXP i.MX6 based Ka-Ro TX6 Computer-on-Module in additional variants - Qualcomm MSM8974 (Snapdragon 800) based Fairphone 2 phone - Qualcomm MSM8974pro (Snapdragon 801) based Sony Xperia Z2 Tablet - Realtek RTD1295 based set-top-boxes MeLE V9 and PROBOX2 AVA - Renesas R-Car V3M (R8A77970) SoC and "Eagle" reference board - Renesas H3ULCB and M3ULCB "Kingfisher" extension infotainment boards - Renasas r8a7745 based iWave G22D-SODIMM SoM - Rockchip rk3288 based Amarula Vyasa single-board computer - Samsung Exynos5800 based Odroid HC1 single-board computer For existing SoC support, there was a lot of ongoing work, as usual most of that concentrated on the Renesas, Rockchip, OMAP, i.MX, Amlogic and Allwinner platforms, but others were also active. Rob Herring and many others worked on reducing the number of issues that the latest version of 'dtc' now warns about. Unfortunately there is still a lot left to do. A rework of the ARM foundation model introduced several new files for common variations of the model" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (599 commits) arm64: dts: uniphier: route on-board device IRQ to GPIO controller for PXs3 dt-bindings: bus: Add documentation for the Technologic Systems NBUS arm64: dts: actions: s900-bubblegum-96: Add fake uart5 clock ARM: dts: owl-s500: Add CubieBoard6 dt-bindings: arm: actions: Add CubieBoard6 ARM: dts: owl-s500-guitar-bb-rev-b: Add fake uart3 clock ARM: dts: owl-s500: Set power domains for CPU2 and CPU3 arm: dts: mt7623: remove unused compatible string for pio node arm: dts: mt7623: update usb related nodes arm: dts: mt7623: update crypto node ARM: dts: sun8i: a711: Enable USB OTG ARM: dts: sun8i: a711: Add regulator support ARM: dts: sun8i: a83t: bananapi-m3: Enable AP6212 WiFi on mmc1 ARM: dts: sun8i: a83t: cubietruck-plus: Enable AP6330 WiFi on mmc1 ARM: dts: sun8i: a83t: Move mmc1 pinctrl setting to dtsi file ARM: dts: sun8i: a83t: allwinner-h8homlet-v2: Add AXP818 regulator nodes ARM: dts: sun8i: a83t: bananapi-m3: Add AXP813 regulator nodes ARM: dts: sun8i: a83t: cubietruck-plus: Add AXP818 regulator nodes ARM: dts: sunxi: Add dtsi for AXP81x PMIC arm64: dts: allwinner: H5: Restore EMAC changes ...
2 parents 8c60969 + ba5b503 commit 527d147

File tree

608 files changed

+28063
-15882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

608 files changed

+28063
-15882
lines changed

‎Documentation/devicetree/bindings/arm/actions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Boards:
2121

2222
Root node property compatible must contain, depending on board:
2323

24+
- Cubietech CubieBoard6: "cubietech,cubieboard6"
2425
- LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar"
2526

2627

‎Documentation/devicetree/bindings/arm/amlogic.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:
4141
Required root node property:
4242
compatible: "amlogic,s912", "amlogic,meson-gxm";
4343

44+
Boards with the Amlogic Meson AXG A113D SoC shall have the following properties:
45+
Required root node property:
46+
compatible: "amlogic,a113d", "amlogic,meson-axg";
47+
4448
Board compatible values (alphabetically, grouped by SoC):
4549

4650
- "geniatech,atv1200" (Meson6)
@@ -71,8 +75,12 @@ Board compatible values (alphabetically, grouped by SoC):
7175

7276
- "amlogic,q200" (Meson gxm s912)
7377
- "amlogic,q201" (Meson gxm s912)
78+
- "khadas,vim2" (Meson gxm s912)
7479
- "kingnovel,r-box-pro" (Meson gxm S912)
7580
- "nexbox,a1" (Meson gxm s912)
81+
- "tronsmart,vega-s96" (Meson gxm s912)
82+
83+
- "amlogic,s400" (Meson axg a113d)
7684

7785
Amlogic Meson Firmware registers Interface
7886
------------------------------------------

‎Documentation/devicetree/bindings/arm/amlogic/analog-top.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Amlogic Meson8 and Meson8b "analog top" registers:
2+
--------------------------------------------------
3+
4+
The analog top registers contain information about the so-called
5+
"metal revision" (which encodes the "minor version") of the SoC.
6+
7+
Required properties:
8+
- reg: the register range of the analog top registers
9+
- compatible: depending on the SoC this should be one of:
10+
- "amlogic,meson8-analog-top"
11+
- "amlogic,meson8b-analog-top"
12+
along with "syscon"
13+
14+
15+
Example:
16+
17+
analog_top: analog-top@81a8 {
18+
compatible = "amlogic,meson8-analog-top", "syscon";
19+
reg = <0x81a8 0x14>;
20+
};

‎Documentation/devicetree/bindings/arm/amlogic/assist.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Amlogic Meson6/Meson8/Meson8b assist registers:
2+
-----------------------------------------------
3+
4+
The assist registers contain basic information about the SoC,
5+
for example the encoded SoC part number.
6+
7+
Required properties:
8+
- reg: the register range of the assist registers
9+
- compatible: should be "amlogic,meson-mx-assist" along with "syscon"
10+
11+
12+
Example:
13+
14+
assist: assist@7c00 {
15+
compatible = "amlogic,meson-mx-assist", "syscon";
16+
reg = <0x7c00 0x200>;
17+
};

‎Documentation/devicetree/bindings/arm/amlogic/bootrom.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Amlogic Meson6/Meson8/Meson8b bootrom:
2+
--------------------------------------
3+
4+
The bootrom register area can be used to access SoC specific
5+
information, such as the "misc version".
6+
7+
Required properties:
8+
- reg: the register range of the bootrom registers
9+
- compatible: should be "amlogic,meson-mx-bootrom" along with "syscon"
10+
11+
12+
Example:
13+
14+
bootrom: bootrom@d9040000 {
15+
compatible = "amlogic,meson-mx-bootrom", "syscon";
16+
reg = <0xd9040000 0x10000>;
17+
};

‎Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Broadcom Hurricane 2 device tree bindings
2+
---------------------------------------
3+
4+
Broadcom Hurricane 2 family of SoCs are used for switching control. These SoCs
5+
are based on Broadcom's iProc SoC architecture and feature a single core Cortex
6+
A9 ARM CPUs, DDR2/DDR3 memory, PCIe GEN-2, USB 2.0 and USB 3.0, serial and NAND
7+
flash and a PCIe attached integrated switching engine.
8+
9+
Boards with Hurricane SoCs shall have the following properties:
10+
11+
Required root node property:
12+
13+
BCM53342
14+
compatible = "brcm,bcm53342", "brcm,hr2";

‎Documentation/devicetree/bindings/arm/realtek.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Required root node properties:
1212

1313
Root node property compatible must contain, depending on board:
1414

15+
- MeLE V9: "mele,v9"
16+
- ProBox2 AVA: "probox2,ava"
1517
- Zidoo X9S: "zidoo,x9s"
1618

1719

‎Documentation/devicetree/bindings/arm/rockchip.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Rockchip platforms device tree bindings
22
---------------------------------------
3+
- Amarula Vyasa RK3288 board
4+
Required root node properties:
5+
- compatible = "amarula,vyasa-rk3288", "rockchip,rk3288";
6+
37
- Asus Tinker board
48
Required root node properties:
59
- compatible = "asus,rk3288-tinker", "rockchip,rk3288";

‎Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Required root node properties:
5757
- "hardkernel,odroid-xu3-lite" - for Exynos5422-based Hardkernel
5858
Odroid XU3 Lite board.
5959
- "hardkernel,odroid-xu4" - for Exynos5422-based Hardkernel Odroid XU4.
60+
- "hardkernel,odroid-hc1" - for Exynos5422-based Hardkernel Odroid HC1.
6061

6162
* Insignal
6263
- "insignal,arndale" - for Exynos5250-based Insignal Arndale board.

‎Documentation/devicetree/bindings/arm/shmobile.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ SoCs:
3939
compatible = "renesas,r8a7795"
4040
- R-Car M3-W (R8A77960)
4141
compatible = "renesas,r8a7796"
42+
- R-Car V3M (R8A77970)
43+
compatible = "renesas,r8a77970"
4244
- R-Car D3 (R8A77995)
4345
compatible = "renesas,r8a77995"
4446

@@ -57,6 +59,8 @@ Boards:
5759
compatible = "renesas,bockw", "renesas,r8a7778"
5860
- Draak (RTP0RC77995SEB0010S)
5961
compatible = "renesas,draak", "renesas,r8a77995"
62+
- Eagle (RTP0RC77970SEB0010S)
63+
compatible = "renesas,eagle", "renesas,r8a77970"
6064
- Genmai (RTK772100BC00000BR)
6165
compatible = "renesas,genmai", "renesas,r7s72100"
6266
- GR-Peach (X28A-M01-E/F)
@@ -65,7 +69,7 @@ Boards:
6569
compatible = "renesas,gose", "renesas,r8a7793"
6670
- H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKBX0010SA00 (H3 ES1.1))
6771
H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
68-
compatible = "renesas,h3ulcb", "renesas,r8a7795";
72+
compatible = "renesas,h3ulcb", "renesas,r8a7795"
6973
- Henninger
7074
compatible = "renesas,henninger", "renesas,r8a7791"
7175
- iWave Systems RZ/G1E SODIMM SOM Development Platform (iW-RainboW-G22D)
@@ -76,6 +80,8 @@ Boards:
7680
compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"
7781
- iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
7882
compatible = "iwave,g20m", "renesas,r8a7743"
83+
- Kingfisher (SBEV-RCAR-KF-M03)
84+
compatible = "shimafuji,kingfisher"
7985
- Koelsch (RTP0RC7791SEB00010S)
8086
compatible = "renesas,koelsch", "renesas,r8a7791"
8187
- Kyoto Microcomputer Co. KZM-A9-Dual
@@ -85,19 +91,19 @@ Boards:
8591
- Lager (RTP0RC7790SEB00010S)
8692
compatible = "renesas,lager", "renesas,r8a7790"
8793
- M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKBX0010SA09 (M3 ES1.0))
88-
compatible = "renesas,m3ulcb", "renesas,r8a7796";
94+
compatible = "renesas,m3ulcb", "renesas,r8a7796"
8995
- Marzen (R0P7779A00010S)
9096
compatible = "renesas,marzen", "renesas,r8a7779"
9197
- Porter (M2-LCDP)
9298
compatible = "renesas,porter", "renesas,r8a7791"
9399
- RSKRZA1 (YR0K77210C000BE)
94100
compatible = "renesas,rskrza1", "renesas,r7s72100"
95101
- Salvator-X (RTP0RC7795SIPB0010S)
96-
compatible = "renesas,salvator-x", "renesas,r8a7795";
102+
compatible = "renesas,salvator-x", "renesas,r8a7795"
97103
- Salvator-X (RTP0RC7796SIPB0011S)
98-
compatible = "renesas,salvator-x", "renesas,r8a7796";
104+
compatible = "renesas,salvator-x", "renesas,r8a7796"
99105
- Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
100-
compatible = "renesas,salvator-xs", "renesas,r8a7795";
106+
compatible = "renesas,salvator-xs", "renesas,r8a7795"
101107
- SILK (RTP0RC7794LCB00011S)
102108
compatible = "renesas,silk", "renesas,r8a7794"
103109
- SK-RZG1E (YR8A77450S000BE)

‎Documentation/devicetree/bindings/bus/ts-nbus.txt

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Technologic Systems NBUS
2+
3+
The NBUS is a bus used to interface with peripherals in the Technologic
4+
Systems FPGA on the TS-4600 SoM.
5+
6+
Required properties :
7+
- compatible : "technologic,ts-nbus"
8+
- #address-cells : must be 1
9+
- #size-cells : must be 0
10+
- pwms : The PWM bound to the FPGA
11+
- ts,data-gpios : The 8 GPIO pins connected to the data lines on the FPGA
12+
- ts,csn-gpios : The GPIO pin connected to the csn line on the FPGA
13+
- ts,txrx-gpios : The GPIO pin connected to the txrx line on the FPGA
14+
- ts,strobe-gpios : The GPIO pin connected to the stobe line on the FPGA
15+
- ts,ale-gpios : The GPIO pin connected to the ale line on the FPGA
16+
- ts,rdy-gpios : The GPIO pin connected to the rdy line on the FPGA
17+
18+
Child nodes:
19+
20+
The NBUS node can contain zero or more child nodes representing peripherals
21+
on the bus.
22+
23+
Example:
24+
25+
nbus {
26+
compatible = "technologic,ts-nbus";
27+
pinctrl-0 = <&nbus_pins>;
28+
#address-cells = <1>;
29+
#size-cells = <0>;
30+
pwms = <&pwm 2 83>;
31+
ts,data-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH
32+
&gpio0 1 GPIO_ACTIVE_HIGH
33+
&gpio0 2 GPIO_ACTIVE_HIGH
34+
&gpio0 3 GPIO_ACTIVE_HIGH
35+
&gpio0 4 GPIO_ACTIVE_HIGH
36+
&gpio0 5 GPIO_ACTIVE_HIGH
37+
&gpio0 6 GPIO_ACTIVE_HIGH
38+
&gpio0 7 GPIO_ACTIVE_HIGH>;
39+
ts,csn-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
40+
ts,txrx-gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
41+
ts,strobe-gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
42+
ts,ale-gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
43+
ts,rdy-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
44+
45+
watchdog@2a {
46+
compatible = "...";
47+
48+
/* ... */
49+
};
50+
};

‎Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,20 @@ These clock IDs are defined in:
137137
ch1_audio audiopll 2 BCM_CYGNUS_AUDIOPLL_CH1
138138
ch2_audio audiopll 3 BCM_CYGNUS_AUDIOPLL_CH2
139139

140+
Hurricane 2
141+
------
142+
PLL and leaf clock compatible strings for Hurricane 2 are:
143+
"brcm,hr2-armpll"
144+
145+
The following table defines the set of PLL/clock for Hurricane 2:
146+
147+
Clock Source Index ID
148+
--- ----- ----- ---------
149+
crystal N/A N/A N/A
150+
151+
armpll crystal N/A N/A
152+
153+
140154
Northstar and Northstar Plus
141155
------
142156
PLL and leaf clock compatible strings for Northstar and Northstar Plus are:

‎Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Optional properties:
3737

3838
Example:
3939

40-
hdmi0: hdmi0@fead0000 {
40+
hdmi0: hdmi@fead0000 {
4141
compatible = "renesas,r8a7795-dw-hdmi";
4242
reg = <0 0xfead0000 0 0x10000>;
4343
interrupts = <0 389 IRQ_TYPE_LEVEL_HIGH>;

‎Documentation/devicetree/bindings/dma/sun6i-dma.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Required properties:
1818
- #dma-cells : Should be 1, a single cell holding a line request number
1919

2020
Example:
21-
dma: dma-controller@01c02000 {
21+
dma: dma-controller@1c02000 {
2222
compatible = "allwinner,sun6i-a31-dma";
2323
reg = <0x01c02000 0x1000>;
2424
interrupts = <0 50 4>;

‎Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Required properties:
1313
+ allwinner,sun50i-h5-mali
1414
+ amlogic,meson-gxbb-mali
1515
+ amlogic,meson-gxl-mali
16+
+ rockchip,rk3036-mali
17+
+ rockchip,rk3066-mali
18+
+ rockchip,rk3188-mali
19+
+ rockchip,rk3228-mali
1620
+ stericsson,db8500-mali
1721

1822
- reg: Physical base address and length of the GPU registers
@@ -40,10 +44,18 @@ Optional properties:
4044
Memory region to allocate from, as defined in
4145
Documentation/devicetree/bindi/reserved-memory/reserved-memory.txt
4246

47+
- mali-supply:
48+
Phandle to regulator for the Mali device, as defined in
49+
Documentation/devicetree/bindings/regulator/regulator.txt for details.
50+
4351
- operating-points-v2:
4452
Operating Points for the GPU, as defined in
4553
Documentation/devicetree/bindings/opp/opp.txt
4654

55+
- power-domains:
56+
A power domain consumer specifier as defined in
57+
Documentation/devicetree/bindings/power/power_domain.txt
58+
4759
Vendor-specific bindings
4860
------------------------
4961

@@ -63,6 +75,10 @@ to specify one more vendor-specific compatible, among:
6375
Required properties:
6476
* resets: phandle to the reset line for the GPU
6577

78+
- Rockchip variants:
79+
Required properties:
80+
* resets: phandle to the reset line for the GPU
81+
6682
- stericsson,db8500-mali
6783
Required properties:
6884
* interrupt-names and interrupts:

‎Documentation/devicetree/bindings/misc/ge-achc.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
* GE Healthcare USB Management Controller
2+
3+
A device which handles data aquisition from compatible USB based peripherals.
4+
SPI is used for device management.
5+
6+
Note: This device does not expose the peripherals as USB devices.
7+
8+
Required properties:
9+
10+
- compatible : Should be "ge,achc"
11+
12+
Required SPI properties:
13+
14+
- reg : Should be address of the device chip select within
15+
the controller.
16+
17+
- spi-max-frequency : Maximum SPI clocking speed of device in Hz, should be
18+
1MHz for the GE ACHC.
19+
20+
Example:
21+
22+
spidev0: spi@0 {
23+
compatible = "ge,achc";
24+
reg = <0>;
25+
spi-max-frequency = <1000000>;
26+
};

‎Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Required properties:
1313
at25df321a
1414
at25df641
1515
at26df081a
16+
en25s64
1617
mr25h256
1718
mr25h10
1819
mr25h40
@@ -31,6 +32,7 @@ Required properties:
3132
s25fl008k
3233
s25fl064k
3334
sst25vf040b
35+
sst25wf040b
3436
m25p40
3537
m25p80
3638
m25p16

0 commit comments

Comments
 (0)