diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-12-15 08:25:16 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-12-15 08:25:16 +0100 |
| commit | a2501c9e889abd22b47d42956d27b02607dbb0d8 (patch) | |
| tree | f30b5c829fe0adcc784c143aaf436abb6eb9724d /drivers/regulator | |
| parent | abad1451586d8e8b36f86ef2772cef81d4ce2651 (diff) | |
| parent | 2962e19b55e970c7a2f1b0048abf1ef95463c6f5 (diff) | |
| download | barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.gz barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/regulator/Makefile | 2 | ||||
| -rw-r--r-- | drivers/regulator/bcm2835.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/core.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/fixed.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/helpers.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/stm32-pwr.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/stpmic1_regulator.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 4e05d8f488..02cea362eb 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only menuconfig REGULATOR bool "voltage regulator support" diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 9580bcb5ca..7b5d527cb1 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_REGULATOR) += core.o helpers.o obj-$(CONFIG_OFDEVICE) += of_regulator.o obj-$(CONFIG_REGULATOR_FIXED) += fixed.o diff --git a/drivers/regulator/bcm2835.c b/drivers/regulator/bcm2835.c index 3351e6d2f3..71a1d1a55d 100644 --- a/drivers/regulator/bcm2835.c +++ b/drivers/regulator/bcm2835.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * bcm2835 regulator support * diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 4cf6e34de8..d1d3a36dfc 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * barebox regulator support * diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index e6a85c46f4..f068fded62 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * fixed regulator support * diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index 06cccbeeca..fb689a6bfc 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <regmap.h> #include <regulator.h> diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c index 4cb46b081a..8cb0b0c12e 100644 --- a/drivers/regulator/stm32-pwr.c +++ b/drivers/regulator/stm32-pwr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // Copyright (C) STMicroelectronics 2019 // Authors: Gabriel Fernandez <gabriel.fernandez@st.com> // Pascal Paillet <p.paillet@st.com>. diff --git a/drivers/regulator/stpmic1_regulator.c b/drivers/regulator/stpmic1_regulator.c index 61227e0855..63ed4468ed 100644 --- a/drivers/regulator/stpmic1_regulator.c +++ b/drivers/regulator/stpmic1_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // Copyright (C) STMicroelectronics 2018 // Author: Pascal Paillet <p.paillet@st.com> for STMicroelectronics. |