linux-amlogic: update to 4.18.14 r2

yangxuan8282 · Nov 9, 2018 · a663f92 · a663f92
1 parent 901aedb
commit a663f92
Show file tree

Hide file tree

Showing 5 changed files with 564 additions and 119 deletions.
diff --git a/kernel/alpine/APKBUILDs/linux-amlogic/APKBUILD b/kernel/alpine/APKBUILDs/linux-amlogic/APKBUILD
@@ -6,13 +6,13 @@ case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel for Amlogic"
 url=https://github.com/torvalds/linux
 _commit=e7d199e92956587695510d147c8de795f944cec9
 depends="mkinitfs"
 _depends_dev="perl gmp-dev elfutils-dev bash"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware openssl1.0-dev bison flex"
+makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware openssl-dev bison flex"
 options="!strip !check"
 source="$url/archive/${_commit}.tar.gz
 	config-changes-amlogic.aarch64
@@ -46,7 +46,8 @@ source="$url/archive/${_commit}.tar.gz
 	0027-ARM64-dts-meson-gx-add-vdec-entry.patch
 	0001-libretech-cc-disable-CVBS-connector.patch
 	0001-ARM64-dts-meson-add-vdec-entries.patch
-	0001-arm64-dts-meson-gxl-add-support-for-phicomm-n1.patch
+	add-phicomm-n1.patch
+	bt-btbcm.patch
 	brcmfmac-Disable-power-management.patch
 	offset.patch
 	off_error_text_offset.patch
@@ -274,8 +275,8 @@ _dev() {
 }
 
 sha512sums="b65dc14801b987b4d8ca786aa6571da12fd929ab147ed2f71f366b32313cd72d3047830e502b3fe51f9f1f3963d46b7f5b45ed937a4bdfee14dc216b32de2d3a  e7d199e92956587695510d147c8de795f944cec9.tar.gz
-12f0fd99ede213bcaf3f45cfa2033107be584760fe48071e945fcef54c1c2aa413f8c52db2983738f59d3510b7850231eff349fa862f8cfdc60b64e3eea2e1ba  config-changes-amlogic.aarch64
-4547c771ec2a6b65e4c4eb2ff51112c31262d53747293e7d5cd5ffd2202ea5144433cacab2070697e4677442c15873a31b3ce0ce5afcc292baeb44533e2292ff  defconfig
+7186849193386fc06caab6db9ebf3d5b7efe2511f1c3836bb70d713340eb69b1f123f8372f15ee7f8dd61eeff5ce772b35db8557133ef64a2a1a5ca9e7cd30c9  config-changes-amlogic.aarch64
+2784f8c05c1c66f2bff73d0cdd415781e6529f269223607c18302803125092e7cb6c94083146deecc3226672f7f4754246cc62808f9384f697782ec55786883d  defconfig
 94f944448156e435030d84d787d1489cdab4a6733b1fd27cd4ecd1284337d2b3e68bb3f74b3268a4cac01587e96019d4ad2a354c59d1422b6caae3f97849717f  0001-ARM64-dts-meson-gxbb-nanopi-k2-Add-HDMI-CEC-and-CVBS.patch
 997fee925f07735e635fdd2d2474500ca5a81a80a7817c079174e2508eec223264c97b79cfc057d6b4e428c4d9392405f79befd242dc9b21e020f544ffd84c9d  0002-drm-meson-Make-DMT-timings-parameters-and-pixel-cloc.patch
 3294e40073360e9f6daf3360022a8443bdab960ba0f261e5858e36e7b838af0304888eef9992ef93f67a5dc97f0a26c46f08da1c2f32ca1fe01b9754f55ae975  0003-ARM64-defconfig-enable-CEC-support.patch
@@ -305,7 +306,8 @@ f01e6fd7a319c75c85803e1deb1681772385640fd10ef4a24b164af6e708d0d29e8118bf2be12a82
 608bb5d25c94e9d8e0a1ea9d9fc2eb4436870d72e39f9446322dbdc62a5b7a3fd07d735613a425e1853cf9dd3e61fc860f4310858f9cfbea62a3ba69378b653c  0027-ARM64-dts-meson-gx-add-vdec-entry.patch
 0ab00106ab3a15ef884d0d08c4e947037007a4af7b03fc204346e9487f1f8841140dead1f6b8704b74f7fd955deaaa58cc7ce81c42a847bcdc5c13aac627f3e4  0001-libretech-cc-disable-CVBS-connector.patch
 7715e9c35072f60856d5ab6940874f053cd5e64f09ae97c79eef98bf0856f3a27643dae1154eec787c94a8c7c84b39c580324540db37d9bf2cf70b2bfa66595a  0001-ARM64-dts-meson-add-vdec-entries.patch
