mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-11 00:42:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'uniphier-dt-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt

Browse Source 
UniPhier ARM SoC DT updates for v5.9

- add missing interrupts property to support card serial

- fix node names to follow the DT schema

- add PCIe endpoint and PHY nodes for Pro5 SoC

- simplify device hierarchy of support-card.dtsi

* tag 'uniphier-dt-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: simplify support-card node structure
  ARM: dts: uniphier: Add PCIe endpoint and PHY node for Pro5
  ARM: dts: uniphier: Rename ethphy node to ethernet-phy
  ARM: dts: uniphier: give fixed port number to support card serial
  ARM: dts: uniphier: rename support card serial node to fix schema warning
  ARM: dts: uniphier: add interrupts to support card serial

Link: https://lore.kernel.org/r/CAK7LNARGDcCKxV3-H7WmuZAVe49n0QF+672-KN0tsP0och0a_A@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-07-13 15:00:36 +02:00
parent 9f0d16ebe3 781865604d
commit 056a7ecf47
11 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/uniphier-ld4-ref.dts
View File

@@ -20,7 +20,7 @@ chosen {
aliases {
serial0 = &serial0;
serial1 = &serial1;
serial1 = &serialsc;
serial2 = &serial2;
serial3 = &serial3;
i2c0 = &i2c0;
@@ -39,6 +39,10 @@ &ethsc {
interrupts = <1 8>;
};
&serialsc {
interrupts = <1 8>;
};
&serial0 {
status = "okay";
};

7
arch/arm/boot/dts/uniphier-ld6b-ref.dts
View File

@@ -22,6 +22,7 @@ aliases {
serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
serial3 = &serialsc;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
@@ -42,6 +43,10 @@ &ethsc {
interrupts = <4 8>;
};
&serialsc {
interrupts = <4 8>;
};
&serial0 {
status = "okay";
};
@@ -76,7 +81,7 @@ &eth {
};
&mdio {
ethphy: ethphy@0 {
ethphy: ethernet-phy@0 {
reg = <0>;
};
};

5
arch/arm/boot/dts/uniphier-pinctrl.dtsi
View File

@@ -126,6 +126,11 @@ pinctrl_nand2cs: nand2cs {
function = "nand";
};
pinctrl_pcie: pcie {
groups = "pcie";
function = "pcie";
};
pinctrl_sd: sd {
groups = "sd";
function = "sd";

2
arch/arm/boot/dts/uniphier-pro4-ace.dts
View File

@@ -87,7 +87,7 @@ &eth {
};
&mdio {
ethphy: ethphy@1 {
ethphy: ethernet-phy@1 {
reg = <1>;
};
};

8
arch/arm/boot/dts/uniphier-pro4-ref.dts
View File

@@ -22,7 +22,7 @@ aliases {
serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
serial3 = &serial3;
serial3 = &serialsc;
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c2 = &i2c2;
@@ -42,6 +42,10 @@ &ethsc {
interrupts = <2 8>;
};
&serialsc {
interrupts = <2 8>;
};
&serial0 {
status = "okay";
};
@@ -84,7 +88,7 @@ &eth {
};
&mdio {
ethphy: ethphy@0 {
ethphy: ethernet-phy@0 {
reg = <0>;
};
};

2
arch/arm/boot/dts/uniphier-pro4-sanji.dts
View File

@@ -82,7 +82,7 @@ &eth {
};
&mdio {
ethphy: ethphy@1 {
ethphy: ethernet-phy@1 {
reg = <1>;
};
};

30
arch/arm/boot/dts/uniphier-pro5.dtsi
View File

@@ -613,6 +613,36 @@ usb1_ssphy0: ss-phy@380 {
};
};
pcie_ep: pcie-ep@66000000 {
compatible = "socionext,uniphier-pro5-pcie-ep",
"snps,dw-pcie-ep";
status = "disabled";
reg-names = "dbi", "dbi2", "link", "addr_space";
reg = <0x66000000 0x1000>, <0x66001000 0x1000>,
<0x66010000 0x10000>, <0x67000000 0x400000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pcie>;
clock-names = "gio", "link";
clocks = <&sys_clk 12>, <&sys_clk 24>;
reset-names = "gio", "link";
resets = <&sys_rst 12>, <&sys_rst 24>;
num-ib-windows = <16>;
num-ob-windows = <16>;
num-lanes = <4>;
phy-names = "pcie-phy";
phys = <&pcie_phy>;
};
pcie_phy: phy@66038000 {
compatible = "socionext,uniphier-pro5-pcie-phy";
reg = <0x66038000 0x4000>;
#phy-cells = <0>;
clock-names = "gio", "link";
clocks = <&sys_clk 12>, <&sys_clk 24>;
reset-names = "gio", "link";
resets = <&sys_rst 12>, <&sys_rst 24>;
};
nand: nand-controller@68000000 {
compatible = "socionext,uniphier-denali-nand-v5b";
status = "disabled";

2
arch/arm/boot/dts/uniphier-pxs2-gentil.dts
View File

@@ -87,7 +87,7 @@ &eth {
};
&mdio {
ethphy: ethphy@1 {
ethphy: ethernet-phy@1 {
reg = <1>;
};
};

2
arch/arm/boot/dts/uniphier-pxs2-vodka.dts
View File

@@ -88,7 +88,7 @@ &eth {
};
&mdio {
ethphy: ethphy@1 {
ethphy: ethernet-phy@1 {
reg = <1>;
};
};

6
arch/arm/boot/dts/uniphier-sld8-ref.dts
View File

@@ -20,7 +20,7 @@ chosen {
aliases {
serial0 = &serial0;
serial1 = &serial1;
serial1 = &serialsc;
serial2 = &serial2;
serial3 = &serial3;
i2c0 = &i2c0;
@@ -39,6 +39,10 @@ &ethsc {
interrupts = <0 8>;
};
&serialsc {
interrupts = <0 8>;
};
&serial0 {
status = "okay";
};

31
arch/arm/boot/dts/uniphier-support-card.dtsi
View File

@@ -8,26 +8,19 @@
&system_bus {
status = "okay";
ranges = <1 0x00000000 0x42000000 0x02000000>;
interrupt-parent = <&gpio>;
support_card: support-card@1,1f00000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x00000000 1 0x01f00000 0x00100000>;
interrupt-parent = <&gpio>;
ethsc: ethernet@1,1f00000 {
compatible = "smsc,lan9118", "smsc,lan9115";
reg = <1 0x01f00000 0x1000>;
phy-mode = "mii";
reg-io-width = <4>;
};
ethsc: ethernet@0 {
compatible = "smsc,lan9118", "smsc,lan9115";
reg = <0x00000000 0x1000>;
phy-mode = "mii";
reg-io-width = <4>;
};
serialsc: uart@b0000 {
compatible = "ns16550a";
reg = <0x000b0000 0x20>;
clock-frequency = <12288000>;
reg-shift = <1>;
};
serialsc: serial@1,1fb0000 {
compatible = "ns16550a";
reg = <1 0x01fb0000 0x20>;
clock-frequency = <12288000>;
reg-shift = <1>;
};
};