Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <946cea0c-6d7f-c2e3-4412-4967ece40b94@axentia.se>
Date:   Wed, 24 May 2023 14:52:38 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: [PATCH v2] mux: mmio: depend on REGMAP as the code has that
 dependency
From:   Peter Rosin <peda@axentia.se>
To:     Philipp Zabel <p.zabel@pengutronix.de>
Cc:     Randy Dunlap <rdunlap@infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <64cf625b-2495-2382-0331-519d1cab0adf@infradead.org>
 <d1a3d8dd-213b-3772-17a7-c08e06cab837@axentia.se>
 <89199aca-5b57-e8df-03ca-b2658ee9d8b3@axentia.se>
 <20230210115625.GA30942@pengutronix.de>
 <31f2a49f-bc48-d502-df31-667ef1a83fab@axentia.se>
Content-Language: en-US
In-Reply-To: <31f2a49f-bc48-d502-df31-667ef1a83fab@axentia.se>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NG5zQjZBTW1CdGNGREdzNkRIVmVtY01ydnJaU004dDlBOHZ0OHRxTnZZeVll?=
 =?utf-8?B?dVM5YTRISElsclNyUC9pSVBFdmZQNGcwMXVxaUpyejB1elJCVytZZVYvQTVs?=
 =?utf-8?B?eGVSMG0yeFpwcGRSMnMxR2pNRUZqMEk5OVZHLzBRUktObGVtRmdSaFhWd1Yx?=
 =?utf-8?B?U0NrVTVRWnlmQ2IyN1lSVnlnRXZCaWV1MzY4VEF0dEV1UkdwSEtiR1c1L04z?=
 =?utf-8?B?anFsYnQrV3NORlBIVytUTVhrclVxSjJGQ3dvSElNUll0V3lKa3hYbVlxbHFD?=
 =?utf-8?B?dC9pdkpYLzZGUWlGRU1ibHFQQkZWLzAxQi9WSExUZWt4dzF0OTZWcHk2TnJY?=
 =?utf-8?B?MDFQUE9IVXNwOFhtajByZ05jbGxlblJiT1ZDeGVJdUxmYzlZRVlnZ0ZVZlhi?=
 =?utf-8?B?cytLaG91L3BKY0R1LzJNQmJJSDJhY1NnaEVBU1lpazVsZXVLZHhtWXB4MXo4?=
 =?utf-8?B?KzJKRnllYkM5TzdldEZpTkFrenpBeTZZbFEveENhZWRaZVZLY21vclYxc0FC?=
 =?utf-8?B?dEZiaXgvWnRKdlNTRGxzd0JDbU9STm13SS9oOGQ1d3dSN3dzRVFzTXpBU1ZZ?=
 =?utf-8?B?K28yWjNLVnlWeUd6Uk5DN0ljTXJWR2krdnNscUkyeHdvbkpTNUpYeU5HZzVD?=
 =?utf-8?B?OXI1WlRxeGh2S0pCOFk5Zjg1QXdFekltVFU0QktWL0Ywdmw1Tk1ISFM4LzBy?=
 =?utf-8?B?RjNiQnoyZzB6NndqZUNsbzltK0xxc1lHWDVXSnNXNlE0YlZvVWhkMGtKS1Ro?=
 =?utf-8?B?elJWV3dyUklJRlBWSUpzSVBieWY0ek82dlpWbStUTWxNak82RHgvU3psVjhJ?=
 =?utf-8?B?TzJXaTRsY1JKRVJPN0tDcGF0NkJMSFN5YnFIRmFpVWVkaWdpdHliY1ozVFFw?=
 =?utf-8?B?TjVXZ1EyM1lrOUY5dzFFK0RlODkwTWNtRW5lRkc1SllKWjJzRUJMeWc0L3ZV?=
 =?utf-8?B?cUg1UlpXcTY4R3RsMmc4dkFNUElFWXIwUzBvUkhPbm01NXFvbllEbDM3Tk5L?=
 =?utf-8?B?OVVLNGw3c2M3eGx4MlowS2ttd3hSMEVMbXl4WVJFYVVWRW8zY2RvVXdCTEZO?=
 =?utf-8?B?a3RrYlQzd3FHNnllSzhiZ1BhWkx5bDRJbjdqOVpZR1c3aXlrZ3MrZllka3JS?=
 =?utf-8?B?Ulg2ZVYzeGt1aWlVdkNqNEFlMUFTbHc3cGxrRGZkYUJsejYvZDQrUC9kN2JJ?=
 =?utf-8?B?anMzN2VpNXFjeW1mOUd6K3czWm4rSnU4QVk0SytIWTlwdDBrWC8rV05SWFBw?=
 =?utf-8?B?MGg1Nkhud1F2a2t5dEJSVVFTQUpHUkJSdUpPM1FEVGVLUUdkN1kxOWxBNUNL?=
 =?utf-8?B?V3V0Q2QzcXFUa0t1MWRhTDlNbWJoY2UxYW9oQldGd0xlU0RXdGs5LzJHUFpP?=
 =?utf-8?B?ZWlaV0NWZEZjM2RxemQrN0lzelhTa3l5Zi9tN0hwSFdVOE5odTJqbmQwL3hK?=
 =?utf-8?B?YkpYQmFHQk5RYmo4YkVxVWJYWEdqTUx5R3NXSDU0TkNkZFJQSVZXM1hZOWRt?=
 =?utf-8?B?NE85NUZyWHFJNDNpbUV5QzEwYkl6R3JvQWUrUHVBQXh1b09aY3Q5Qms5b1Ew?=
 =?utf-8?B?NFk3UGthUjR6MjUrc1JCMTZsNlc0SWFmaGJ0THl1VVd6SjliQS92Ly93enc4?=
 =?utf-8?B?ZUQvK2dCN3FpYk9vbm9CMDNFSWpSTi9JeE5qbUxjbnRzSkJiSFdFS3VmamNE?=
 =?utf-8?B?YVY3d1dIU3l0R0d3bitIeUlhYkxiajZKb2RFelh6TzVIK2JzekUyOEZGVVhi?=
 =?utf-8?B?SE5FRTQrakk3VUtwS3ByeGtTQytZc2FPRXdaZmpybW5JTklDWjMyYzUrT0Rp?=
 =?utf-8?B?N1I0di90Q05DRGxzelBUbFovZTFpTHZ5THVwcFpXNFp4U1Z1bVBxMS9saG1C?=
 =?utf-8?B?bmxld0JuT3RaNkVjb2pHQll3M2hxUGU2bzBMcUl4bFNFeCtLQ056U3NwNW9W?=
 =?utf-8?B?NVYyc3BkZzNMUWxzbnFqNmljOHRxcGVLLzYxSEZNdTA3N3hGQTZ0Z2RWaXpz?=
 =?utf-8?B?cnZFZnQ3TXZra1h1bTBCYm9KVVorY1JsS3BWcGJGaVdhcVJpdkkxL2QwTHdt?=
 =?utf-8?B?V21MRVFxSUFoTTNZZXZjQ29mV05wdDk5ck4xbWdqUXoyRjJLamhETXBrOGJM?=
 =?utf-8?Q?WKGgCbMEhoTqRudxthwvm3dF5?=
