public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 02/15] rpi: Remove runtime disabling support for serial
Date: Thu, 25 Jan 2018 12:05:43 +0100	[thread overview]
Message-ID: <20180125110556.76352-3-agraf@suse.de> (raw)
In-Reply-To: <20180125110556.76352-1-agraf@suse.de>

We are switching to a model where our board file can directly fail probing
of serial devices when they're not usable, so remove the current runtime
hack we have.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 board/raspberrypi/rpi/rpi.c | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c8924d4362..177f4af265 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -420,54 +420,11 @@ static void get_board_rev(void)
 	printf("RPI %s (0x%x)\n", model->name, revision);
 }
 
-#ifndef CONFIG_PL01X_SERIAL
-static bool rpi_is_serial_active(void)
-{
-	int serial_gpio = 15;
-	struct udevice *dev;
-
-	/*
-	 * The RPi3 disables the mini uart by default. The easiest way to find
-	 * out whether it is available is to check if the RX pin is muxed.
-	 */
-
-	if (uclass_first_device(UCLASS_PINCTRL, &dev) || !dev)
-		return true;
-
-	if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT5)
-		return false;
-
-	return true;
-}
-
-/* Disable mini-UART I/O if it's not pinmuxed to our pins.
- * The firmware only enables it if explicitly done in config.txt: enable_uart=1
- */
-static void rpi_disable_inactive_uart(void)
-{
-	struct udevice *dev;
-	struct bcm283x_mu_serial_platdata *plat;
-
-	if (uclass_get_device_by_driver(UCLASS_SERIAL,
-					DM_GET_DRIVER(serial_bcm283x_mu),
-					&dev) || !dev)
-		return;
-
-	if (!rpi_is_serial_active()) {
-		plat = dev_get_platdata(dev);
-		plat->disabled = true;
-	}
-}
-#endif
-
 int board_init(void)
 {
 #ifdef CONFIG_HW_WATCHDOG
 	hw_watchdog_init();
 #endif
-#ifndef CONFIG_PL01X_SERIAL
-	rpi_disable_inactive_uart();
-#endif
 
 	get_board_rev();
 
-- 
2.12.3

  parent reply	other threads:[~2018-01-25 11:05 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-25 11:05 [U-Boot] [PATCH v3 00/15] RPi: Properly handle dynamic serial configuration Alexander Graf
2018-01-25 11:05 ` [U-Boot] [PATCH v3 01/15] serial: Use next serial device if probing fails Alexander Graf
2018-01-28 18:54   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-29  3:27     ` Derald D. Woods
2018-01-29 10:17       ` Alexander Graf
2018-01-29 22:40       ` Alexander Graf
2018-01-25 11:05 ` Alexander Graf [this message]
2018-01-28 18:54   ` [U-Boot] [U-Boot, v3, 02/15] rpi: Remove runtime disabling support for serial Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 03/15] serial: bcm283x_mu: Remove support for post-init disabling Alexander Graf
2018-01-28 18:54   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 04/15] rpi: Determine PL011/Mini-UART availability at runtime Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 05/15] serial_bcm283x_mu: Convert to dev_read Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 06/15] serial_bcm283x_mu: Always skip init Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot,v3,06/15] " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 07/15] serial_bcm283x_mu: Fail loading if not muxed Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 08/15] pl01x: Convert to dev_read Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot,v3,08/15] " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 09/15] pl010: Convert CONFIG_PL010_SERIAL to Kconfig Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 10/15] pl011: Convert CONFIG_PL011_SERIAL " Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 11/15] pl01x: Convert CONFIG_PL01X_SERIAL " Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 12/15] bcm2835_mu_serial: Convert " Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 13/15] MAINTAINERS: Take over BCM2835 maintainership Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-31  8:34   ` [U-Boot] [PATCH v3 " Wolfgang Denk
2018-01-31  8:52     ` Alexander Graf
2018-01-31 13:04       ` Wolfgang Denk
2018-01-25 11:05 ` [U-Boot] [PATCH v3 14/15] bcm2835_pl011_serial: Add BCM2835 specific serial driver Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot, v3, " Tom Rini
2018-01-25 11:05 ` [U-Boot] [PATCH v3 15/15] bcm2835_pinctrl: Probe pre-reloc Alexander Graf
2018-01-28 18:55   ` [U-Boot] [U-Boot,v3,15/15] " Tom Rini

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=20180125110556.76352-3-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=u-boot@lists.denx.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox