62b7f5931c
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
169 lines
5.2 KiB
Diff
169 lines
5.2 KiB
Diff
From e108e2c34b3acc70ec55b7d0772abb79c96319b2 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 28 Jan 2020 09:33:52 +0100
|
|
Subject: [PATCH] reset: Move reset-simple header out of drivers/reset
|
|
|
|
The reset-simple code can be useful for drivers outside of drivers/reset
|
|
that have a few reset controls as part of their features. Let's move it to
|
|
include/linux/reset.
|
|
|
|
Cc: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/reset/reset-simple.c | 3 +--
|
|
drivers/reset/reset-socfpga.c | 3 +--
|
|
drivers/reset/reset-sunxi.c | 3 +--
|
|
drivers/reset/reset-uniphier-glue.c | 3 +--
|
|
{drivers => include/linux}/reset/reset-simple.h | 0
|
|
5 files changed, 4 insertions(+), 8 deletions(-)
|
|
rename {drivers => include/linux}/reset/reset-simple.h (100%)
|
|
|
|
--- a/drivers/reset/reset-simple.c
|
|
+++ b/drivers/reset/reset-simple.c
|
|
@@ -18,10 +18,9 @@
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
+#include <linux/reset/reset-simple.h>
|
|
#include <linux/spinlock.h>
|
|
|
|
-#include "reset-simple.h"
|
|
-
|
|
static inline struct reset_simple_data *
|
|
to_reset_simple_data(struct reset_controller_dev *rcdev)
|
|
{
|
|
--- a/drivers/reset/reset-socfpga.c
|
|
+++ b/drivers/reset/reset-socfpga.c
|
|
@@ -11,13 +11,12 @@
|
|
#include <linux/of_address.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
+#include <linux/reset/reset-simple.h>
|
|
#include <linux/reset/socfpga.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/types.h>
|
|
|
|
-#include "reset-simple.h"
|
|
-
|
|
#define SOCFPGA_NR_BANKS 8
|
|
|
|
static int a10_reset_init(struct device_node *np)
|
|
--- a/drivers/reset/reset-sunxi.c
|
|
+++ b/drivers/reset/reset-sunxi.c
|
|
@@ -14,13 +14,12 @@
|
|
#include <linux/of_address.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset-controller.h>
|
|
+#include <linux/reset/reset-simple.h>
|
|
#include <linux/reset/sunxi.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/types.h>
|
|
|
|
-#include "reset-simple.h"
|
|
-
|
|
static int sunxi_reset_init(struct device_node *np)
|
|
{
|
|
struct reset_simple_data *data;
|
|
--- a/drivers/reset/reset-uniphier-glue.c
|
|
+++ b/drivers/reset/reset-uniphier-glue.c
|
|
@@ -9,8 +9,7 @@
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/reset.h>
|
|
-
|
|
-#include "reset-simple.h"
|
|
+#include <linux/reset/reset-simple.h>
|
|
|
|
#define MAX_CLKS 2
|
|
#define MAX_RSTS 2
|
|
--- a/drivers/reset/reset-simple.h
|
|
+++ /dev/null
|
|
@@ -1,41 +0,0 @@
|
|
-/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
-/*
|
|
- * Simple Reset Controller ops
|
|
- *
|
|
- * Based on Allwinner SoCs Reset Controller driver
|
|
- *
|
|
- * Copyright 2013 Maxime Ripard
|
|
- *
|
|
- * Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
- */
|
|
-
|
|
-#ifndef __RESET_SIMPLE_H__
|
|
-#define __RESET_SIMPLE_H__
|
|
-
|
|
-#include <linux/io.h>
|
|
-#include <linux/reset-controller.h>
|
|
-#include <linux/spinlock.h>
|
|
-
|
|
-/**
|
|
- * struct reset_simple_data - driver data for simple reset controllers
|
|
- * @lock: spinlock to protect registers during read-modify-write cycles
|
|
- * @membase: memory mapped I/O register range
|
|
- * @rcdev: reset controller device base structure
|
|
- * @active_low: if true, bits are cleared to assert the reset. Otherwise, bits
|
|
- * are set to assert the reset. Note that this says nothing about
|
|
- * the voltage level of the actual reset line.
|
|
- * @status_active_low: if true, bits read back as cleared while the reset is
|
|
- * asserted. Otherwise, bits read back as set while the
|
|
- * reset is asserted.
|
|
- */
|
|
-struct reset_simple_data {
|
|
- spinlock_t lock;
|
|
- void __iomem *membase;
|
|
- struct reset_controller_dev rcdev;
|
|
- bool active_low;
|
|
- bool status_active_low;
|
|
-};
|
|
-
|
|
-extern const struct reset_control_ops reset_simple_ops;
|
|
-
|
|
-#endif /* __RESET_SIMPLE_H__ */
|
|
--- /dev/null
|
|
+++ b/include/linux/reset/reset-simple.h
|
|
@@ -0,0 +1,41 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
+/*
|
|
+ * Simple Reset Controller ops
|
|
+ *
|
|
+ * Based on Allwinner SoCs Reset Controller driver
|
|
+ *
|
|
+ * Copyright 2013 Maxime Ripard
|
|
+ *
|
|
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
+ */
|
|
+
|
|
+#ifndef __RESET_SIMPLE_H__
|
|
+#define __RESET_SIMPLE_H__
|
|
+
|
|
+#include <linux/io.h>
|
|
+#include <linux/reset-controller.h>
|
|
+#include <linux/spinlock.h>
|
|
+
|
|
+/**
|
|
+ * struct reset_simple_data - driver data for simple reset controllers
|
|
+ * @lock: spinlock to protect registers during read-modify-write cycles
|
|
+ * @membase: memory mapped I/O register range
|
|
+ * @rcdev: reset controller device base structure
|
|
+ * @active_low: if true, bits are cleared to assert the reset. Otherwise, bits
|
|
+ * are set to assert the reset. Note that this says nothing about
|
|
+ * the voltage level of the actual reset line.
|
|
+ * @status_active_low: if true, bits read back as cleared while the reset is
|
|
+ * asserted. Otherwise, bits read back as set while the
|
|
+ * reset is asserted.
|
|
+ */
|
|
+struct reset_simple_data {
|
|
+ spinlock_t lock;
|
|
+ void __iomem *membase;
|
|
+ struct reset_controller_dev rcdev;
|
|
+ bool active_low;
|
|
+ bool status_active_low;
|
|
+};
|
|
+
|
|
+extern const struct reset_control_ops reset_simple_ops;
|
|
+
|
|
+#endif /* __RESET_SIMPLE_H__ */
|