From: Srinivas Kandagatla <srinivas.kandaga...@st.com>

This patch adds support to STiH416 SOC, which has two ethernet
snps,dwmac controllers version 3.710. With this patch B2000 and B2020
boards can boot with ethernet in MII and RGMII modes.

Tested on both B2020 and B2000.

Signed-off-by: Srinivas Kandagatla <srinivas.kandaga...@st.com>
---
 arch/arm/boot/dts/stih416-clock.dtsi   |   14 ++++
 arch/arm/boot/dts/stih416-pinctrl.dtsi |  109 ++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/stih416.dtsi         |   44 +++++++++++++
 3 files changed, 167 insertions(+)

diff --git a/arch/arm/boot/dts/stih416-clock.dtsi 
b/arch/arm/boot/dts/stih416-clock.dtsi
index 7026bf1..a6942c7 100644
--- a/arch/arm/boot/dts/stih416-clock.dtsi
+++ b/arch/arm/boot/dts/stih416-clock.dtsi
@@ -37,5 +37,19 @@
                        clock-frequency = <100000000>;
                        clock-output-names = "CLK_S_ICN_REG_0";
                };
+
+               CLK_S_GMAC0_PHY: clockgenA1@7 {
+                       #clock-cells = <0>;
+                       compatible = "fixed-clock";
+                       clock-frequency = <25000000>;
+                       clock-output-names = "CLK_S_GMAC0_PHY";
+               };
+
+               CLK_S_ETH1_PHY: clockgenA0@7 {
+                       #clock-cells = <0>;
+                       compatible = "fixed-clock";
+                       clock-frequency = <25000000>;
+                       clock-output-names = "CLK_S_ETH1_PHY";
+               };
        };
 };
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi 
b/arch/arm/boot/dts/stih416-pinctrl.dtsi
index 8863c38..c4beef2 100644
--- a/arch/arm/boot/dts/stih416-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi
@@ -132,6 +132,58 @@
                                        };
                                };
                        };
+
+                       gmac1 {
+                               pinctrl_mii1: mii1 {
+                                       st,pins {
+                                               txd0 = <&PIO0 0 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd1 = <&PIO0 1 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd2 = <&PIO0 2 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd3 = <&PIO0 3 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txer = <&PIO0 4 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txen = <&PIO0 5 ALT1 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txclk = <&PIO0 6 ALT1 IN NICLK 
0 CLK_A>;
+                                               col =   <&PIO0 7 ALT1 IN BYPASS 
1000>;
+
+                                               mdio =  <&PIO1 0 ALT1 OUT 
BYPASS 1500>;
+                                               mdc =   <&PIO1 1 ALT1 OUT NICLK 
0 CLK_A>;
+                                               crs =   <&PIO1 2 ALT1 IN BYPASS 
1000>;
+                                               mdint = <&PIO1 3 ALT1 IN BYPASS 
0>;
+                                               rxd0 =  <&PIO1 4 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd1 =  <&PIO1 5 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd2 =  <&PIO1 6 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd3 =  <&PIO1 7 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+
+                                               rxdv =  <&PIO2 0 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rx_er = <&PIO2 1 ALT1 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxclk = <&PIO2 2 ALT1 IN NICLK 
0 CLK_A>;
+                                               phyclk = <&PIO2 3 ALT1 OUT 
NICLK 0 CLK_A>;
+                                       };
+                               };
+                               pinctrl_rgmii1: rgmii1-0 {
+                                       st,pins {
+                                               txd0 =  <&PIO0 0 ALT1 OUT DE_IO 
500 CLK_A>;
+                                               txd1 =  <&PIO0 1 ALT1 OUT DE_IO 
500 CLK_A>;
+                                               txd2 =  <&PIO0 2 ALT1 OUT DE_IO 
500 CLK_A>;
+                                               txd3 =  <&PIO0 3 ALT1 OUT DE_IO 
500 CLK_A>;
+                                               txen =  <&PIO0 5 ALT1 OUT DE_IO 
0   CLK_A>;
+                                               txclk = <&PIO0 6 ALT1 IN  NICLK 
0   CLK_A>;
+
+                                               mdio = <&PIO1 0 ALT1 OUT BYPASS 
0>;
+                                               mdc  = <&PIO1 1 ALT1 OUT NICLK  
0 CLK_A>;
+                                               rxd0 = <&PIO1 4 ALT1 IN DE_IO 
500 CLK_A>;
+                                               rxd1 = <&PIO1 5 ALT1 IN DE_IO 
500 CLK_A>;
+                                               rxd2 = <&PIO1 6 ALT1 IN DE_IO 
500 CLK_A>;
+                                               rxd3 = <&PIO1 7 ALT1 IN DE_IO 
500 CLK_A>;
+
+                                               rxdv   = <&PIO2 0 ALT1 IN  
DE_IO 500 CLK_A>;
+                                               rxclk  = <&PIO2 2 ALT1 IN  
NICLK 0   CLK_A>;
+                                               phyclk = <&PIO2 3 ALT4 OUT 
NICLK 0   CLK_B>;
+
+                                               clk125= <&PIO3 7 ALT4 IN NICLK 
0 CLK_A>;
+                                       };
+                               };
+                       };
                };
 
                pin-controller-front {
@@ -322,6 +374,63 @@
                                        };
                                };
                        };
