Merge Official Source
This commit is contained in:
commit
48712a0a60
@ -85,7 +85,7 @@ endef
|
||||
|
||||
define U-Boot/mt7623n_bpir2
|
||||
NAME:=Banana Pi R2 (mt7623)
|
||||
BUILD_DEVICES:=bpi_bananapi-r2
|
||||
BUILD_DEVICES:=bananapi_bpi-r2
|
||||
BUILD_SUBTARGET:=mt7623
|
||||
UBOOT_IMAGE:=u-boot.bin
|
||||
UBOOT_CONFIG:=mt7623n_bpir2
|
||||
|
||||
@ -1221,7 +1221,8 @@ define KernelPackage/qlcnic
|
||||
TITLE:=QLogic QLE8240 and QLE8242 device support
|
||||
KCONFIG:= \
|
||||
CONFIG_QLCNIC \
|
||||
CONFIG_QLCNIC_HWMON=y
|
||||
CONFIG_QLCNIC_HWMON=y \
|
||||
CONFIG_QLCNIC_SRIOV=y
|
||||
FILES:=$(LINUX_DIR)/drivers/net/ethernet/qlogic/qlcnic/qlcnic.ko
|
||||
AUTOLOAD:=$(call AutoProbe,qlcnic)
|
||||
endef
|
||||
|
||||
@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
|
||||
PKG_MIRROR_HASH:=c57f21db30349f30d70b6169ad9d9c905733069fe14ea6b4ffdfbd82a355dd61
|
||||
PKG_SOURCE_DATE:=2021-07-15
|
||||
PKG_SOURCE_VERSION:=cdc9939b071427cf2b35134481df27b4bd76dbfc
|
||||
PKG_MIRROR_HASH:=66811ea1ec6c747ad46978a0dc55a9e620e493cfa39d8acb318d1d1b00dc1fcc
|
||||
PKG_SOURCE_DATE:=2021-07-24
|
||||
PKG_SOURCE_VERSION:=1d681ca59cada118633c6e2d65b882b4c8f0db58
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
device found on several devices in RAVE line of hardware.
|
||||
|
||||
+config MFD_RB4XX_CPLD
|
||||
+ tristate "CPLD driver for Mikrotik RB4xx series boards
|
||||
+ tristate "CPLD driver for Mikrotik RB4xx series boards"
|
||||
+ select MFD_CORE
|
||||
+ depends on ATH79 || COMPILE_TEST
|
||||
+ help
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
device found on several devices in RAVE line of hardware.
|
||||
|
||||
+config MFD_RB4XX_CPLD
|
||||
+ tristate "CPLD driver for Mikrotik RB4xx series boards
|
||||
+ tristate "CPLD driver for Mikrotik RB4xx series boards"
|
||||
+ select MFD_CORE
|
||||
+ depends on ATH79 || COMPILE_TEST
|
||||
+ help
|
||||
|
||||
@ -194,6 +194,7 @@ CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NO_EXCEPT_FILL=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NR_CPUS=2
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Tue, 20 Jul 2021 22:00:10 +0200
|
||||
Subject: [PATCH] generic: add mac-address property for NVMEM mac addresses
|
||||
|
||||
Traversing the device-tree by referencing a network device to determine
|
||||
a devices labe-mac does not work with the generic nvmem implementation,
|
||||
as the userspace expects the MAC-address to be available as a
|
||||
device-tree property.
|
||||
|
||||
The legacy mtd-mac-address implementation did create such a node. Do the
|
||||
same when using the nvmem implementation to allow reading the MAC
|
||||
address.
|
||||
|
||||
Fixes commit d284e6ef0f06 ("treewide: convert mtd-mac-address-increment*
|
||||
to generic implementation")
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
void *mac;
|
||||
u8 nvmem_mac[ETH_ALEN];
|
||||
struct platform_device *pdev = of_find_device_by_node(np);
|
||||
+ struct property *prop;
|
||||
|
||||
if (!pdev) {
|
||||
*err = -ENODEV;
|
||||
@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
put_device(&pdev->dev);
|
||||
if (!mac) {
|
||||
*err = -ENOMEM;
|
||||
- return NULL;
|
||||
+ goto out_err;
|
||||
+ }
|
||||
+
|
||||
+ prop = devm_kzalloc(&pdev->dev, sizeof(*prop), GFP_KERNEL);
|
||||
+ if (!prop) {
|
||||
+ *err = -ENOMEM;
|
||||
+ goto out_err;
|
||||
+ }
|
||||
+ prop->name = "mac-address";
|
||||
+ prop->length = ETH_ALEN;
|
||||
+ prop->value = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL);
|
||||
+ if (!prop->value || of_add_property(np, prop)) {
|
||||
+ *err = -ENOMEM;
|
||||
+ goto out_err;
|
||||
}
|
||||
|
||||
return mac;
|
||||
+
|
||||
+out_err:
|
||||
+ devm_kfree(&pdev->dev, prop->value);
|
||||
+ devm_kfree(&pdev->dev, prop);
|
||||
+ devm_kfree(&pdev->dev, mac);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
static void *of_get_mac_address_mtd(struct device_node *np)
|
||||
@ -0,0 +1,32 @@
|
||||
From c94b2cfd25c282e2974accc1b07da98ae7139b47 Mon Sep 17 00:00:00 2001
|
||||
From: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
Date: Fri, 23 Jul 2021 12:14:33 +0200
|
||||
Subject: [PATCH 1/2] drivers: net: mediatek: register of_platform for every
|
||||
port
|
||||
|
||||
Currently the nvmem framework require the devicenode to be registred on
|
||||
the of_platform or of_get_mac_address fail to get the macaddress if
|
||||
defined using an nvmem cell. Fix this by registrering these special node
|
||||
so they can be found by of_find_device_by_node.
|
||||
|
||||
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
---
|
||||
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
index ed4eacef17ce..666803817540 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
|
||||
eth->netdev[id]->dev.of_node = np;
|
||||
|
||||
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;
|
||||
+
|
||||
+ of_platform_device_create(np, NULL, NULL);
|
||||
|
||||
return 0;
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From 8bab551f44204fc5d43977063cd704112c17c750 Mon Sep 17 00:00:00 2001
|
||||
From: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
Date: Fri, 23 Jul 2021 12:17:27 +0200
|
||||
Subject: [PATCH 2/2] dsa: register every port with of_platform
|
||||
|
||||
The declaration of a different mac-addr using the nvmem framework is
|
||||
currently broken. The dsa code use the generic of_get_mac_address where
|
||||
the nvmem function require the device node to be registred in the
|
||||
of_platform to be found by of_find_device_by_node. Register every port
|
||||
in the of_platform so they can corrently found and a custom mac-addr can
|
||||
correctly be declared using a nvmem-cell declared in the dts.
|
||||
|
||||
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
---
|
||||
net/dsa/dsa2.c | 2 +
|
||||
1 file changed, 2 insertion(+)
|
||||
|
||||
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
|
||||
index b71e87909f0e..55bbc1a769ca 100644
|
||||
--- a/net/dsa/dsa2.c
|
||||
+++ b/net/dsa/dsa2.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_net.h>
|
||||
+#include <linux/of_platform.h>
|
||||
#include <net/devlink.h>
|
||||
|
||||
#include "dsa_priv.h"
|
||||
@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp)
|
||||
|
||||
break;
|
||||
case DSA_PORT_TYPE_USER:
|
||||
+ of_platform_device_create(dp->dn, NULL, NULL);
|
||||
dp->mac = of_get_mac_address(dp->dn);
|
||||
err = dsa_slave_create(dp);
|
||||
if (err)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Tue, 20 Jul 2021 22:00:10 +0200
|
||||
Subject: [PATCH] generic: add mac-address property for NVMEM mac addresses
|
||||
|
||||
Traversing the device-tree by referencing a network device to determine
|
||||
a devices labe-mac does not work with the generic nvmem implementation,
|
||||
as the userspace expects the MAC-address to be available as a
|
||||
device-tree property.
|
||||
|
||||
The legacy mtd-mac-address implementation did create such a node. Do the
|
||||
same when using the nvmem implementation to allow reading the MAC
|
||||
address.
|
||||
|
||||
Fixes commit d284e6ef0f06 ("treewide: convert mtd-mac-address-increment*
|
||||
to generic implementation")
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
void *mac;
|
||||
u8 nvmem_mac[ETH_ALEN];
|
||||
struct platform_device *pdev = of_find_device_by_node(np);
|
||||
+ struct property *prop;
|
||||
|
||||
if (!pdev) {
|
||||
*err = -ENODEV;
|
||||
@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
put_device(&pdev->dev);
|
||||
if (!mac) {
|
||||
*err = -ENOMEM;
|
||||
- return NULL;
|
||||
+ goto out_err;
|
||||
+ }
|
||||
+
|
||||
+ prop = devm_kzalloc(&pdev->dev, sizeof(*prop), GFP_KERNEL);
|
||||
+ if (!prop) {
|
||||
+ *err = -ENOMEM;
|
||||
+ goto out_err;
|
||||
+ }
|
||||
+ prop->name = "mac-address";
|
||||
+ prop->length = ETH_ALEN;
|
||||
+ prop->value = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL);
|
||||
+ if (!prop->value || of_add_property(np, prop)) {
|
||||
+ *err = -ENOMEM;
|
||||
+ goto out_err;
|
||||
}
|
||||
|
||||
return mac;
|
||||
+
|
||||
+out_err:
|
||||
+ devm_kfree(&pdev->dev, prop->value);
|
||||
+ devm_kfree(&pdev->dev, prop);
|
||||
+ devm_kfree(&pdev->dev, mac);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
static void *of_get_mac_address_mtd(struct device_node *np)
|
||||
@ -0,0 +1,32 @@
|
||||
From c94b2cfd25c282e2974accc1b07da98ae7139b47 Mon Sep 17 00:00:00 2001
|
||||
From: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
Date: Fri, 23 Jul 2021 12:14:33 +0200
|
||||
Subject: [PATCH 1/2] drivers: net: mediatek: register of_platform for every
|
||||
port
|
||||
|
||||
Currently the nvmem framework require the devicenode to be registred on
|
||||
the of_platform or of_get_mac_address fail to get the macaddress if
|
||||
defined using an nvmem cell. Fix this by registrering these special node
|
||||
so they can be found by of_find_device_by_node.
|
||||
|
||||
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
---
|
||||
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
index ed4eacef17ce..666803817540 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
|
||||
eth->netdev[id]->dev.of_node = np;
|
||||
|
||||
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;
|
||||
+
|
||||
+ of_platform_device_create(np, NULL, NULL);
|
||||
|
||||
return 0;
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
From 8bab551f44204fc5d43977063cd704112c17c750 Mon Sep 17 00:00:00 2001
|
||||
From: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
Date: Fri, 23 Jul 2021 12:17:27 +0200
|
||||
Subject: [PATCH 2/2] dsa: register every port with of_platform
|
||||
|
||||
The declaration of a different mac-addr using the nvmem framework is
|
||||
currently broken. The dsa code use the generic of_get_mac_address where
|
||||
the nvmem function require the device node to be registred in the
|
||||
of_platform to be found by of_find_device_by_node. Register every port
|
||||
in the of_platform so they can corrently found and a custom mac-addr can
|
||||
correctly be declared using a nvmem-cell declared in the dts.
|
||||
|
||||
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
---
|
||||
net/dsa/dsa2.c | 2 +
|
||||
1 file changed, 2 insertion(+)
|
||||
|
||||
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
|
||||
index b71e87909f0e..55bbc1a769ca 100644
|
||||
--- a/net/dsa/dsa2.c
|
||||
+++ b/net/dsa/dsa2.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_net.h>
|
||||
+#include <linux/of_platform.h>
|
||||
#include <net/devlink.h>
|
||||
|
||||
#include "dsa_priv.h"
|
||||
@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp)
|
||||
break;
|
||||
devlink_port_registered = true;
|
||||
|
||||
+ of_platform_device_create(dp->dn, NULL, NULL);
|
||||
dp->mac = of_get_mac_address(dp->dn);
|
||||
err = dsa_slave_create(dp);
|
||||
if (err)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 74 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
|
||||
index 6e411821583e..f072e2509cc9 100644
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -11,6 +11,7 @@
|
||||
@ -27,7 +25,7 @@ index 6e411821583e..f072e2509cc9 100644
|
||||
|
||||
/**
|
||||
* of_get_phy_mode - Get phy mode for given device_node
|
||||
@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface)
|
||||
@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(of_get_phy_mode);
|
||||
|
||||
@ -36,7 +34,7 @@ index 6e411821583e..f072e2509cc9 100644
|
||||
{
|
||||
struct property *pp = of_find_property(np, name, NULL);
|
||||
|
||||
@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
|
||||
@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem
|
||||
return mac;
|
||||
}
|
||||
|
||||
@ -107,7 +105,7 @@ index 6e411821583e..f072e2509cc9 100644
|
||||
/**
|
||||
* Search the device tree for the best MAC address to use. 'mac-address' is
|
||||
* checked first, because that is supposed to contain to "most recent" MAC
|
||||
@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np)
|
||||
@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem
|
||||
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
|
||||
* but is all zeros.
|
||||
*
|
||||
@ -118,7 +116,7 @@ index 6e411821583e..f072e2509cc9 100644
|
||||
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
|
||||
*/
|
||||
const void *of_get_mac_address(struct device_node *np)
|
||||
@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np)
|
||||
@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct de
|
||||
if (addr)
|
||||
return addr;
|
||||
|
||||
@ -129,6 +127,3 @@ index 6e411821583e..f072e2509cc9 100644
|
||||
return of_get_mac_addr_nvmem(np);
|
||||
}
|
||||
EXPORT_SYMBOL(of_get_mac_address);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
@ -18,11 +18,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 45 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
|
||||
index f072e2509cc9..0dbd1f7ef396 100644
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name)
|
||||
@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct devi
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -67,7 +65,7 @@ index f072e2509cc9..0dbd1f7ef396 100644
|
||||
{
|
||||
#ifdef CONFIG_MTD
|
||||
struct device_node *mtd_np = NULL;
|
||||
@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np)
|
||||
@@ -167,28 +172,54 @@ free:
|
||||
* If a mtd-mac-address property exists, try to fetch the MAC address from the
|
||||
* specified mtd device, and store it as a 'mac-address' property
|
||||
*
|
||||
@ -128,6 +126,3 @@ index f072e2509cc9..0dbd1f7ef396 100644
|
||||
+ return addr;
|
||||
}
|
||||
EXPORT_SYMBOL(of_get_mac_address);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ define Device/bananapi_bpi-r2
|
||||
DEVICE_VENDOR := Bananapi
|
||||
DEVICE_MODEL := BPi-R2
|
||||
DEVICE_DTS := mt7623n-bananapi-bpi-r2
|
||||
DEVICE_PACKAGES := kmod-mmc mkf2fs e2fsprogs kmod-usb3 kmod-ata-ahci
|
||||
DEVICE_PACKAGES := mkf2fs e2fsprogs kmod-usb3 kmod-ata-ahci
|
||||
UBOOT_ENVSIZE := 0x10000
|
||||
UBOOT_OFFSET := 320k
|
||||
UBOOT_TARGET := mt7623n_bpir2
|
||||
@ -113,12 +113,39 @@ endef
|
||||
TARGET_DEVICES += bananapi_bpi-r2
|
||||
|
||||
|
||||
ifneq ($(CONFIG_MTK_BOOT_PARTSIZE),)
|
||||
BOOTFS_BLOCK_SIZE := 1024
|
||||
BOOTFS_BLOCKS := $(shell echo $$(($(CONFIG_MTK_BOOT_PARTSIZE)*1024*1024/$(BOOTFS_BLOCK_SIZE))))
|
||||
endif
|
||||
|
||||
define Build/mtk-mmc-img
|
||||
rm -f $@.boot
|
||||
mkfs.fat -C $@.boot $(BOOTFS_BLOCKS)
|
||||
|
||||
if [ -r $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin ]; then \
|
||||
./gen_mtk_mmc_img.sh emmc $@.emmc \
|
||||
$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin; \
|
||||
mcopy -i $@.boot $@.emmc ::eMMCboot.bin; \
|
||||
fi
|
||||
mkenvimage -s $(UBOOT_ENVSIZE) -o $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env $(UBOOT_TARGET)-uEnv.txt
|
||||
mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env ::uboot.env
|
||||
mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage
|
||||
./gen_mtk_mmc_img.sh sd $@ \
|
||||
$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin \
|
||||
$(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-u-boot*.bin \
|
||||
$(UBOOT_OFFSET) \
|
||||
$@.boot \
|
||||
$(IMAGE_ROOTFS) \
|
||||
$(CONFIG_MTK_BOOT_PARTSIZE) \
|
||||
104
|
||||
endef
|
||||
|
||||
define Build/scatterfile
|
||||
./gen_scatterfile.sh $(subst mt,MT,$(SUBTARGET)) "$1" \
|
||||
$(subst -scatter.txt,,$(notdir $@)) "$(DEVICE_TITLE)" > $@
|
||||
endef
|
||||
|
||||
|
||||
# Full eMMC image including U-Boot and partition table
|
||||
define Device/unielec_u7623-emmc
|
||||
DEVICE_VENDOR := UniElec
|
||||
|
||||
@ -229,7 +229,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
CINFIG_HAVE_ARM_ARCH_TIMER=y
|
||||
CONFIG_HAVE_ARM_ARCH_TIMER=y
|
||||
CONFIG_HAVE_SMP=y
|
||||
CONFIG_HDMI=y
|
||||
CONFIG_HIGHMEM=y
|
||||
|
||||
@ -8,7 +8,7 @@ BOARDNAME:=MT7623
|
||||
CPU_TYPE:=cortex-a7
|
||||
CPU_SUBTYPE:=neon-vfpv4
|
||||
KERNELNAME:=Image dtbs zImage
|
||||
FEATURES+=ext4 usb
|
||||
FEATURES+=usb
|
||||
KERNEL_PATCHVER:=5.10
|
||||
DEFAULT_PACKAGES+=blockdev uboot-envtools
|
||||
|
||||
|
||||
@ -129,6 +129,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
# CONFIG_NET_VENDOR_MEDIATEK is not set
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -131,6 +131,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
# CONFIG_NET_VENDOR_MEDIATEK is not set
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
. /lib/functions.sh
|
||||
|
||||
mt7621_bringup_dsa_master() {
|
||||
local board=$(board_name)
|
||||
local masterif
|
||||
|
||||
case "$board" in
|
||||
ubnt,edgerouter-x|\
|
||||
ubnt,edgerouter-x-sfp)
|
||||
masterif="dsa"
|
||||
;;
|
||||
*)
|
||||
masterif="eth0"
|
||||
;;
|
||||
esac
|
||||
|
||||
ip link set $masterif up
|
||||
}
|
||||
|
||||
boot_hook_add preinit_main mt7621_bringup_dsa_master
|
||||
@ -190,6 +190,7 @@ CONFIG_NET_VENDOR_MEDIATEK=y
|
||||
CONFIG_NO_HZ_COMMON=y
|
||||
CONFIG_NO_HZ_IDLE=y
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -180,6 +180,7 @@ CONFIG_NET_SWITCHDEV=y
|
||||
CONFIG_NET_VENDOR_MEDIATEK=y
|
||||
# CONFIG_NET_VENDOR_RALINK is not set
|
||||
CONFIG_NR_CPUS=4
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
# CONFIG_NET_VENDOR_MEDIATEK is not set
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -124,6 +124,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
# CONFIG_NET_VENDOR_MEDIATEK is not set
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NLS=m
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -112,6 +112,7 @@ CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NLS=m
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y
|
||||
CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3050=y
|
||||
CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -113,6 +113,7 @@ CONFIG_NET_RALINK_RT3883=y
|
||||
CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -114,6 +114,7 @@ CONFIG_NET_RALINK_RT3883=y
|
||||
CONFIG_NET_RALINK_SOC=y
|
||||
CONFIG_NET_VENDOR_RALINK=y
|
||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
|
||||
@ -26,20 +26,30 @@ use-case. You've been warned.
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||
@@ -1003,6 +1003,33 @@
|
||||
status = "disabled";
|
||||
@@ -985,22 +985,30 @@
|
||||
};
|
||||
|
||||
+ usbdrd3: usb@ff600000 {
|
||||
usbdrd3: usb@ff600000 {
|
||||
- compatible = "rockchip,rk3328-dwc3", "snps,dwc3";
|
||||
- reg = <0x0 0xff600000 0x0 0x100000>;
|
||||
- interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3";
|
||||
+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
|
||||
+ <&cru ACLK_USB3OTG>;
|
||||
+ clock-names = "ref_clk", "suspend_clk",
|
||||
+ "bus_clk";
|
||||
clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>,
|
||||
<&cru ACLK_USB3OTG>;
|
||||
clock-names = "ref_clk", "suspend_clk",
|
||||
"bus_clk";
|
||||
- dr_mode = "otg";
|
||||
- phy_type = "utmi_wide";
|
||||
- snps,dis-del-phy-power-chg-quirk;
|
||||
- snps,dis_enblslpm_quirk;
|
||||
- snps,dis-tx-ipgap-linecheck-quirk;
|
||||
- snps,dis-u2-freeclk-exists-quirk;
|
||||
- snps,dis_u2_susphy_quirk;
|
||||
- snps,dis_u3_susphy_quirk;
|
||||
+ #address-cells = <2>;
|
||||
+ #size-cells = <2>;
|
||||
+ ranges;
|
||||
+ status = "disabled";
|
||||
status = "disabled";
|
||||
+
|
||||
+ usbdrd_dwc3: dwc3@ff600000 {
|
||||
+ compatible = "snps,dwc3";
|
||||
@ -55,8 +65,6 @@ use-case. You've been warned.
|
||||
+ snps,dis-tx-ipgap-linecheck-quirk;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
};
|
||||
|
||||
gic: interrupt-controller@ff811000 {
|
||||
compatible = "arm,gic-400";
|
||||
#interrupt-cells = <3>;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user