add patch for bluetooth on pinetab/pinephone, disable rockchip-cdn-dp to fix...

add patch for bluetooth on pinetab/pinephone, disable rockchip-cdn-dp to fix LCD on pbpro and enable pinctrl to enable usb on pinebook
parent 12c45d31
Pipeline #112 passed with stage
in 115 minutes and 12 seconds
......@@ -3,7 +3,7 @@ build-package:
- bigbuilds
- strit
script:
- makepkg -scr --noconfirm
- sudo pacman -Syy && makepkg -scr --noconfirm
artifacts:
paths:
- ./*.pkg.tar.*
......
From 5c0b458760023fe941fc6f0019cfbd572c6c9daa Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Wed, 15 Apr 2020 11:10:36 +0200
Subject: [PATCH] Revert "arm64: dts: allwinner: pinebook: Fix 5v0 boost
regulator"
This reverts commit e95d8d03b5904a373895c14a44eb60264c7bc041.
---
.../dts/allwinner/sun50i-a64-pinebook.dts | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 64b1c54f87c0..2d3bdd39a057 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -69,15 +69,6 @@ reg_vbklt: vbklt {
enable-active-high;
};
- reg_vcc5v0: vcc5v0 {
- compatible = "regulator-fixed";
- regulator-name = "vcc5v0";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- gpio = <&axp_gpio 0 GPIO_ACTIVE_HIGH>;
- enable-active-high;
- };
-
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
@@ -85,7 +76,12 @@ wifi_pwrseq: wifi_pwrseq {
speaker_amp: audio-amplifier {
compatible = "simple-audio-amplifier";
- VCC-supply = <&reg_vcc5v0>;
+ /*
+ * TODO This is actually a fixed regulator controlled by
+ * the GPIO line on the PMIC. This should be corrected
+ * once GPIO support is added for this PMIC.
+ */
+ VCC-supply = <&reg_ldo_io0>;
enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
sound-name-prefix = "Speaker Amp";
};
@@ -352,6 +348,13 @@ &reg_fldo2 {
regulator-name = "vdd-cpus";
};
+&reg_ldo_io0 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-usb";
+ status = "okay";
+};
+
&reg_rtc_ldo {
regulator-name = "vcc-rtc";
};
@@ -413,7 +416,7 @@ &usb_otg {
};
&usbphy {
- usb0_vbus-supply = <&reg_vcc5v0>;
- usb1_vbus-supply = <&reg_vcc5v0>;
+ usb0_vbus-supply = <&reg_ldo_io0>;
+ usb1_vbus-supply = <&reg_ldo_io0>;
status = "okay";
};
--
2.26.0
From 11b68020edeac7889dd229d3f03191cd0e63f2b2 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Fri, 29 May 2020 18:12:53 +0200
Subject: [PATCH] arm64-dts-allwinner-enable-bluetooth-pinetab-pinephone
---
.../boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 14 ++++++++++++++
.../boot/dts/allwinner/sun50i-a64-pinetab.dts | 14 ++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index cefda145c3c9..aaafd80435d7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -358,6 +358,20 @@ &uart0 {
status = "okay";
};
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+ status = "okay";
+
+ bluetooth {
+ compatible = "realtek,rtl8723cs-bt";
+ reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
+ device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */
+ host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ firmware-postfix = "pinebook";
+ };
+};
+
/* Connected to the modem (hardware flow control can't be used) */
&uart3 {
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index dc4ab6b434f9..9019dd4adcc7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -442,6 +442,20 @@ &uart0 {
status = "okay";
};
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+ status = "okay";
+
+ bluetooth {
+ compatible = "realtek,rtl8723cs-bt";
+ reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
+ device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */
+ host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ firmware-postfix = "pinebook";
+ };
+};
+
&usb_otg {
dr_mode = "otg";
status = "okay";
--
2.26.2
......@@ -10,7 +10,7 @@ _srcname=linux-${_rcver}-rc${_rcrel}
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform (release candidate)"
pkgver=${_rcver}.rc${_rcrel}
pkgrel=5
pkgrel=6
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
......@@ -22,7 +22,6 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
'0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch'
'0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch'
'0001-arm64-dts-rockchip-add-pcie-node-rockpi4.patch'
'0001-Revert-arm64-dts-allwinner-pinebook-Fix-5v0-boost-re.patch'
'0002-arm64-dts-rockchip-modify-pcie-node-rockpro64.patch'
'0003-text_offset.patch'
'0004-board-rockpi4-dts-upper-port-host.patch'
......@@ -40,6 +39,7 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
'0008-drm-sun8i-ui-vi-Fix-layer-zpos-change-atomic-modesetting.patch'
'0009-drm-sun4i-Mark-one-of-the-UI-planes-as-a-cursor-one.patch'
'0010-drm-sun4i-drm-Recover-from-occasional-HW-failures.patch'
'0011-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch'
'config'
'linux.preset'
'60-linux.hook'
......@@ -62,7 +62,6 @@ md5sums=('8b9baa724bf7a0a80c5ee029a3264781'
'9986e28b5c2c3c62a5c3bb53abd94640'
'552ea82c3a5e14ca9149da8c4b4d5a82'
'7b6f548fc352a4c530eae58f6a69041f'
'0e9c104a015560939256ca0d5748fa65'
'39fc489449d519b45532631825840f3d'
'fd5919b02b1dd17f62dd51d57986368f'
'f7769084356056b5eec725938e49a6a5'
......@@ -80,7 +79,8 @@ md5sums=('8b9baa724bf7a0a80c5ee029a3264781'
'929f2d20a44be5b5d7c6a5134c660a79'
'22c651017f864e41916a74e63ef46a19'
'bf9f906cca7b7489d3123a249dcbd021'
'3ca3b896559e9626f392c5406dabfce0'
'a74fcfa1e085a3a99dcf4f214c1ca65a'
'c75e72c72fc95a63b75181f9990d6f37'
'86d4a35722b5410e3b29fc92dae15d4b'
'ce6c81ad1ad1f8b333fd6077d47abdaf'
'3dc88030a8f2f5a5f97266d99b149f77'
......@@ -108,7 +108,6 @@ prepare() {
# Manjaro ARM Patches
patch -Np1 -i "${srcdir}/0001-arm64-dts-rockchip-add-pcie-node-rockpi4.patch"
patch -Np1 -i "${srcdir}/0001-Revert-arm64-dts-allwinner-pinebook-Fix-5v0-boost-re.patch"
patch -Np1 -i "${srcdir}/0002-arm64-dts-rockchip-modify-pcie-node-rockpro64.patch"
patch -Np1 -i "${srcdir}/0003-text_offset.patch"
patch -Np1 -i "${srcdir}/0004-board-rockpi4-dts-upper-port-host.patch"
......@@ -128,6 +127,7 @@ prepare() {
patch -Np1 -i "${srcdir}/0008-drm-sun8i-ui-vi-Fix-layer-zpos-change-atomic-modesetting.patch"
patch -Np1 -i "${srcdir}/0009-drm-sun4i-Mark-one-of-the-UI-planes-as-a-cursor-one.patch"
patch -Np1 -i "${srcdir}/0010-drm-sun4i-drm-Recover-from-occasional-HW-failures.patch"
patch -Np1 -i "${srcdir}/0011-arm64-dts-allwinner-enable-bluetooth-pinetab-pinepho.patch"
# Bootsplash patches
patch -Np1 -i "${srcdir}/0001-bootsplash.patch"
......
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.7.0-rc7-5 Kernel Configuration
# Linux/arm64 5.7.0-rc7-6 Kernel Configuration
#
#
......@@ -4058,7 +4058,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y
CONFIG_PINCONF=y
CONFIG_GENERIC_PINCONF=y
# CONFIG_DEBUG_PINCTRL is not set
# CONFIG_PINCTRL_AXP209 is not set
CONFIG_PINCTRL_AXP209=y
CONFIG_PINCTRL_AMD=y
# CONFIG_PINCTRL_MCP23S08 is not set
CONFIG_PINCTRL_ROCKCHIP=y
......@@ -5721,7 +5721,7 @@ CONFIG_DRM_VGEM=m
# CONFIG_DRM_VKMS is not set
CONFIG_DRM_ROCKCHIP=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_CDN_DP=y
# CONFIG_ROCKCHIP_CDN_DP is not set
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_INNO_HDMI=y
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment