Skip to content

Commit ed78068

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull 64-bit ARM DT updates from Olof Johansson: "Just as the 32-bit contents, the 64-bit device tree branch also contains a number of additions this release cycle. New platforms: - LG LG1313 - Mediatek MT6755 - Renesas r8a7796 - Broadcom 2837 Other platforms with larger updates are: - Nvidia X1 platforms (USB 3.0, regulators, display subsystem) - Mediatek MT8173 (display subsystem added) - Rockchip RK3399 (a lot of new peripherals) - ARM Juno reference implementation (SCPI power domains, coresight, thermal)" * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits) arm64: tegra: Enable HDMI on Jetson TX1 arm64: tegra: Add sor1_src clock arm64: tegra: Add XUSB powergates on Tegra210 arm64: tegra: Add DPAUX pinctrl bindings arm64: tegra: Add ACONNECT bus node for Tegra210 arm64: tegra: Add audio powergate node for Tegra210 arm64: tegra: Add regulators for Tegra210 Smaug arm64: tegra: Correct Tegra210 XUSB mailbox interrupt arm64: tegra: Enable XUSB controller on Jetson TX1 arm64: tegra: Enable debug serial on Jetson TX1 arm64: tegra: Add Tegra210 XUSB controller arm64: tegra: Add Tegra210 XUSB pad controller arm64: tegra: Add DSI panel on Jetson TX1 arm64: tegra: p2597: Add SDMMC power supplies arm64: tegra: Add PMIC support on Jetson TX1 Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock" arm64: dts: hi6220: Add pl031 RTC support arm64: dts: r8a7796/salvator-x: Enable watchdog timer arm64: dts: r8a7796: Add RWDT node arm64: dts: r8a7796: Use SYSC "always-on" PM Domain ...
2 parents 043248c + 943283e commit ed78068

Some content is hidden

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

60 files changed

+4450
-141
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ Raspberry Pi 2 Model B
3030
Required root node properties:
3131
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
3232

33+
Raspberry Pi 3 Model B
34+
Required root node properties:
35+
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
36+
3337
Raspberry Pi Compute Module
3438
Required root node properties:
3539
compatible = "raspberrypi,compute-module", "brcm,bcm2835";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ compatible: Must contain one of
1010
"mediatek,mt6580"
1111
"mediatek,mt6589"
1212
"mediatek,mt6592"
13+
"mediatek,mt6755"
1314
"mediatek,mt6795"
1415
"mediatek,mt7623"
1516
"mediatek,mt8127"
@@ -31,6 +32,9 @@ Supported boards:
3132
- Evaluation board for MT6592:
3233
Required root node properties:
3334
- compatible = "mediatek,mt6592-evb", "mediatek,mt6592";
35+
- Evaluation phone for MT6755(Helio P10):
36+
Required root node properties:
37+
- compatible = "mediatek,mt6755-evb", "mediatek,mt6755";
3438
- Evaluation board for MT6795(Helio X10):
3539
Required root node properties:
3640
- compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ SoCs:
2929
compatible = "renesas,r8a7794"
3030
- R-Car H3 (R8A77950)
3131
compatible = "renesas,r8a7795"
32+
- R-Car M3-W (R8A77960)
33+
compatible = "renesas,r8a7796"
3234

3335

3436
Boards:
@@ -63,5 +65,7 @@ Boards:
6365
compatible = "renesas,porter", "renesas,r8a7791"
6466
- Salvator-X (RTP0RC7795SIPB0010S)
6567
compatible = "renesas,salvator-x", "renesas,r8a7795";
68+
- Salvator-X
69+
compatible = "renesas,salvator-x", "renesas,r8a7796";
6670
- SILK (RTP0RC7794LCB00011S)
6771
compatible = "renesas,silk", "renesas,r8a7794"

‎Documentation/devicetree/bindings/ata/ahci-platform.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PHYs.
1010
Required properties:
1111
- compatible : compatible string, one of:
1212
- "allwinner,sun4i-a10-ahci"
13+
- "brcm,iproc-ahci"
1314
- "hisilicon,hisi-ahci"
1415
- "cavium,octeon-7130-ahci"
1516
- "ibm,476gtr-ahci"

‎Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Required properties:
99
"mediatek,mt8135-sysirq"
1010
"mediatek,mt8127-sysirq"
1111
"mediatek,mt6795-sysirq"
12+
"mediatek,mt6755-sysirq"
1213
"mediatek,mt6592-sysirq"
1314
"mediatek,mt6589-sysirq"
1415
"mediatek,mt6582-sysirq"