-a37bdf0060ca547a1d30cca78d1b138f8e4306776ef0d57473ace88b6fbe341ba6d302077db486ee1e74829d5b975c66c1a303b5f3eda71aa061b98f71392178  0001-arm64-dts-meson-gxl-add-support-for-phicomm-n1.patch
+6262ecd89164edcfc58ef7d50c0b027a2263e6e78f51f033b611734a8e8db0436e1b132aee65546717dd5c79635ef38c9be11cffd7808491687494df9fdcb08e  add-phicomm-n1.patch
+dcc02a2e35e530490f18dd1f7e304aebd7c268ed8a46971d94e9da7dfd65b287002e6b921e46db5ce118177c9ab79fbe3640565cb2df19809b6eff514122fb43  bt-btbcm.patch
 007075ca40915f20c6c8f5e04825c3433a52621deb689a9a690a3fcc618ca9629bc089a1a2ad5141fc47a8aa0aabb302ecf75e81ef8cae466e978074156231ac  brcmfmac-Disable-power-management.patch
 cb2ec80ae38c4cc46ea2a4ca6d157498632f8154ef6a1dedb898c70593c812743a69a4c0d36a4e146a71c588e30e9f9b2feb415e00166850c2cf79797048b032  offset.patch
 e5d214788f9a28d79a9ef135fbed3b3c87982941788ca74d31d919534d1627c1265b268982f67de6c14b331d1a38938b4c2772f17b3db3bddd3983f919fe73ca  off_error_text_offset.patch"
diff --git a/...eson-gxl-add-support-for-phicomm-n1.patch → ...BUILDs/linux-amlogic/add-phicomm-n1.patch b/...eson-gxl-add-support-for-phicomm-n1.patch → ...BUILDs/linux-amlogic/add-phicomm-n1.patch
@@ -1,21 +1,5 @@
-From edaf56aab1a594a790d208f41264ca3a1a638bd8 Mon Sep 17 00:00:00 2001
-From: He Yangxuan <yangxuan8282@gmail.com>
-Date: Sat, 13 Oct 2018 17:25:01 +0800
-Subject: [PATCH] arm64: dts: meson-gxl: add support for phicomm n1
-
-This patch adds support for the Phicomm N1. This device based on P230 reference design.
-The phy is RTL8211F, need to disable Energy Efficient Ethernet (EEE) to make it stable.
-And this box doesn't have cvbs, so disable related section in device tree.
-
-Signed-off-by: He Yangxuan <yangxuan8282@gmail.com>
----
- arch/arm64/boot/dts/amlogic/Makefile               |  1 +
- .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts     | 32 ++++++++++++++++++++++
- 2 files changed, 33 insertions(+)
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
-
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index a97c0e2d7..ebd96da2c 100644
+index 34dd0e9..773f415 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
 @@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
@@ -28,10 +12,10 @@ index a97c0e2d7..ebd96da2c 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
 new file mode 100644
-index 000000000..1daf58df0
+index 0000000..7903dad
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,42 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2018 He Yangxuan
@@ -45,6 +29,10 @@ index 000000000..1daf58df0
 +	compatible = "phicomm,n1", "amlogic,s905d", "amlogic,meson-gxl";
 +	model = "Phicomm N1";
 +
++	aliases {
++		serial1 = &uart_A;
++	};
++
 +	cvbs-connector {
 +		status = "disabled";
 +	};
@@ -54,16 +42,19 @@ index 000000000..1daf58df0
 +	status = "disabled";
 +};
 +
-+&external_mdio {
-+	external_phy: ethernet-phy@0 {
-+		compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
-+		reg = <0>;
-+		eee-broken-1000t;
-+		max-speed = <1000>;
-+		interrupt-parent = <&gpio_intc>;
-+		interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
++&external_phy {
++	/* Realtek RTL8211F (0x001cc916) */
++	eee-broken-1000t;
++};
++
++/* This is connected to the Bluetooth module: */
++&uart_A {
++	status = "okay";
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++
++	bluetooth {
++		compatible = "brcm,bcm43438-bt";
++		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
 +	};
 +};
--- 
-2.11.0
-
diff --git a/kernel/alpine/APKBUILDs/linux-amlogic/bt-btbcm.patch b/kernel/alpine/APKBUILDs/linux-amlogic/bt-btbcm.patch
@@ -0,0 +1,11 @@
+--- a/drivers/bluetooth/btbcm.c	2018-07-09 00:34:02.000000000 +0100
++++ b/drivers/bluetooth/btbcm.c	2018-07-12 11:38:12.323462430 +0100
+@@ -326,7 +326,7 @@ static const struct bcm_subver_table bcm
+ 	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */
+ 	{ 0x610c, "BCM4354"	},	/* 003.001.012 */
+ 	{ 0x2122, "BCM4343A0"	},	/* 001.001.034 */
+-	{ 0x2209, "BCM43430A1"  },	/* 001.002.009 */
++	{ 0x2209, "BCM43438A1"  },	/* 001.002.009 */
+ 	{ 0x6119, "BCM4345C0"	},	/* 003.001.025 */
+ 	{ 0x230f, "BCM4356A2"	},	/* 001.003.015 */
+ 	{ }
diff --git a/kernel/alpine/APKBUILDs/linux-amlogic/config-changes-amlogic.aarch64 b/kernel/alpine/APKBUILDs/linux-amlogic/config-changes-amlogic.aarch64
@@ -3,7 +3,6 @@
 # enable,disable,module,set-str,set-value
 CONFIG_DRM_UDL=module
 CONFIG_FB_UDL=module
-CONFIG_SYN_COOKIES=enable
 CONFIG_SLAB_FREELIST_RANDOM=enable
 CONFIG_SLAB_FREELIST_HARDENED=enable
 CONFIG_STRICT_DEVMEM=enable