Hi,
On Fri, Jun 02, 2017 at 10:06:27AM +0300, Alex A. Mihaylov wrote:
Add basic support regmap (register map access) API for 1-Wire bus
Thanks :)
quoted hunk ↗ jump to hunk
diff --git a/drivers/base/regmap/regmap-w1.c b/drivers/base/regmap/regmap-w1.c
new file mode 100644
index 0000000000..5f04e7bf06
--- /dev/null
+++ b/drivers/base/regmap/regmap-w1.c
@@ -0,0 +1,245 @@
+/*
+ * Register map access API - W1 (1-Wire) support
+ *
+ * Copyright (C) 2017 OAO Radioavionica
+ * Author: Alex A. Mihaylov <minimumlaw@rambler.ru>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation
+ */
+
+#include <linux/regmap.h>
+#include <linux/module.h>
+#include "../../w1/w1.h"
This conflicts with the following patch:
https://www.spinics.net/lists/kernel/msg2524566.html
I guess Greg could pull your immutable branch and above
patch can be augumented to also update regmap-w1.
-- Sebastian