+
+                       gmac0 {
+                               pinctrl_mii0: mii0 {
+                                       st,pins {
+                                               mdint = <&PIO13 6 ALT2 IN  
BYPASS      0>;
+                                               txen =  <&PIO13 7 ALT2 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd0 =  <&PIO14 0 ALT2 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd1 =  <&PIO14 1 ALT2 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               txd2 =  <&PIO14 2 ALT2 OUT 
SE_NICLK_IO 0 CLK_B>;
+                                               txd3 =  <&PIO14 3 ALT2 OUT 
SE_NICLK_IO 0 CLK_B>;
+
+                                               txclk = <&PIO15 0 ALT2 IN  
NICLK       0 CLK_A>;
+                                               txer =  <&PIO15 1 ALT2 OUT 
SE_NICLK_IO 0 CLK_A>;
+                                               crs = <&PIO15 2 ALT2 IN  BYPASS 
1000>;
+                                               col = <&PIO15 3 ALT2 IN  BYPASS 
1000>;
+                                               mdio= <&PIO15 4 ALT2 OUT BYPASS 
1500>;
+                                               mdc = <&PIO15 5 ALT2 OUT NICLK  
0    CLK_B>;
+
+                                               rxd0 =  <&PIO16 0 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd1 =  <&PIO16 1 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd2 =  <&PIO16 2 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxd3 =  <&PIO16 3 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxdv =  <&PIO15 6 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rx_er = <&PIO15 7 ALT2 IN 
SE_NICLK_IO 0 CLK_A>;
+                                               rxclk = <&PIO17 0 ALT2 IN NICLK 
0 CLK_A>;
+                                               phyclk = <&PIO13 5 ALT2 OUT 
NICLK 0 CLK_B>;
+                                       };
+                               };
+
+                               pinctrl_gmii0: gmii0 {
+                                       st,pins {
+                                               };
+                               };
+                               pinctrl_rgmii0: rgmii0 {
+                                       st,pins {
+                                                phyclk = <&PIO13  5 ALT4 OUT 
NICLK 0 CLK_B>;
+                                                txen = <&PIO13 7 ALT2 OUT 
DE_IO 0 CLK_A>;
+                                                txd0  = <&PIO14 0 ALT2 OUT 
DE_IO 500 CLK_A>;
+                                                txd1  = <&PIO14 1 ALT2 OUT 
DE_IO 500 CLK_A>;
+                                                txd2  = <&PIO14 2 ALT2 OUT 
DE_IO 500 CLK_B>;
+                                                txd3  = <&PIO14 3 ALT2 OUT 
DE_IO 500 CLK_B>;
+                                                txclk = <&PIO15 0 ALT2 IN 
NICLK 0 CLK_A>;
+
+                                                mdio = <&PIO15 4 ALT2 OUT 
BYPASS 0>;
+                                                mdc = <&PIO15 5 ALT2 OUT NICLK 
0 CLK_B>;
+
+                                                rxdv = <&PIO15 6 ALT2 IN DE_IO 
500 CLK_A>;
+                                                rxd0 =<&PIO16 0 ALT2 IN DE_IO  
500 CLK_A>;
+                                                rxd1 =<&PIO16 1 ALT2 IN DE_IO  
500 CLK_A>;
+                                                rxd2 =<&PIO16 2 ALT2 IN DE_IO  
500 CLK_A>;
+                                                rxd3  =<&PIO16 3 ALT2 IN DE_IO 
500 CLK_A>;
+                                                rxclk =<&PIO17 0 ALT2 IN NICLK 
0 CLK_A>;
+
+                                                clk125=<&PIO17 6 ALT1 IN NICLK 
0 CLK_A>;
+                                       };
+                               };
+                       };
                };
 
                pin-controller-fvdp-fe {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 788ba5b..a96055b 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -156,5 +156,49 @@
 
                        status          = "disabled";
                };
+
+               ethernet0: dwmac@fe810000 {
+                       device_type     = "network";
+                       compatible      = "st,stih416-dwmac", "snps,dwmac", 
"snps,dwmac-3.710";
+                       status          = "disabled";
+                       reg             = <0xfe810000 0x8000>, <0x8bc 0x4>;
+                       reg-names       = "stmmaceth", "sti-ethconf";
+
+                       interrupts = <0 133 0>, <0 134 0>, <0 135 0>;
+                       interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+
+                       snps,pbl        = <32>;
+                       snps,mixed-burst;
+
+                       st,syscon               = <&syscfg_rear>;
+                       resets                  = <&softreset 
STIH416_ETH0_SOFTRESET>;
+                       reset-names             = "stmmaceth";
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <&pinctrl_mii0>;
+                       clock-names     = "stmmaceth";
+                       clocks          = <&CLK_S_GMAC0_PHY>;
+               };
+
+               ethernet1: dwmac@fef08000 {
+                       device_type = "network";
+                       compatible              = "st,stih416-dwmac", 
"snps,dwmac", "snps,dwmac-3.710";
+                       status          = "disabled";
+                       reg             = <0xfef08000 0x8000>, <0x7f0 0x4>;
+                       reg-names       = "stmmaceth", "sti-ethconf";
+                       interrupts = <0 136 0>, <0 137 0>, <0 138 0>;
+                       interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
+
+                       snps,pbl        = <32>;
+                       snps,mixed-burst;
+
+                       st,syscon       = <&syscfg_sbc>;
+
+                       resets          = <&softreset STIH416_ETH1_SOFTRESET>;
+                       reset-names     = "stmmaceth";
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <&pinctrl_mii1>;
+                       clock-names     = "stmmaceth";
+                       clocks          = <&CLK_S_ETH1_PHY>;
+               };
        };
 };
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to