All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Joshua Watt" <JPEWhacker@gmail.com>
To: yocto@lists.yoctoproject.org
Cc: twoerner@gmail.com, Joshua Watt <JPEWhacker@gmail.com>
Subject: [meta-rockchip][PATCH] linux-yocto: Remove Rock Pi 4 patch for serial
Date: Sat, 23 Jan 2021 15:05:25 -0600	[thread overview]
Message-ID: <20210123210525.20237-1-JPEWhacker@gmail.com> (raw)

Upstream OE Core has moved to Kernel 5.10 which fixed this problem, so
remove the patch for 5.8

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 ...-resolve-supply-after-creating-regul.patch | 53 -------------------
 recipes-kernel/linux/linux-yocto_5.8.bbappend |  4 --
 2 files changed, 57 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
 delete mode 100644 recipes-kernel/linux/linux-yocto_5.8.bbappend

diff --git a/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch b/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
deleted file mode 100644
index 3dd336b..0000000
--- a/recipes-kernel/linux/linux-yocto/0001-Revert-regulator-resolve-supply-after-creating-regul.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a414d39b848002e15531f2538d2b6427ce51d07d Mon Sep 17 00:00:00 2001
-From: Joshua Watt <JPEWhacker@gmail.com>
-Date: Thu, 10 Dec 2020 15:59:47 -0600
-Subject: [PATCH] Revert "regulator: resolve supply after creating regulator"
-
-This commit prevents the serial console from working on the Rock Pi 4
-for some reason. It *appears* to possibly be fixed by some other commit
-upstream, but after a lot of head scratching and bisecting, I was unable
-to find which one, so just revert it for now and we can deal with it
-later.
-
-This reverts commit 96c6b5d5775637b3095ef934f871044811fd4db7.
-
----
- drivers/regulator/core.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index 25e601bf9383..be8c709a7488 100644
---- a/drivers/regulator/core.c
-+++ b/drivers/regulator/core.c
-@@ -5187,20 +5187,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
- 	else if (regulator_desc->supply_name)
- 		rdev->supply_name = regulator_desc->supply_name;
- 
-+	/*
-+	 * Attempt to resolve the regulator supply, if specified,
-+	 * but don't return an error if we fail because we will try
-+	 * to resolve it again later as more regulators are added.
-+	 */
-+	if (regulator_resolve_supply(rdev))
-+		rdev_dbg(rdev, "unable to resolve supply\n");
-+
- 	ret = set_machine_constraints(rdev, constraints);
--	if (ret == -EPROBE_DEFER) {
--		/* Regulator might be in bypass mode and so needs its supply
--		 * to set the constraints */
--		/* FIXME: this currently triggers a chicken-and-egg problem
--		 * when creating -SUPPLY symlink in sysfs to a regulator
--		 * that is just being created */
--		ret = regulator_resolve_supply(rdev);
--		if (!ret)
--			ret = set_machine_constraints(rdev, constraints);
--		else
--			rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
--				 ERR_PTR(ret));
--	}
- 	if (ret < 0)
- 		goto wash;
- 
--- 
-2.29.2
-
diff --git a/recipes-kernel/linux/linux-yocto_5.8.bbappend b/recipes-kernel/linux/linux-yocto_5.8.bbappend
deleted file mode 100644
index 5a31842..0000000
--- a/recipes-kernel/linux/linux-yocto_5.8.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_rock-pi-4 = " file://0001-Revert-regulator-resolve-supply-after-creating-regul.patch"
-
-- 
2.30.0


             reply	other threads:[~2021-01-23 21:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-23 21:05 Joshua Watt [this message]
2021-01-25 22:34 ` [meta-rockchip][PATCH] linux-yocto: Remove Rock Pi 4 patch for serial Trevor Woerner
2021-01-25 22:42   ` Joshua Watt
2021-01-25 23:10     ` Trevor Woerner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210123210525.20237-1-JPEWhacker@gmail.com \
    --to=jpewhacker@gmail.com \
    --cc=twoerner@gmail.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.