‎Documentation/devicetree/bindings/net/apm-xgene-enet.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Example:
5959
compatible = "apm,xgene-enet";
6060
status = "disabled";
6161
reg = <0x0 0x17020000 0x0 0xd100>,
62-
<0x0 0X17030000 0x0 0X400>,
63-
<0x0 0X10000000 0x0 0X200>;
62+
<0x0 0x17030000 0x0 0x400>,
63+
<0x0 0x10000000 0x0 0x200>;
6464
reg-names = "enet_csr", "ring_csr", "ring_cmd";
6565
interrupts = <0x0 0x3c 0x4>;
6666
port-id = <0>;

‎Documentation/devicetree/bindings/pci/layerscape-pci.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Required properties:
2424
The first entry must be a link to the SCFG device node
2525
The second entry must be '0' or '1' based on physical PCIe controller index.
2626
This is used to get SCFG PEXN registers
27+
- dma-coherent: Indicates that the hardware IP block can ensure the coherency
28+
of the data transferred from/to the IP block. This can avoid the software
29+
cache flush/invalid actions, and improve the performance significantly.
2730

2831
Example:
2932

@@ -38,6 +41,7 @@ Example:
3841
#address-cells = <3>;
3942
#size-cells = <2>;
4043
device_type = "pci";
44+
dma-coherent;
4145
num-lanes = <4>;
4246
bus-range = <0x0 0xff>;
4347
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */

‎Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Required properties for the root node:
55
"amlogic,meson8b-cbus-pinctrl"
66
"amlogic,meson8-aobus-pinctrl"
77
"amlogic,meson8b-aobus-pinctrl"
8+
"amlogic,meson-gxbb-periphs-pinctrl"
9+
"amlogic,meson-gxbb-aobus-pinctrl"
810
- reg: address and size of registers controlling irq functionality
911

1012
=== GPIO sub-nodes ===

‎Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Amlogic Meson Random number generator
2+
=====================================
3+
4+
Required properties:
5+
6+
- compatible : should be "amlogic,meson-rng"
7+
- reg : Specifies base physical address and size of the registers.
8+
9+
Example:
10+
11+
rng {
12+
compatible = "amlogic,meson-rng";
13+
reg = <0x0 0xc8834000 0x0 0x4>;
14+
};

‎Documentation/devicetree/bindings/serial/mtk-uart.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Required properties:
66
* "mediatek,mt6580-uart" for MT6580 compatible UARTS
77
* "mediatek,mt6582-uart" for MT6582 compatible UARTS
88
* "mediatek,mt6589-uart" for MT6589 compatible UARTS
9+
* "mediatek,mt6755-uart" for MT6755 compatible UARTS
910
* "mediatek,mt6795-uart" for MT6795 compatible UARTS
1011
* "mediatek,mt7623-uart" for MT7623 compatible UARTS
1112
* "mediatek,mt8127-uart" for MT8127 compatible UARTS

‎arch/arm64/Kconfig.platforms

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,12 @@ config ARCH_R8A7795
140140
help
141141
This enables support for the Renesas R-Car H3 SoC.
142142

143+
config ARCH_R8A7796
144+
bool "Renesas R-Car M3-W SoC Platform"
145+
depends on ARCH_RENESAS
146+
help
147+
This enables support for the Renesas R-Car M3-W SoC.
148+
143149
config ARCH_STRATIX10
144150
bool "Altera's Stratix 10 SoCFPGA Family"
145151
help

‎arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
/dts-v1/;
4646

4747
#include "meson-gxbb.dtsi"
48+
#include <dt-bindings/gpio/gpio.h>
4849

4950
/ {
5051
compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb";
@@ -62,8 +63,27 @@
6263
device_type = "memory";
6364
reg = <0x0 0x0 0x0 0x80000000>;
6465
};
66+
67+
leds {
68+
compatible = "gpio-leds";
69+
blue {
70+
label = "c2:blue:alive";
71+
gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
72+
linux,default-trigger = "heartbeat";
73+
default-state = "off";
74+
};
75+
};
6576
};
6677

6778
&uart_AO {
6879
status = "okay";
80+
pinctrl-0 = <&uart_ao_a_pins>;
81+
pinctrl-names = "default";
82+
};
83+
84+
&ethmac {
85+
status = "okay";
86+
pinctrl-0 = <&eth_pins>;
87+
pinctrl-names = "default";
6988
};
89+

‎arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,13 @@
6262
/* This UART is brought out to the DB9 connector */
6363
&uart_AO {
6464
status = "okay";
65+
pinctrl-0 = <&uart_ao_a_pins>;
66+
pinctrl-names = "default";
6567
};
68+
69+
&ethmac {
70+
status = "okay";
71+
pinctrl-0 = <&eth_pins>;
72+
pinctrl-names = "default";
73+
};
74+

‎arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,7 @@
5656

5757
&uart_AO {
5858
status = "okay";
59+
pinctrl-0 = <&uart_ao_a_pins>;
60+
pinctrl-names = "default";
61+
5962
};

0 commit comments

Comments
 (0)