CVS commit: src/sys/external/bsd/drm2/include/linux/regulator
Module Name:src
Committed By: maya
Date: Mon Nov 19 10:48:59 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux/regulator: consumer.h
Log Message:
include machine/limits.h for INT_MAX
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
diff -u src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.4 src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.5
--- src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.4 Mon Aug 27 15:29:54 2018
+++ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Mon Nov 19 10:48:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: consumer.h,v 1.4 2018/08/27 15:29:54 riastradh Exp $ */
+/* $NetBSD: consumer.h,v 1.5 2018/11/19 10:48:59 maya Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#ifdef FDT
+#include
#include
struct regulator {
CVS commit: src/sys/external/bsd/drm2/include/linux/regulator
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 15:29:54 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux/regulator: consumer.h
Log Message:
Make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
diff -u src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.3 src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.4
--- src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.3 Mon Aug 27 07:49:36 2018
+++ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Mon Aug 27 15:29:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: consumer.h,v 1.3 2018/08/27 07:49:36 riastradh Exp $ */
+/* $NetBSD: consumer.h,v 1.4 2018/08/27 15:29:54 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,6 +38,8 @@
#ifdef FDT
+#include
+
struct regulator {
struct fdtbus_regulator regulator;
};
@@ -56,13 +58,12 @@ regulator_get_voltage(struct regulator *
}
KASSERTMSG(uvolt <= INT_MAX, "high voltage: %u uV", uvolt);
- return (int)uvol;
+ return (int)uvolt;
}
static inline int
regulator_set_voltage(struct regulator *reg, int min_uvolt, int max_uvolt)
{
- unsigned v;
if (min_uvolt < 0 || max_uvolt < 0)
return -EINVAL;
CVS commit: src/sys/external/bsd/drm2/include/linux/regulator
Module Name:src Committed By: riastradh Date: Mon Aug 27 07:49:36 UTC 2018 Modified Files: src/sys/external/bsd/drm2/include/linux/regulator: consumer.h Log Message: Protect #include "opt_*.h" by #ifdef _KERNEL_OPT. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/linux/regulator/consumer.h diff -u src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.2 src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.3 --- src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.2 Mon Aug 27 07:33:18 2018 +++ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Mon Aug 27 07:49:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: consumer.h,v 1.2 2018/08/27 07:33:18 riastradh Exp $ */ +/* $NetBSD: consumer.h,v 1.3 2018/08/27 07:49:36 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -32,7 +32,9 @@ #ifndef _LINUX_REGULATOR_CONSUMER_H_ #define _LINUX_REGULATOR_CONSUMER_H_ +#ifdef _KERNEL_OPT #include "opt_fdt.h" +#endif #ifdef FDT
CVS commit: src/sys/external/bsd/drm2/include/linux/regulator
Module Name:src
Committed By: riastradh
Date: Mon Aug 27 07:33:18 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux/regulator: consumer.h
Log Message:
Copy regulator API from fdtbus.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/linux/regulator/consumer.h
diff -u src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.1 src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.2
--- src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.1 Mon Aug 27 06:35:44 2018
+++ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Mon Aug 27 07:33:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: consumer.h,v 1.1 2018/08/27 06:35:44 riastradh Exp $ */
+/* $NetBSD: consumer.h,v 1.2 2018/08/27 07:33:18 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,4 +32,61 @@
#ifndef _LINUX_REGULATOR_CONSUMER_H_
#define _LINUX_REGULATOR_CONSUMER_H_
+#include "opt_fdt.h"
+
+#ifdef FDT
+
+struct regulator {
+ struct fdtbus_regulator regulator;
+};
+
+static inline int
+regulator_get_voltage(struct regulator *reg)
+{
+ unsigned uvolt;
+ int error;
+
+ error = fdtbus_regulator_get_voltage(>regulator, );
+ if (error) {
+ /* XXX errno NetBSD->Linux */
+ KASSERTMSG(error > 0, "negative error: %d", error);
+ return -error;
+ }
+
+ KASSERTMSG(uvolt <= INT_MAX, "high voltage: %u uV", uvolt);
+ return (int)uvol;
+}
+
+static inline int
+regulator_set_voltage(struct regulator *reg, int min_uvolt, int max_uvolt)
+{
+ unsigned v;
+
+ if (min_uvolt < 0 || max_uvolt < 0)
+ return -EINVAL;
+
+ /* XXX errno NetBSD->Linux */
+ return -fdtbus_regulator_set_voltage(>regulator, min_uvolt,
+ max_uvolt);
+}
+
+#else
+
+struct regulator;
+
+static inline int
+regulator_get_voltage(struct regulator *reg)
+{
+ panic("no voltage regulators here");
+}
+
+static inline int
+regulator_set_voltage(struct regulator *reg, int min_uvolt, int max_uvolt)
+{
+ panic("no voltage regulators here");
+}
+
+
+#endif
+
#endif /* _LINUX_REGULATOR_CONSUMER_H_ */
CVS commit: src/sys/external/bsd/drm2/include/linux/regulator
Module Name:src Committed By: riastradh Date: Mon Aug 27 06:35:44 UTC 2018 Added Files: src/sys/external/bsd/drm2/include/linux/regulator: consumer.h Log Message: Stub . To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/drm2/include/linux/regulator/consumer.h diff -u /dev/null src/sys/external/bsd/drm2/include/linux/regulator/consumer.h:1.1 --- /dev/null Mon Aug 27 06:35:44 2018 +++ src/sys/external/bsd/drm2/include/linux/regulator/consumer.h Mon Aug 27 06:35:44 2018 @@ -0,0 +1,35 @@ +/* $NetBSD: consumer.h,v 1.1 2018/08/27 06:35:44 riastradh Exp $ */ + +/*- + * Copyright (c) 2018 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUX_REGULATOR_CONSUMER_H_ +#define _LINUX_REGULATOR_CONSUMER_H_ + +#endif /* _LINUX_REGULATOR_CONSUMER_H_ */
