mirror of
https://github.com/hardkernel/linux.git
synced 2026-04-17 19:12:35 +09:00
Merge tag 'uniphier-dt-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt
UniPhier ARM SoC DT updates for v5.8 - add DMA controller nodes * tag 'uniphier-dt-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier: ARM: dts: uniphier: add #address-cells and #size-cells to SPI nodes ARM: dts: uniphier: Add ethernet aliases ARM: dts: uniphier: Add XDMAC node Link: https://lore.kernel.org/r/CAK7LNAQXSpg4s0e0d-tp9j85Sj01t13zAa5+rqsOWu4ZvkpYhg@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -67,6 +67,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006000 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 39 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi0>;
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
i2c4 = &i2c4;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
i2c3 = &i2c3;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
i2c3 = &i2c3;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
i2c3 = &i2c3;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -75,6 +75,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006000 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 39 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi0>;
|
||||
@@ -426,6 +428,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
xdmac: dma-controller@5fc10000 {
|
||||
compatible = "socionext,uniphier-xdmac";
|
||||
reg = <0x5fc10000 0x5300>;
|
||||
interrupts = <0 188 4>;
|
||||
dma-channels = <16>;
|
||||
#dma-cells = <2>;
|
||||
};
|
||||
|
||||
aidet: interrupt-controller@5fc20000 {
|
||||
compatible = "socionext,uniphier-pro4-aidet";
|
||||
reg = <0x5fc20000 0x200>;
|
||||
|
||||
@@ -160,6 +160,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006000 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 39 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi0>;
|
||||
@@ -171,6 +173,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006100 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 216 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi1>;
|
||||
@@ -408,6 +412,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
xdmac: dma-controller@5fc10000 {
|
||||
compatible = "socionext,uniphier-xdmac";
|
||||
reg = <0x5fc10000 0x5300>;
|
||||
interrupts = <0 188 4>;
|
||||
dma-channels = <16>;
|
||||
#dma-cells = <2>;
|
||||
};
|
||||
|
||||
aidet: interrupt-controller@5fc20000 {
|
||||
compatible = "socionext,uniphier-pro5-aidet";
|
||||
reg = <0x5fc20000 0x200>;
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
i2c4 = &i2c4;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
i2c4 = &i2c4;
|
||||
i2c5 = &i2c5;
|
||||
i2c6 = &i2c6;
|
||||
ethernet0 = ð
|
||||
};
|
||||
|
||||
memory@80000000 {
|
||||
|
||||
@@ -173,6 +173,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006000 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 39 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi0>;
|
||||
@@ -184,6 +186,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006100 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 216 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi1>;
|
||||
@@ -508,6 +512,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
xdmac: dma-controller@5fc10000 {
|
||||
compatible = "socionext,uniphier-xdmac";
|
||||
reg = <0x5fc10000 0x5300>;
|
||||
interrupts = <0 188 4>;
|
||||
dma-channels = <16>;
|
||||
#dma-cells = <2>;
|
||||
};
|
||||
|
||||
aidet: interrupt-controller@5fc20000 {
|
||||
compatible = "socionext,uniphier-pxs2-aidet";
|
||||
reg = <0x5fc20000 0x200>;
|
||||
|
||||
@@ -67,6 +67,8 @@
|
||||
compatible = "socionext,uniphier-scssi";
|
||||
status = "disabled";
|
||||
reg = <0x54006000 0x100>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
interrupts = <0 39 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_spi0>;
|
||||
|
||||
Reference in New Issue
Block a user