X-OriginatorOrg: axentia.se
X-MS-Exchange-CrossTenant-Network-Message-Id: 00ce744a-d253-4d8a-a92c-08db5c55c25f
X-MS-Exchange-CrossTenant-AuthSource: AM0PR02MB4436.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2023 12:52:40.7784
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eeZUnu3WPwha9xOhhejuGUkMUOKs0PPyNVAt+LRgZEaRc4IqPXPkrumOt9UPF43w
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR02MB9229
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If CONFIG_REGMAP is not active, the build errors out like this:

../drivers/mux/mmio.c: In function ‘mux_mmio_probe’:
../drivers/mux/mmio.c:76:34: error: storage size of ‘field’ isn’t known
   76 |                 struct reg_field field;
      |                                  ^~~~~
In file included from ../include/linux/bits.h:21,
                 from ../include/linux/bitops.h:6,
                 from ../drivers/mux/mmio.c:8:
../include/linux/bits.h:23:28: error: first argument to ‘__builtin_choose_expr’ not a constant
   23 |         (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |                            ^~~~~~~~~~~~~~~~~~~~~
../include/linux/build_bug.h:16:62: note: in definition of macro ‘BUILD_BUG_ON_ZERO’
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                              ^
../include/linux/bits.h:37:10: note: in expansion of macro ‘GENMASK_INPUT_CHECK’
   37 |         (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |          ^~~~~~~~~~~~~~~~~~~
../drivers/mux/mmio.c:96:29: note: in expansion of macro ‘GENMASK’
   96 |                 if (mask != GENMASK(field.msb, field.lsb)) {
      |                             ^~~~~~~
../include/linux/build_bug.h:16:51: error: bit-field ‘<anonymous>’ width not an integer constant
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
../include/linux/bits.h:23:10: note: in expansion of macro ‘BUILD_BUG_ON_ZERO’
   23 |         (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |          ^~~~~~~~~~~~~~~~~
../include/linux/bits.h:37:10: note: in expansion of macro ‘GENMASK_INPUT_CHECK’
   37 |         (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |          ^~~~~~~~~~~~~~~~~~~
../drivers/mux/mmio.c:96:29: note: in expansion of macro ‘GENMASK’
   96 |                 if (mask != GENMASK(field.msb, field.lsb)) {
      |                             ^~~~~~~
../drivers/mux/mmio.c:102:29: error: implicit declaration of function ‘devm_regmap_field_alloc’ [-Werror=implicit-function-declaration]
  102 |                 fields[i] = devm_regmap_field_alloc(dev, regmap, field);
      |                             ^~~~~~~~~~~~~~~~~~~~~~~
../drivers/mux/mmio.c:76:34: warning: unused variable ‘field’ [-Wunused-variable]
   76 |                 struct reg_field field;
      |                                  ^~~~~

REGMAP is normally "selected", but that causes a recursive dependency.
But since REGMAP is "depended on" in other places, do so here as well.
The (implicit) REGMAP dependency was lost when the strict dependency
on MFD_SYSCON was removed.

Reported by: Randy Dunlap <rdunlap@infradead.org>
Fixes: 8ecfaca7926f ("mux: mmio: add generic regmap bitfield-based multiplexer")
Link: https://lore.kernel.org/lkml/64cf625b-2495-2382-0331-519d1cab0adf@infradead.org/
Signed-off-by: Peter Rosin <peda@axentia.se>
---
 drivers/mux/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Note, there is a patch in linux-next that removes "|| COMPILE_TEST" from the
pre-existing depends.

Cheers,
Peter

diff --git a/drivers/mux/Kconfig b/drivers/mux/Kconfig
index 80f015cf6e54..7f07ca06eb2b 100644
--- a/drivers/mux/Kconfig
+++ b/drivers/mux/Kconfig
@@ -48,6 +48,7 @@ config MUX_GPIO
 config MUX_MMIO
 	tristate "MMIO/Regmap register bitfield-controlled Multiplexer"
 	depends on OF
+	depends on REGMAP
 	help
 	  MMIO/Regmap register bitfield-controlled Multiplexer controller.
 
-- 
2.20.1