f34397d1b7
The following patches were dropped because they are already applied upstream: - 0038-MIPS-lantiq-fpi-on-ar9.patch - 0039-MIPS-lantiq-initialize-usb-on-boot.patch - 0042-USB-DWC2-big-endian-support.patch - 0043-gpio-stp-xway-fix-phy-mask.patch All other patches were simply refreshed, except the following: - 0001-MIPS-lantiq-add-pcie-driver.patch Changes to arch/mips/lantiq/xway/sysctrl.c (these changes disabled some PMU gates for the vrx200 / VR9 SoCs) were removed since the upstream kernel disables unused PMU gates automatically (since 95135bfa7ead1becc2879230f72583dde2b71a0c "MIPS: Lantiq: Deactivate most of the devices by default"). - 0025-NET-MIPS-lantiq-adds-xrx200-net.patch Since OpenWrt commit 55ba20afcc2fe785146316e5be2c2473cb329885 drivers should use of_get_mac_address(). of_get_mac_address_mtd is not available for drivers anymore since it's called automatically within of_get_mac_address(). - 0028-NET-lantiq-various-etop-fixes.patch Same changes as in 0025-NET-MIPS-lantiq-adds-xrx200-net.patch While refreshing the kernel configuration SPI support had to be moved to config-4.4 because otherwise M25P80 was disabled. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 48307
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
From b1b9fca8c317afc3f2b78bb54f877e8a830a819d Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Fri, 9 Aug 2013 18:47:27 +0200
|
|
Subject: [PATCH 34/36] reset: Fix compile when reset RESET_CONTROLLER is not
|
|
selected
|
|
|
|
Drivers need to protect their reset api calls with #ifdef to avoid compile
|
|
errors.
|
|
|
|
This patch adds dummy wrappers in the same way that linux/of.h does it.
|
|
|
|
Cc: linux-kernel@vger.kernel.org
|
|
Cc: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Cc: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
include/linux/reset-controller.h | 16 ++++++++++++++
|
|
include/linux/reset.h | 43 ++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 59 insertions(+)
|
|
|
|
--- a/include/linux/reset-controller.h
|
|
+++ b/include/linux/reset-controller.h
|
|
@@ -48,7 +48,23 @@ struct reset_controller_dev {
|
|
unsigned int nr_resets;
|
|
};
|
|
|
|
+#if defined(CONFIG_RESET_CONTROLLER)
|
|
+
|
|
int reset_controller_register(struct reset_controller_dev *rcdev);
|
|
void reset_controller_unregister(struct reset_controller_dev *rcdev);
|
|
|
|
+#else
|
|
+
|
|
+static inline int reset_controller_register(struct reset_controller_dev *rcdev)
|
|
+{
|
|
+ return -ENOSYS;
|
|
+}
|
|
+
|
|
+void reset_controller_unregister(struct reset_controller_dev *rcdev)
|
|
+{
|
|
+
|
|
+}
|
|
+
|
|
+#endif
|
|
+
|
|
#endif
|