forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions
pmaports/main/linux-postmarketos-allwinner/0008-dts-pinephone-drop-modem-power-node.patch

174 lines
5.3 KiB
Diff
Raw Normal View History

linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149) I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-03 03:48:05 +00:00
From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 16 Dec 2020 20:16:14 -0800
Subject: [PATCH] dts: pinephone: drop modem-power node
---
.../allwinner/sun50i-a64-pinephone-1.0.dts | 26 +++---------------
.../allwinner/sun50i-a64-pinephone-1.1.dts | 27 +++----------------
.../allwinner/sun50i-a64-pinephone-1.2.dts | 27 +++----------------
.../dts/allwinner/sun50i-a64-pinephone.dtsi | 12 +++++++++
4 files changed, 24 insertions(+), 68 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
index a21c6d78a0ef..7f0cfdafed15 100644
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
@@ -86,28 +86,6 @@ &reg_drivevbus {
status = "okay";
};
-&uart3 {
- modem {
- compatible = "quectel,eg25";
- char-device-name = "modem-power";
-
- power-supply = <&reg_vbat_bb>; /* PL7 */
-
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
-
- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */
-
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
-
- quectel,qdai = "1,1,0,1,0,0,1,1";
- };
-};
-
&usbphy {
usb-role-switch;
@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
};
};
+&ring_indicator {
+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
+};
+
&sgm3140 {
enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
index d67f31ef529e..e7b636299d15 100644
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
@@ -114,29 +114,6 @@ &sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
};
-&uart3 {
- modem {
- compatible = "quectel,eg25";
- char-device-name = "modem-power";
-
- power-supply = <&reg_vbat_bb>; /* PL7 */
-
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
- //status-pwrkey-multiplexed; /* status acts as pwrkey */
-
- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */
-
- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
-
- quectel,qdai = "1,1,0,1,0,0,1,1";
- };
-};
-
&usbphy {
usb-role-switch;
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
};
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
};
};
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
+
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
+&ring_indicator {
+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
index 9b33186c7e7d..44b3d6555ff7 100644
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
@@ -107,29 +107,6 @@ &sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
};
-&uart3 {
- modem {
- compatible = "quectel,eg25";
- char-device-name = "modem-power";
-
- power-supply = <&reg_vbat_bb>; /* PL7 */
-
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
- status-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
-
- host-ready-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
- wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-RI */
-
- dtr-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-DTR */
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
-
- quectel,qdai = "1,1,0,1,0,0,1,1";
- };
-};
-
&usbphy {
usb-role-switch;
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
};
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
};
};
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
+
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
+&ring_indicator {
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
+};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149) I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-03 03:48:05 +00:00
index d3d4f1a53c8d..3cf2f3e6a41a 100644
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149) I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-03 03:48:05 +00:00
@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955) Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag. All patches were rebased.
2021-02-15 21:24:48 +00:00
sound-name-prefix = "Modem";
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
};
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ ring_indicator: ring-indicator {
+ label = "Ring Indicator";
+ linux,can-disable;
+ linux,code = <KEY_WAKEUP>;
+ wakeup-source;
+ };
+ };
+
i2c_csi: i2c-csi {
compatible = "i2c-gpio";
sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149) I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-03 03:48:05 +00:00
@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
reg_vbat_bb: vbat-bb {
compatible = "regulator-fixed";
regulator-name = "vbat-bb";
+ regulator-always-on;
regulator-min-microvolt = <3500000>;
regulator-max-microvolt = <3500000>;
gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
--
linux-postmarketos-allwinner: Upgrade to 5.12.6 (MR 2149) I rebased all of the patches (only 2 needed some changes, the rest I just did for good measure). These two patches were dropped since they are already merged in the new kernel: 0008-leds-gpio-Set-max-brightness-to-1.patch 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped The kconfig changes are just after running kconfig edit, and making no changes so that it would generate a config with any new options in 5.12, to make maintenance easier moving forward.
2021-05-03 03:48:05 +00:00
2.31.1
linux-postmarketos-allwinner: disable modem-power driver (MR 1815) Disabling in favor of controlling modem in userspace (e.g., eg25-manager) [ci:skip-build]: already built successfully in CI
2020-12-16 09:52:55 +00:00
Reference in a new issue Copy permalink