Highlights:

-----------
  - Use STiH418's A9 PLL
  - Add Ethernet support to STiH407 family
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWH82EAAoJEMo4jShGhw+Jh6IQAMIukt+F11AS20ZtqNTlv4lY
 Nj6zPAWBtyobRQe44n+2L+6MLQiG115nWNvuS57/5I2m8Ps1BsnhkfvPeKbhJES4
 jydFdxeEOfmV+N1YwIuOCuxc/aXo+XODrJWJNR+gRjVX364cEYvlkq2TyL415lvw
 m7D8syKKpECRQoZwiSbYh33nd5FEK+2fcGzWyjfvvSHoZyhYsaczN7pkpkLwfGkj
 j3eyKaSrzrNXjK5F6GbMuIaFRsKcsDpovwLM4i+QGY66jaFAQ1neJI4xC38KjL8g
 ptDpZdJ2AFedW3EFtbAWAaZ2dTtsVJQMSZK2GY4K+gowePsukreZhfbvDdLmJ0wa
 Riythd7drHpBm7CP1Ox9gxBgryOkcvy6tVdvQiyl2ruL2LjT6uVCsDpKulhq8BTv
 MdPYbRkcNmns2OEBOpIedNkiVNqx2O1JLNPVB7gviKM6pedUobM+pvdfYEB4JyBe
 eYr2cxSyaFUznQCfvIJOiQOeq2CwWoMBoB9NrmPvvwoiKfMj9joh5+rEUTrA6xMd
 ILNzHpxscqQbu81vpnUq8Q+GbwaW3QLzmkgf8EsB6GkxGVd9SicklUROz3ZM8Fsv
 gAgRmnteYM+c/0dF8/S3fPAL9my0Ueo606Ok+huUvNH17fQqV6CNUtJvjDWNPkVp
 0LyyGPPukT5tydUM7i7N
 =nzUU
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt

Merge "STi DT changes for v4.4, round 2" from Maxime Coquelin:

 - Use STiH418's A9 PLL
 - Add Ethernet support to STiH407 family

* tag 'sti-dt-for-v4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
  ARM: STi: DT: Add support for stih418 A9 pll
  ARM: dts: Enable Ethernet on STi's B2199 board
  ARM: dts: Enable Ethernet on STi's B2120 boards
  ARM: dts: Add Ethernet node to STiH407 family
  ARM: dts: Fix RGMII pinctrl timings
This commit is contained in:
Arnd Bergmann 2015-10-23 22:04:49 +02:00
commit a3de778b1f
7 changed files with 46 additions and 3 deletions

View File

@ -25,6 +25,7 @@
aliases {
ttyAS0 = &sbc_serial0;
ethernet0 = &ethernet0;
};
};

View File

@ -653,5 +653,32 @@
clocks = <&clk_sysin>;
status = "okay";
};
ethernet0: dwmac@9630000 {
device_type = "network";
status = "disabled";
compatible = "st,stih407-dwmac", "snps,dwmac", "snps,dwmac-3.710";
reg = <0x9630000 0x8000>, <0x80 0x4>;
reg-names = "stmmaceth", "sti-ethconf";
st,syscon = <&syscfg_sbc_reg 0x80>;
st,gmac_en;
resets = <&softreset STIH407_ETH1_SOFTRESET>;
reset-names = "stmmaceth";
interrupts = <GIC_SPI 98 IRQ_TYPE_NONE>,
<GIC_SPI 99 IRQ_TYPE_NONE>;
interrupt-names = "macirq", "eth_wake_irq";
/* DMA Bus Mode */
snps,pbl = <8>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii1>;
clock-names = "stmmaceth", "sti-ethclk";
clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>,
<&clk_s_c0_flexgen CLK_ETH_PHY>;
};
};
};

View File

@ -216,9 +216,9 @@
rxd2 = <&pio1 6 ALT1 IN DE_IO 0 CLK_A>;
rxd3 = <&pio1 7 ALT1 IN DE_IO 0 CLK_A>;
rxdv = <&pio2 0 ALT1 IN DE_IO 0 CLK_A>;
rxclk = <&pio2 2 ALT1 IN NICLK 500 CLK_A>;
rxclk = <&pio2 2 ALT1 IN NICLK 0 CLK_A>;
clk125 = <&pio3 7 ALT4 IN NICLK 0 CLK_A>;
phyclk = <&pio2 3 ALT4 OUT NICLK 1750 CLK_B>;
phyclk = <&pio2 3 ALT4 OUT NICLK 1250 CLK_B>;
};
};

View File

@ -25,6 +25,7 @@
aliases {
ttyAS0 = &sbc_serial0;
ethernet0 = &ethernet0;
};
soc {

View File

@ -24,6 +24,7 @@
aliases {
ttyAS0 = &sbc_serial0;
ethernet0 = &ethernet0;
};
soc {
@ -101,5 +102,12 @@
st_dwc3: dwc3@8f94000 {
status = "okay";
};
ethernet0: dwmac@9630000 {
st,tx-retime-src = "clkgen";
status = "okay";
phy-mode = "rgmii";
fixed-link = <0 1 1000 0 0>;
};
};
};

View File

@ -44,7 +44,7 @@
clockgen_a9_pll: clockgen-a9-pll {
#clock-cells = <1>;
compatible = "st,stih407-plls-c32-a9", "st,clkgen-plls-c32";
compatible = "st,stih418-plls-c28-a9", "st,clkgen-plls-c32";
clocks = <&clk_sysin>;

View File

@ -87,5 +87,11 @@
status = "okay";
};
ethernet0: dwmac@9630000 {
st,tx-retime-src = "clkgen";
status = "okay";
phy-mode = "rgmii";
fixed-link = <0 1 1000 0 0>;
};
};
};