mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-12-25 12:38:22 +01:00
linux-mainline: update stable to 4.16.13
Update stable kernel to 4.16.13 and git kernel to 4.17-rc7. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
This commit is contained in:
parent
7df74e3847
commit
6759ac4ce6
@ -1,74 +0,0 @@
|
|||||||
From 4d470855525b5993e766ad9f9304482739ba918d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sergey Matyukevich <geomatsi@gmail.com>
|
|
||||||
Date: Fri, 3 Nov 2017 22:24:45 +0300
|
|
||||||
Subject: [PATCH 2/2] arm64: dts: orange-pi-zero-plus2: enable AP6212a WiFi/BT
|
|
||||||
combo
|
|
||||||
|
|
||||||
Enable AP6212a WiFi/BT combo chip on orange-pi-zero-plus2 board:
|
|
||||||
- WiFi SDIO interface is connected to MMC1
|
|
||||||
- WiFi REG_ON pin connected to gpio PA9: attach to mmc-pwrseq
|
|
||||||
- WiFi HOST_WAKE pin connected to gpio PL7
|
|
||||||
- BT is connected to UART1
|
|
||||||
|
|
||||||
Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
|
|
||||||
---
|
|
||||||
.../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 32 ++++++++++++++++++++++
|
|
||||||
1 file changed, 32 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
||||||
index a42fd79a62a3..d415b7b67cce 100644
|
|
||||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
||||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
|
|
||||||
@@ -64,6 +64,13 @@
|
|
||||||
regulator-min-microvolt = <3300000>;
|
|
||||||
regulator-max-microvolt = <3300000>;
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+ wifi_pwrseq: wifi_pwrseq {
|
|
||||||
+ compatible = "mmc-pwrseq-simple";
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
|
|
||||||
+ post-power-on-delay-ms = <200>;
|
|
||||||
+ };
|
|
||||||
};
|
|
||||||
|
|
||||||
&mmc0 {
|
|
||||||
@@ -75,6 +82,25 @@
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
+&mmc1 {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&mmc1_pins_a>;
|
|
||||||
+ vmmc-supply = <®_vcc3v3>;
|
|
||||||
+ vqmmc-supply = <®_vcc3v3>;
|
|
||||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
|
||||||
+ bus-width = <4>;
|
|
||||||
+ non-removable;
|
|
||||||
+ status = "okay";
|
|
||||||
+
|
|
||||||
+ brcmf: wifi@1 {
|
|
||||||
+ reg = <1>;
|
|
||||||
+ compatible = "brcm,bcm4329-fmac";
|
|
||||||
+ interrupt-parent = <&r_pio>;
|
|
||||||
+ interrupts = <0 7 IRQ_TYPE_LEVEL_LOW>; /* PL7 */
|
|
||||||
+ interrupt-names = "host-wake";
|
|
||||||
+ };
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
&mmc2 {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&mmc2_8bit_pins>;
|
|
||||||
@@ -90,3 +116,9 @@
|
|
||||||
pinctrl-0 = <&uart0_pins_a>;
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+&uart1 {
|
|
||||||
+ pinctrl-names = "default";
|
|
||||||
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
|
|
||||||
+ status = "okay";
|
|
||||||
+};
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@ -19,11 +19,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
|||||||
|
|
||||||
S = "${WORKDIR}/linux-${PV}"
|
S = "${WORKDIR}/linux-${PV}"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
|
SRC_URI[md5sum] = "86f56f586f35ac3a98e086dccfd2ff99"
|
||||||
SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769"
|
SRC_URI[sha256sum] = "6f0a7b3abd48eca3df5e29bfbcfc1c06dd2792f86d23cdb9ad37cf3e572df2e3"
|
||||||
|
|
||||||
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
|
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
|
||||||
file://0002-arm64-dts-orange-pi-zero-plus2-enable-AP6212a-WiFi-B.patch \
|
|
||||||
file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
|
file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
@ -1,13 +1,15 @@
|
|||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
DESCRIPTION = "Mainline Linux kernel"
|
DESCRIPTION = "Mainline Linux kernel"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
|
||||||
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"
|
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
|
||||||
|
|
||||||
inherit kernel
|
inherit kernel
|
||||||
|
|
||||||
require linux.inc
|
require linux.inc
|
||||||
|
|
||||||
|
# Since we're not using git, this doesn't make a difference, but we need to fill
|
||||||
|
# in something or kernel-yocto.bbclass will fail.
|
||||||
KBRANCH ?= "master"
|
KBRANCH ?= "master"
|
||||||
|
|
||||||
# Pull in the devicetree files into the rootfs
|
# Pull in the devicetree files into the rootfs
|
||||||
@ -15,13 +17,13 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
|
|||||||
|
|
||||||
# Default is to use stable kernel version
|
# Default is to use stable kernel version
|
||||||
# If you want to use latest git version set to "1"
|
# If you want to use latest git version set to "1"
|
||||||
DEFAULT_PREFERENCE = "-1"
|
DEFAULT_PREFERENCE = "-1"
|
||||||
|
|
||||||
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
||||||
|
|
||||||
# 4.15-rc1
|
# v4.17-rc7
|
||||||
PV = "4.15+git${SRCPV}"
|
PV = "v4.17-rc7+git${SRCPV}"
|
||||||
SRCREV_pn-${PN} = "4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323"
|
SRCREV_pn-${PN} = "b04e217704b7f879c6b91222b066983a44a7a09f"
|
||||||
|
|
||||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
|
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
DESCRIPTION = "Linux Kernel"
|
DESCRIPTION = "Linux Kernel"
|
||||||
SECTION = "kernel"
|
SECTION = "kernel"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
|
|
||||||
|
|
||||||
INC_PR = "r0"
|
INC_PR = "r0"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user