diff --git a/package/qca/nss/qca-nss-clients/Makefile b/package/qca/nss/qca-nss-clients/Makefile index c77ceca85..e782cf81d 100644 --- a/package/qca/nss/qca-nss-clients/Makefile +++ b/package/qca/nss/qca-nss-clients/Makefile @@ -72,7 +72,7 @@ define KernelPackage/qca-nss-drv-l2tpv2 AUTOLOAD:=$(call AutoLoad,51,qca-nss-l2tpv2) endef -define KernelPackage/qca-nss-drv-l2tp/Description +define KernelPackage/qca-nss-drv-l2tpv2/Description Kernel modules for NSS connection manager - Support for l2tp tunnel endef diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts index fce917adb..de3b20031 100644 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-e8350-v1.dts @@ -75,6 +75,7 @@ label = "extra"; reg = <0x4000000 0x4000000>; }; + }; }; }; @@ -209,30 +210,13 @@ 0x00094 0x4e /* PORT6_STATUS */ >; }; - - phy4: ethernet-phy@4 { - reg = <4>; - }; }; &gmac1 { status = "okay"; - compatible = "qcom,nss-gmac"; - reg = <0x37200000 0x200000>; - interrupts = ; phy-mode = "rgmii"; qcom,id = <1>; - qcom,pcs-chanid = <0>; - qcom,phy-mdio-addr = <4>; - qcom,poll-required = <1>; - qcom,rgmii-delay = <0>; - qcom,phy_mii_type = <0>; - qcom,emulation = <0>; - qcom,forced-speed = <1000>; - qcom,forced-duplex = <1>; - qcom,socver = <0>; - qcom,irq = <255>; - mdiobus = <&mdio0>; + pinctrl-0 = <&rgmii2_pins>; pinctrl-names = "default"; @@ -244,22 +228,9 @@ &gmac2 { status = "okay"; - compatible = "qcom,nss-gmac"; - reg = <0x37400000 0x200000>; - interrupts = ; phy-mode = "sgmii"; qcom,id = <2>; - qcom,pcs-chanid = <1>; - qcom,phy-mdio-addr = <0>; - qcom,poll-required = <0>; /* no polling */ - qcom,rgmii-delay = <0>; - qcom,phy_mii_type = <1>; - qcom,emulation = <0>; - qcom,forced-speed = <1000>; - qcom,forced-duplex = <1>; - qcom,socver = <0>; - qcom,irq = <258>; - mdiobus = <&mdio0>; + fixed-link { speed = <1000>; full-duplex; @@ -273,4 +244,4 @@ &adm_dma { status = "okay"; -}; +}; \ No newline at end of file