On Wed, Aug 2, 2023 at 6:31 PM Du Huanpeng <dhu@xxxxxxxxxxxxxx> wrote: > > On Wed, Aug 02, 2023 at 11:10:10AM +0800, Keguang Zhang wrote: > > On Wed, Aug 2, 2023 at 2:21 AM Serge Semin <fancer.lancer@xxxxxxxxx> wrote: > > > > > > On Sat, Jul 29, 2023 at 09:43:09PM +0800, Keguang Zhang wrote: > > > > Add Ethernet device nodes for Loongson-1 boards, > > > > and drop the legacy platform devices and data accordingly. > > > > > > It seems to me that your conversion breaks the RGMII mode support. > > > What you need to do is to make sure that the respective flags are set > > > in the MUX space. > > > > > > Regarding the MUX-space. It looks as a pinctrl-setting space. If so > > > adding the new pinctrl driver will be required. Otherwise it can be > > > defined as a syscon-node and then utilized in the Loongson-1 GMAC > > > low-level driver. > > > > > Thanks for your reminder. > > I planned to add the pinctrl driver later. > > Now I'm working on it. > hi, I wrote a tool(work-in-progress) for generating pinctrl driver, > do you want to try, and avoid duplicate work. A tool for generating pinctrl driver? Could you share it? Perhaps you could submit your driver when it is done. Thanks! > and could you merge my ls1c300 devicetree for u-boot, because > u-boot wants to keep the devicetree sync with the linux kernel. > some nodes needed and working are not exist in your devicetree. > > [1] https://github.com/hodcarrier/u-boot/blob/upstream/loongson-ls1c300b/v4/arch/mips/dts/loongson32-ls1c300b.dtsi > I 've noticed your eariier commit for U-Boot. We can discuss it in more detail. > --- > Du Huanpeng > > > > > -Serge(y) > > > > > > > > > > > Signed-off-by: Keguang Zhang <keguang.zhang@xxxxxxxxx> > > > > --- > > > > arch/mips/boot/dts/loongson/loongson1.dtsi | 16 ++ > > > > arch/mips/boot/dts/loongson/loongson1b.dtsi | 53 +++++++ > > > > arch/mips/boot/dts/loongson/loongson1c.dtsi | 17 ++ > > > > arch/mips/boot/dts/loongson/lsgz_1b_dev.dts | 8 + > > > > arch/mips/boot/dts/loongson/smartloong_1c.dts | 4 + > > > > arch/mips/loongson32/common/platform.c | 146 +----------------- > > > > arch/mips/loongson32/ls1b/board.c | 2 - > > > > arch/mips/loongson32/ls1c/board.c | 1 - > > > > 8 files changed, 99 insertions(+), 148 deletions(-) > > > > > > > > diff --git a/arch/mips/boot/dts/loongson/loongson1.dtsi b/arch/mips/boot/dts/loongson/loongson1.dtsi > > > > index c77aa2d0f66c..48bb786bbf10 100644 > > > > --- a/arch/mips/boot/dts/loongson/loongson1.dtsi > > > > +++ b/arch/mips/boot/dts/loongson/loongson1.dtsi > > > > @@ -71,6 +71,22 @@ intc3: interrupt-controller@1fd01088 { > > > > interrupt-parent = <&cpu_intc>; > > > > interrupts = <5>; > > > > }; > > > > + > > > > + gmac0: ethernet@1fe10000 { > > > > + compatible = "snps,dwmac-3.70a"; > > > > + reg = <0x1fe10000 0x10000>; > > > > + > > > > + interrupt-parent = <&intc1>; > > > > + interrupt-names = "macirq"; > > > > + > > > > + clocks = <&clkc LS1X_CLKID_AHB>; > > > > + clock-names = "stmmaceth"; > > > > + > > > > + snps,pbl = <1>; > > > > + > > > > + status = "disabled"; > > > > + }; > > > > + > > > > }; > > > > > > > > apb: bus@1fe40000 { > > > > diff --git a/arch/mips/boot/dts/loongson/loongson1b.dtsi b/arch/mips/boot/dts/loongson/loongson1b.dtsi > > > > index 437a77cee163..42b96c557660 100644 > > > > --- a/arch/mips/boot/dts/loongson/loongson1b.dtsi > > > > +++ b/arch/mips/boot/dts/loongson/loongson1b.dtsi > > > > @@ -7,6 +7,11 @@ > > > > #include "loongson1.dtsi" > > > > > > > > / { > > > > + aliases { > > > > + ethernet0 = &gmac0; > > > > + ethernet1 = &gmac1; > > > > + }; > > > > + > > > > cpus { > > > > #address-cells = <1>; > > > > #size-cells = <0>; > > > > @@ -74,6 +79,54 @@ clkc: clock-controller@1fe78030 { > > > > }; > > > > }; > > > > > > > > +&ahb { > > > > + gmac1: ethernet@1fe20000 { > > > > + compatible = "snps,dwmac-3.70a"; > > > > + reg = <0x1fe20000 0x10000>; > > > > + > > > > + interrupt-parent = <&intc1>; > > > > + interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; > > > > + interrupt-names = "macirq"; > > > > + > > > > + clocks = <&clkc LS1X_CLKID_AHB>; > > > > + clock-names = "stmmaceth"; > > > > + > > > > + phy-handle = <&phy1>; > > > > + phy-mode = "mii"; > > > > + > > > > + snps,pbl = <1>; > > > > + > > > > + status = "disabled"; > > > > + > > > > + mdio1 { > > > > + #address-cells = <1>; > > > > + #size-cells = <0>; > > > > + compatible = "snps,dwmac-mdio"; > > > > + > > > > + phy1: ethernet-phy@0 { > > > > + reg = <0x0>; > > > > + }; > > > > + }; > > > > + }; > > > > +}; > > > > + > > > > +&gmac0 { > > > > + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; > > > > + > > > > + phy-handle = <&phy0>; > > > > + phy-mode = "mii"; > > > > + > > > > + mdio0 { > > > > + #address-cells = <1>; > > > > + #size-cells = <0>; > > > > + compatible = "snps,dwmac-mdio"; > > > > + > > > > + phy0: ethernet-phy@0 { > > > > + reg = <0x0>; > > > > + }; > > > > + }; > > > > +}; > > > > + > > > > &uart1 { > > > > interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; > > > > }; > > > > diff --git a/arch/mips/boot/dts/loongson/loongson1c.dtsi b/arch/mips/boot/dts/loongson/loongson1c.dtsi > > > > index 1dd575b7b2f9..5b3e0f9280f6 100644 > > > > --- a/arch/mips/boot/dts/loongson/loongson1c.dtsi > > > > +++ b/arch/mips/boot/dts/loongson/loongson1c.dtsi > > > > @@ -41,6 +41,23 @@ intc4: interrupt-controller@1fd010a0 { > > > > }; > > > > }; > > > > > > > > +&gmac0 { > > > > + interrupts = <3 IRQ_TYPE_LEVEL_HIGH>; > > > > + > > > > + phy-handle = <&phy0>; > > > > + phy-mode = "rmii"; > > > > + > > > > + mdio0 { > > > > + #address-cells = <1>; > > > > + #size-cells = <0>; > > > > + compatible = "snps,dwmac-mdio"; > > > > + > > > > + phy0: ethernet-phy@13 { > > > > + reg = <0x13>; > > > > + }; > > > > + }; > > > > +}; > > > > + > > > > &uart1 { > > > > interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; > > > > }; > > > > diff --git a/arch/mips/boot/dts/loongson/lsgz_1b_dev.dts b/arch/mips/boot/dts/loongson/lsgz_1b_dev.dts > > > > index 89c3dfa574f7..a43df21f2904 100644 > > > > --- a/arch/mips/boot/dts/loongson/lsgz_1b_dev.dts > > > > +++ b/arch/mips/boot/dts/loongson/lsgz_1b_dev.dts > > > > @@ -28,6 +28,14 @@ xtal: xtal { > > > > }; > > > > }; > > > > > > > > +&gmac0 { > > > > + status = "okay"; > > > > +}; > > > > + > > > > +&gmac1 { > > > > + status = "okay"; > > > > +}; > > > > + > > > > &uart0 { > > > > status = "okay"; > > > > }; > > > > diff --git a/arch/mips/boot/dts/loongson/smartloong_1c.dts b/arch/mips/boot/dts/loongson/smartloong_1c.dts > > > > index 188aab9e3685..2d8f304aa2c4 100644 > > > > --- a/arch/mips/boot/dts/loongson/smartloong_1c.dts > > > > +++ b/arch/mips/boot/dts/loongson/smartloong_1c.dts > > > > @@ -28,6 +28,10 @@ xtal: xtal { > > > > }; > > > > }; > > > > > > > > +&gmac0 { > > > > + status = "okay"; > > > > +}; > > > > + > > > > &uart0 { > > > > status = "okay"; > > > > }; > > > > diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c > > > > index 8272b4133e25..817518531b9b 100644 > > > > --- a/arch/mips/loongson32/common/platform.c > > > > +++ b/arch/mips/loongson32/common/platform.c > > > > @@ -8,157 +8,13 @@ > > > > #include <linux/err.h> > > > > #include <linux/mtd/partitions.h> > > > > #include <linux/sizes.h> > > > > -#include <linux/phy.h> > > > > -#include <linux/stmmac.h> > > > > #include <linux/usb/ehci_pdriver.h> > > > > > > > > #include <platform.h> > > > > #include <loongson1.h> > > > > #include <dma.h> > > > > #include <nand.h> > > > > - > > > > -/* Synopsys Ethernet GMAC */ > > > > -static struct stmmac_mdio_bus_data ls1x_mdio_bus_data = { > > > > - .phy_mask = 0, > > > > -}; > > > > - > > > > -static struct stmmac_dma_cfg ls1x_eth_dma_cfg = { > > > > - .pbl = 1, > > > > -}; > > > > - > > > > -int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) > > > > -{ > > > > - struct plat_stmmacenet_data *plat_dat = NULL; > > > > - u32 val; > > > > - > > > > - val = __raw_readl(LS1X_MUX_CTRL1); > > > > - > > > > -#if defined(CONFIG_LOONGSON1_LS1B) > > > > - plat_dat = dev_get_platdata(&pdev->dev); > > > > - if (plat_dat->bus_id) { > > > > - __raw_writel(__raw_readl(LS1X_MUX_CTRL0) | GMAC1_USE_UART1 | > > > > - GMAC1_USE_UART0, LS1X_MUX_CTRL0); > > > > - switch (plat_dat->phy_interface) { > > > > - case PHY_INTERFACE_MODE_RGMII: > > > > - val &= ~(GMAC1_USE_TXCLK | GMAC1_USE_PWM23); > > > > - break; > > > > - case PHY_INTERFACE_MODE_MII: > > > > - val |= (GMAC1_USE_TXCLK | GMAC1_USE_PWM23); > > > > - break; > > > > - default: > > > > - pr_err("unsupported mii mode %d\n", > > > > - plat_dat->phy_interface); > > > > - return -ENOTSUPP; > > > > - } > > > > - val &= ~GMAC1_SHUT; > > > > - } else { > > > > - switch (plat_dat->phy_interface) { > > > > - case PHY_INTERFACE_MODE_RGMII: > > > > - val &= ~(GMAC0_USE_TXCLK | GMAC0_USE_PWM01); > > > > - break; > > > > - case PHY_INTERFACE_MODE_MII: > > > > - val |= (GMAC0_USE_TXCLK | GMAC0_USE_PWM01); > > > > - break; > > > > - default: > > > > - pr_err("unsupported mii mode %d\n", > > > > - plat_dat->phy_interface); > > > > - return -ENOTSUPP; > > > > - } > > > > - val &= ~GMAC0_SHUT; > > > > - } > > > > - __raw_writel(val, LS1X_MUX_CTRL1); > > > > -#elif defined(CONFIG_LOONGSON1_LS1C) > > > > - plat_dat = dev_get_platdata(&pdev->dev); > > > > - > > > > - val &= ~PHY_INTF_SELI; > > > > - if (plat_dat->phy_interface == PHY_INTERFACE_MODE_RMII) > > > > - val |= 0x4 << PHY_INTF_SELI_SHIFT; > > > > - __raw_writel(val, LS1X_MUX_CTRL1); > > > > - > > > > - val = __raw_readl(LS1X_MUX_CTRL0); > > > > - __raw_writel(val & (~GMAC_SHUT), LS1X_MUX_CTRL0); > > > > -#endif > > > > - > > > > - return 0; > > > > -} > > > > - > > > > -static struct plat_stmmacenet_data ls1x_eth0_pdata = { > > > > - .bus_id = 0, > > > > - .phy_addr = -1, > > > > -#if defined(CONFIG_LOONGSON1_LS1B) > > > > - .phy_interface = PHY_INTERFACE_MODE_MII, > > > > -#elif defined(CONFIG_LOONGSON1_LS1C) > > > > - .phy_interface = PHY_INTERFACE_MODE_RMII, > > > > -#endif > > > > - .mdio_bus_data = &ls1x_mdio_bus_data, > > > > - .dma_cfg = &ls1x_eth_dma_cfg, > > > > - .has_gmac = 1, > > > > - .tx_coe = 1, > > > > - .rx_queues_to_use = 1, > > > > - .tx_queues_to_use = 1, > > > > - .init = ls1x_eth_mux_init, > > > > -}; > > > > - > > > > -static struct resource ls1x_eth0_resources[] = { > > > > - [0] = { > > > > - .start = LS1X_GMAC0_BASE, > > > > - .end = LS1X_GMAC0_BASE + SZ_64K - 1, > > > > - .flags = IORESOURCE_MEM, > > > > - }, > > > > - [1] = { > > > > - .name = "macirq", > > > > - .start = LS1X_GMAC0_IRQ, > > > > - .flags = IORESOURCE_IRQ, > > > > - }, > > > > -}; > > > > - > > > > -struct platform_device ls1x_eth0_pdev = { > > > > - .name = "stmmaceth", > > > > - .id = 0, > > > > - .num_resources = ARRAY_SIZE(ls1x_eth0_resources), > > > > - .resource = ls1x_eth0_resources, > > > > - .dev = { > > > > - .platform_data = &ls1x_eth0_pdata, > > > > - }, > > > > -}; > > > > - > > > > -#ifdef CONFIG_LOONGSON1_LS1B > > > > -static struct plat_stmmacenet_data ls1x_eth1_pdata = { > > > > - .bus_id = 1, > > > > - .phy_addr = -1, > > > > - .phy_interface = PHY_INTERFACE_MODE_MII, > > > > - .mdio_bus_data = &ls1x_mdio_bus_data, > > > > - .dma_cfg = &ls1x_eth_dma_cfg, > > > > - .has_gmac = 1, > > > > - .tx_coe = 1, > > > > - .rx_queues_to_use = 1, > > > > - .tx_queues_to_use = 1, > > > > - .init = ls1x_eth_mux_init, > > > > -}; > > > > - > > > > -static struct resource ls1x_eth1_resources[] = { > > > > - [0] = { > > > > - .start = LS1X_GMAC1_BASE, > > > > - .end = LS1X_GMAC1_BASE + SZ_64K - 1, > > > > - .flags = IORESOURCE_MEM, > > > > - }, > > > > - [1] = { > > > > - .name = "macirq", > > > > - .start = LS1X_GMAC1_IRQ, > > > > - .flags = IORESOURCE_IRQ, > > > > - }, > > > > -}; > > > > - > > > > -struct platform_device ls1x_eth1_pdev = { > > > > - .name = "stmmaceth", > > > > - .id = 1, > > > > - .num_resources = ARRAY_SIZE(ls1x_eth1_resources), > > > > - .resource = ls1x_eth1_resources, > > > > - .dev = { > > > > - .platform_data = &ls1x_eth1_pdata, > > > > - }, > > > > -}; > > > > -#endif /* CONFIG_LOONGSON1_LS1B */ > > > > +#include <irq.h> > > > > > > > > /* GPIO */ > > > > static struct resource ls1x_gpio0_resources[] = { > > > > diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c > > > > index e8290f200096..f23e4e5c96ee 100644 > > > > --- a/arch/mips/loongson32/ls1b/board.c > > > > +++ b/arch/mips/loongson32/ls1b/board.c > > > > @@ -34,8 +34,6 @@ static const struct gpio_led_platform_data ls1x_led_pdata __initconst = { > > > > }; > > > > > > > > static struct platform_device *ls1b_platform_devices[] __initdata = { > > > > - &ls1x_eth0_pdev, > > > > - &ls1x_eth1_pdev, > > > > &ls1x_ehci_pdev, > > > > &ls1x_gpio0_pdev, > > > > &ls1x_gpio1_pdev, > > > > diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c > > > > index a7096964fb30..29bc467fd149 100644 > > > > --- a/arch/mips/loongson32/ls1c/board.c > > > > +++ b/arch/mips/loongson32/ls1c/board.c > > > > @@ -6,7 +6,6 @@ > > > > #include <platform.h> > > > > > > > > static struct platform_device *ls1c_platform_devices[] __initdata = { > > > > - &ls1x_eth0_pdev, > > > > &ls1x_rtc_pdev, > > > > &ls1x_wdt_pdev, > > > > }; > > > > -- > > > > 2.39.2 > > > > > > > > > > > > -- > > Best regards, > > > > Keguang Zhang -- Best regards, Keguang Zhang
