leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

Browse Source 
ARM: dts: Amlogic updates for v5.8
- eth PHY and USB PHY updates

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson: Switch existing boards with RGMII PHY to "rgmii-id"
  ARM: dts: meson: Add the Ethernet "timing-adjustment" clock
  ARM: dts: meson8m2: Use the Meson8m2 specific USB2 PHY compatible
  ARM: dts: meson: add the gadget mode properties to the USB0 controller

Link: https://lore.kernel.org/r/5ec6f524.1c69fb81.b979a.ae15@mx.google.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-05-26 00:19:42 +02:00
parent 9eddc06a3b 005231128e
commit 06273547dd
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/meson.dtsi
View File

@@ -229,6 +229,9 @@
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usb0_phy>;
phy-names = "usb2-phy";
g-rx-fifo-size = <512>;
g-np-tx-fifo-size = <500>;
g-tx-fifo-size = <256 192 128 128 128>;
dr_mode = "host";
status = "disabled";
};

3
arch/arm/boot/dts/meson8b-odroidc1.dts
View File

@@ -202,9 +202,8 @@
pinctrl-0 = <&eth_rgmii_pins>;
pinctrl-names = "default";
phy-mode = "rgmii";
phy-handle = <&eth_phy>;
amlogic,tx-delay-ns = <4>;
phy-mode = "rgmii-id";
nvmem-cells = <&ethernet_mac_address>;
nvmem-cell-names = "mac-address";

5
arch/arm/boot/dts/meson8b.dtsi
View File

@@ -425,8 +425,9 @@
clocks = <&clkc CLKID_ETH>,
<&clkc CLKID_MPLL2>,
<&clkc CLKID_MPLL2>;
clock-names = "stmmaceth", "clkin0", "clkin1";
<&clkc CLKID_MPLL2>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
rx-fifo-depth = <4096>;
tx-fifo-depth = <2048>;

4
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
View File

@@ -69,9 +69,7 @@
pinctrl-names = "default";
phy-handle = <&eth_phy0>;
phy-mode = "rgmii";
amlogic,tx-delay-ns = <4>;
phy-mode = "rgmii-id";
mdio {
compatible = "snps,dwmac-mdio";

13
arch/arm/boot/dts/meson8m2.dtsi
View File

@@ -30,8 +30,9 @@
0xc1108140 0x8>;
clocks = <&clkc CLKID_ETH>,
<&clkc CLKID_MPLL2>,
<&clkc CLKID_MPLL2>;
clock-names = "stmmaceth", "clkin0", "clkin1";
<&clkc CLKID_MPLL2>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
resets = <&reset RESET_ETHERNET>;
reset-names = "stmmaceth";
};
@@ -64,6 +65,14 @@
compatible = "amlogic,meson8m2-saradc", "amlogic,meson-saradc";
};
&usb0_phy {
compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy";
};
&usb1_phy {
compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy";
};
&wdt {
compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt";
};