diff --git a/linux-phicomm-n1/.SRCINFO b/linux-phicomm-n1/.SRCINFO index 4b71685..12aa12b 100644 --- a/linux-phicomm-n1/.SRCINFO +++ b/linux-phicomm-n1/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-phicomm-n1 - pkgver = 5.2.11 - pkgrel = 5 + pkgver = 5.2.12 + pkgrel = 1 url = http://www.kernel.org/ arch = aarch64 license = GPL2 @@ -16,7 +16,7 @@ pkgbase = linux-phicomm-n1 depends = uboot-tools options = !strip source = http://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.tar.xz - source = http://www.kernel.org/pub/linux/kernel/v5.x/patch-5.2.11.xz + source = http://www.kernel.org/pub/linux/kernel/v5.x/patch-5.2.12.xz source = meson-gxl-s905d-phicomm-n1.dts source = config source = linux.preset diff --git a/linux-phicomm-n1/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/linux-phicomm-n1/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch deleted file mode 100644 index 00efbbf..0000000 --- a/linux-phicomm-n1/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 9d67e07fc4387a19c35ac5a26d7f4d1fb1d9f4ba Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 1/5] net/smsc95xx: Allow mac address to be set as a parameter - ---- - drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 56 insertions(+) - -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index e3d08626828e..2eaae00b4033 100644 ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -60,6 +60,7 @@ - #define SUSPEND_SUSPEND3 (0x08) - #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ - SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) -+#define MAC_ADDR_LEN (6) - - #define CARRIER_CHECK_DELAY (2 * HZ) - -@@ -82,6 +83,10 @@ static bool turbo_mode = true; - module_param(turbo_mode, bool, 0644); - MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); - -+static char *macaddr = ":"; -+module_param(macaddr, charp, 0); -+MODULE_PARM_DESC(macaddr, "MAC address"); -+ - static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, - u32 *data, int in_pm) - { -@@ -911,8 +916,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) - return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); - } - -+/* Check the macaddr module parameter for a MAC address */ -+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) -+{ -+ int i, j, got_num, num; -+ u8 mtbl[MAC_ADDR_LEN]; -+ -+ if (macaddr[0] == ':') -+ return 0; -+ -+ i = 0; -+ j = 0; -+ num = 0; -+ got_num = 0; -+ while (j < MAC_ADDR_LEN) { -+ if (macaddr[i] && macaddr[i] != ':') { -+ got_num++; -+ if ('0' <= macaddr[i] && macaddr[i] <= '9') -+ num = num * 16 + macaddr[i] - '0'; -+ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') -+ num = num * 16 + 10 + macaddr[i] - 'A'; -+ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') -+ num = num * 16 + 10 + macaddr[i] - 'a'; -+ else -+ break; -+ i++; -+ } else if (got_num == 2) { -+ mtbl[j++] = (u8) num; -+ num = 0; -+ got_num = 0; -+ i++; -+ } else { -+ break; -+ } -+ } -+ -+ if (j == MAC_ADDR_LEN) { -+ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " -+ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], -+ mtbl[3], mtbl[4], mtbl[5]); -+ for (i = 0; i < MAC_ADDR_LEN; i++) -+ dev_mac[i] = mtbl[i]; -+ return 1; -+ } else { -+ return 0; -+ } -+} -+ - static void smsc95xx_init_mac_address(struct usbnet *dev) - { -+ /* Check module parameters */ -+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) -+ return; -+ - const u8 *mac_addr; - - /* maybe the boot loader passed the MAC address in devicetree */ --- -2.21.0 - diff --git a/linux-phicomm-n1/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch b/linux-phicomm-n1/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch deleted file mode 100644 index 23b83fe..0000000 --- a/linux-phicomm-n1/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d33b99832841943f7e787605d7f364fd49f5f007 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Mon, 7 Aug 2017 19:34:57 -0600 -Subject: [PATCH 2/5] arm64: dts: rockchip: disable pwm0 on rk3399-firefly - -Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock. ---- - arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts -index c706db0ee9ec..24adeca99711 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts -@@ -640,7 +640,7 @@ - }; - - &pwm0 { -- status = "okay"; -+ status = "disabled"; - }; - - &pwm2 { --- -2.21.0 - diff --git a/linux-phicomm-n1/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch b/linux-phicomm-n1/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch deleted file mode 100644 index 6d10f28..0000000 --- a/linux-phicomm-n1/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1a9d394ffb964839f90b4d4efd1b9730c16efd22 Mon Sep 17 00:00:00 2001 -From: William Wu -Date: Mon, 4 Dec 2017 10:40:39 +0100 -Subject: [PATCH 3/5] arm64: dts: rockchip: add usb3 controller node for RK3328 - SoCs - -RK3328 has one USB 3.0 OTG controller which uses DWC_USB3 -core's general architecture. It can act as static xHCI host -controller, static device controller, USB 3.0/2.0 OTG basing -on ID of USB3.0 PHY. - -Signed-off-by: William Wu -Signed-off-by: Heiko Stuebner ---- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index dabef1a21649..56e4a0649ec2 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -917,6 +917,33 @@ - status = "disabled"; - }; - -+ usbdrd3: usb@ff600000 { -+ 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"; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ status = "disabled"; -+ -+ usbdrd_dwc3: dwc3@ff600000 { -+ compatible = "snps,dwc3"; -+ reg = <0x0 0xff600000 0x0 0x100000>; -+ interrupts = ; -+ dr_mode = "otg"; -+ phy_type = "utmi_wide"; -+ snps,dis_enblslpm_quirk; -+ snps,dis-u2-freeclk-exists-quirk; -+ snps,dis_u2_susphy_quirk; -+ snps,dis_u3_susphy_quirk; -+ snps,dis-del-phy-power-chg-quirk; -+ snps,dis-tx-ipgap-linecheck-quirk; -+ status = "disabled"; -+ }; -+ }; -+ - gic: interrupt-controller@ff811000 { - compatible = "arm,gic-400"; - #interrupt-cells = <3>; --- -2.21.0 - diff --git a/linux-phicomm-n1/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch b/linux-phicomm-n1/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch deleted file mode 100644 index ccd0a75..0000000 --- a/linux-phicomm-n1/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fc0ef0a1243aaa7992157260e928ea96c5ff7986 Mon Sep 17 00:00:00 2001 -From: Heiko Stuebner -Date: Mon, 4 Dec 2017 10:40:41 +0100 -Subject: [PATCH 4/5] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 - -Enable the nodes to make the usb3 port usable on that board. - -Signed-off-by: Heiko Stuebner ---- - arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index 79b4d1d4b5d6..57c8741665c3 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -369,6 +369,15 @@ - status = "okay"; - }; - -+&usbdrd3 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ - &vop { - status = "okay"; - }; --- -2.21.0 - diff --git a/linux-phicomm-n1/0005-watchdog-bcm2835_wdt-Fix-module-autoload.patch b/linux-phicomm-n1/0005-watchdog-bcm2835_wdt-Fix-module-autoload.patch deleted file mode 100644 index 2bb794c..0000000 --- a/linux-phicomm-n1/0005-watchdog-bcm2835_wdt-Fix-module-autoload.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5aef2cc938fd9446724b175d92a0f7701b9934e2 Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Wed, 15 May 2019 19:14:18 +0200 -Subject: [PATCH 5/5] watchdog: bcm2835_wdt: Fix module autoload - -The commit 5e6acc3e678e ("bcm2835-pm: Move bcm2835-watchdog's DT probe -to an MFD.") broke module autoloading on Raspberry Pi. So add a -module alias this fix this. - -Signed-off-by: Stefan Wahren -Reviewed-by: Guenter Roeck ---- - drivers/watchdog/bcm2835_wdt.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c -index 1834524ae373..c7695a0c933f 100644 ---- a/drivers/watchdog/bcm2835_wdt.c -+++ b/drivers/watchdog/bcm2835_wdt.c -@@ -241,6 +241,7 @@ module_param(nowayout, bool, 0); - MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" - __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); - -+MODULE_ALIAS("platform:bcm2835-wdt"); - MODULE_AUTHOR("Lubomir Rintel "); - MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer"); - MODULE_LICENSE("GPL"); --- -2.21.0 - diff --git a/linux-phicomm-n1/PKGBUILD b/linux-phicomm-n1/PKGBUILD index cd47517..c4f02df 100644 --- a/linux-phicomm-n1/PKGBUILD +++ b/linux-phicomm-n1/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=linux-phicomm-n1 _srcname=linux-5.2 _kernelname=${pkgbase#linux} _desc="AArch64 kernel for Phicomm N1" -pkgver=5.2.11 -pkgrel=5 +pkgver=5.2.12 +pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2')