pinctrl: uniphier: include <linux/build_bug.h> instead of <linux/bug.h>

[u-boot] / drivers / pinctrl / uniphier / pinctrl-uniphier.h

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
index 5c3db2ab60541fbd4605862b8ee2ff132ba5c811..55f2b1a4d56903621d51466bffde4863c647b6ed 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h
@@ -1,15 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __PINCTRL_UNIPHIER_H__
 #define __PINCTRL_UNIPHIER_H__
 
 #include <linux/bitops.h>
-#include <linux/bug.h>
+#include <linux/build_bug.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 
@@ -67,6 +66,7 @@ struct uniphier_pinctrl_socdata {
        const char * const *functions;
        int functions_count;
        unsigned caps;
+#define UNIPHIER_PINCTRL_CAPS_PUPD_SIMPLE      BIT(3)
 #define UNIPHIER_PINCTRL_CAPS_PERPIN_IECTRL    BIT(2)
 #define UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE  BIT(1)
 #define UNIPHIER_PINCTRL_CAPS_MUX_4BIT         BIT(0)
@@ -91,7 +91,12 @@ struct uniphier_pinctrl_socdata {
 #define __UNIPHIER_PINMUX_FUNCTION(func)       #func
 
 #ifdef CONFIG_SPL_BUILD
-#define UNIPHIER_PINCTRL_GROUP(grp)            { .name = NULL }
+       /*
+        * a tricky way to drop unneeded *_pins and *_muxvals arrays from SPL,
+        * suppressing "defined but not used" warnings.
+        */
+#define UNIPHIER_PINCTRL_GROUP(grp)                                    \
+       { .num_pins = ARRAY_SIZE(grp##_pins) + ARRAY_SIZE(grp##_muxvals) }
 #define UNIPHIER_PINMUX_FUNCTION(func)         NULL
 #else
 #define UNIPHIER_PINCTRL_GROUP(grp)            __UNIPHIER_PINCTRL_GROUP(grp)