3fc661a98c
As usual these patches were extracted from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Also alphabetically order sound-soc kernel packages. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From 0b7e0b20da67546344f9fc8e57699adfe61b8953 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
|
|
Date: Sat, 15 Aug 2015 20:50:02 +0200
|
|
Subject: [PATCH 025/381] bcm2835: Add support for uart1
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is a hack until a proper solution is agreed upon.
|
|
Martin Sperl is doing some work in this area.
|
|
|
|
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
|
---
|
|
arch/arm/mach-bcm/board_bcm2835.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
--- a/arch/arm/mach-bcm/board_bcm2835.c
|
|
+++ b/arch/arm/mach-bcm/board_bcm2835.c
|
|
@@ -22,6 +22,29 @@
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
+/* Use this hack until a proper solution is agreed upon */
|
|
+static void __init bcm2835_init_uart1(void)
|
|
+{
|
|
+ struct device_node *np;
|
|
+
|
|
+ np = of_find_compatible_node(NULL, NULL, "brcm,bcm2835-aux-uart");
|
|
+ if (of_device_is_available(np)) {
|
|
+ np = of_find_compatible_node(NULL, NULL,
|
|
+ "bcrm,bcm2835-aux-enable");
|
|
+ if (np) {
|
|
+ void __iomem *base = of_iomap(np, 0);
|
|
+
|
|
+ if (!base) {
|
|
+ pr_err("bcm2835: Failed enabling Mini UART\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ writel(1, base);
|
|
+ pr_info("bcm2835: Mini UART enabled\n");
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
static void __init bcm2835_init(void)
|
|
{
|
|
struct device_node *np = of_find_node_by_path("/system");
|
|
@@ -42,6 +65,8 @@ static void __init bcm2835_init(void)
|
|
system_rev = val;
|
|
if (!of_property_read_u64(np, "linux,serial", &val64))
|
|
system_serial_low = val64;
|
|
+
|
|
+ bcm2835_init_uart1();
|
|
}
|
|
|
|
static const char * const bcm2835_compat[] = {
|