summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2018-09-16 17:46:54 +0100
committerPeter Robinson <pbrobinson@gmail.com>2018-09-16 17:47:24 +0100
commit5b467198f4ff20bd18deac3838d8df4c0266694b (patch)
tree0ac16ffdbd9557dab7a6951371aa9e6d2425db3f
parent543e5bdda51d3389c72f06515ec96012c1c27d44 (diff)
downloadkernel-5b467198f4ff20bd18deac3838d8df4c0266694b.tar.gz
kernel-5b467198f4ff20bd18deac3838d8df4c0266694b.tar.xz
kernel-5b467198f4ff20bd18deac3838d8df4c0266694b.zip
a few minor ARM config tweaks
-rw-r--r--configs/fedora/generic/CONFIG_BACKLIGHT_PWM2
-rw-r--r--configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_BATTERY_SBS (renamed from configs/fedora/generic/arm/armv7/CONFIG_BATTERY_SBS)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_CHARGER_BQ24735 (renamed from configs/fedora/generic/arm/armv7/CONFIG_CHARGER_BQ24735)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_AS37221
-rw-r--r--configs/fedora/generic/arm/CONFIG_PINCTRL_AS37221
-rw-r--r--configs/fedora/generic/arm/CONFIG_REGULATOR_AS3722 (renamed from configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AS3722)0
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_MFD_AS37221
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS37221
-rw-r--r--configs/fedora/generic/powerpc/CONFIG_BACKLIGHT_PWM1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM1
-rw-r--r--configs/fedora/generic/x86/i686/CONFIG_BACKLIGHT_PWM1
-rw-r--r--configs/fedora/generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM1
-rw-r--r--kernel-aarch64-debug.config8
-rw-r--r--kernel-aarch64.config8
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config4
-rw-r--r--kernel-armv7hl-lpae.config4
-rw-r--r--kernel-armv7hl.config4
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
21 files changed, 24 insertions, 23 deletions
diff --git a/configs/fedora/generic/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/CONFIG_BACKLIGHT_PWM
index e867170c2..44737e214 100644
--- a/configs/fedora/generic/CONFIG_BACKLIGHT_PWM
+++ b/configs/fedora/generic/CONFIG_BACKLIGHT_PWM
@@ -1 +1 @@
-# CONFIG_BACKLIGHT_PWM is not set
+CONFIG_BACKLIGHT_PWM=m
diff --git a/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/configs/fedora/generic/arm/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_SBS b/configs/fedora/generic/arm/CONFIG_BATTERY_SBS
index b364b07f0..b364b07f0 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_SBS
+++ b/configs/fedora/generic/arm/CONFIG_BATTERY_SBS
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_BQ24735 b/configs/fedora/generic/arm/CONFIG_CHARGER_BQ24735
index 658d71eb4..658d71eb4 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_BQ24735
+++ b/configs/fedora/generic/arm/CONFIG_CHARGER_BQ24735
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_AS3722 b/configs/fedora/generic/arm/CONFIG_MFD_AS3722
new file mode 100644
index 000000000..c2a67ccb7
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AS3722
@@ -0,0 +1 @@
+CONFIG_MFD_AS3722=m
diff --git a/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722 b/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722
new file mode 100644
index 000000000..399c5bf8e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PINCTRL_AS3722
@@ -0,0 +1 @@
+CONFIG_PINCTRL_AS3722=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AS3722 b/configs/fedora/generic/arm/CONFIG_REGULATOR_AS3722
index 8eececb2a..8eececb2a 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AS3722
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_AS3722
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AS3722 b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AS3722
deleted file mode 100644
index 6aa06bd4b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AS3722
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AS3722=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722 b/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722
deleted file mode 100644
index c620f49f9..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_AS3722
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_AS3722=y
diff --git a/configs/fedora/generic/powerpc/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/powerpc/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM
new file mode 100644
index 000000000..e867170c2
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_PWM
@@ -0,0 +1 @@
+# CONFIG_BACKLIGHT_PWM is not set
diff --git a/configs/fedora/generic/x86/i686/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/x86/i686/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/configs/fedora/generic/x86/i686/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/configs/fedora/generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM b/configs/fedora/generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM
deleted file mode 100644
index 44737e214..000000000
--- a/configs/fedora/generic/x86/i686PAE/CONFIG_BACKLIGHT_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BACKLIGHT_PWM=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 9cba92247..541333b09 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -528,7 +528,7 @@ CONFIG_BATTERY_AXP20X=m
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_MAX1721X is not set
-# CONFIG_BATTERY_SBS is not set
+CONFIG_BATTERY_SBS=m
CONFIG_BAYCOM_EPP=m
CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_SER_FDX=m
@@ -875,7 +875,7 @@ CONFIG_CHARGER_AXP20X=m
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
+CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_BQ25890 is not set
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
# CONFIG_CHARGER_GPIO is not set
@@ -3222,7 +3222,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4384,6 +4384,7 @@ CONFIG_PINCONF=y
CONFIG_PINCTRL_AMD=y
# CONFIG_PINCTRL_APQ8064 is not set
# CONFIG_PINCTRL_APQ8084 is not set
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
@@ -4704,6 +4705,7 @@ CONFIG_REGMAP=y
CONFIG_REGULATOR_ACT8865=m
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_AS3722=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9210 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 3538a4bd3..cb2b8fa92 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -528,7 +528,7 @@ CONFIG_BATTERY_AXP20X=m
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_MAX1721X is not set
-# CONFIG_BATTERY_SBS is not set
+CONFIG_BATTERY_SBS=m
CONFIG_BAYCOM_EPP=m
CONFIG_BAYCOM_PAR=m
CONFIG_BAYCOM_SER_FDX=m
@@ -875,7 +875,7 @@ CONFIG_CHARGER_AXP20X=m
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
+CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_BQ25890 is not set
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
# CONFIG_CHARGER_GPIO is not set
@@ -3201,7 +3201,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4362,6 +4362,7 @@ CONFIG_PINCONF=y
CONFIG_PINCTRL_AMD=y
# CONFIG_PINCTRL_APQ8064 is not set
# CONFIG_PINCTRL_APQ8084 is not set
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
@@ -4681,6 +4682,7 @@ CONFIG_REGMAP=y
CONFIG_REGULATOR_ACT8865=m
# CONFIG_REGULATOR_AD5398 is not set
# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_AS3722=m
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_BD9571MWV=m
# CONFIG_REGULATOR_DA9210 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 96152515d..1692b206f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3389,7 +3389,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=y
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4645,7 +4645,7 @@ CONFIG_PINCTRL_APQ8064=m
CONFIG_PINCTRL_APQ8084=m
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index eab58da03..60082bf18 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3240,7 +3240,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=y
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4413,7 +4413,7 @@ CONFIG_PINCONF=y
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7e21d6a62..1c44dcc1b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3219,7 +3219,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=y
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4391,7 +4391,7 @@ CONFIG_PINCONF=y
# CONFIG_PINCTRL_AMD is not set
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index d99f68ea5..1369b15ee 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3368,7 +3368,7 @@ CONFIG_MFD_AC100=m
# CONFIG_MFD_ARIZONA is not set
# CONFIG_MFD_ARIZONA_SPI is not set
# CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=y
+CONFIG_MFD_AS3722=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4623,7 +4623,7 @@ CONFIG_PINCTRL_APQ8064=m
CONFIG_PINCTRL_APQ8084=m
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AS3722=m
CONFIG_PINCTRL_AXP209=m
# CONFIG_PINCTRL_BAYTRAIL is not set
# CONFIG_PINCTRL_BROXTON is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 7150560c3..0147e251a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -411,7 +411,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_LP855X=m
# CONFIG_BACKLIGHT_LV5207LP is not set
# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_PWM is not set
+CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_SAHARA is not set
CONFIG_BACKLIGHT_WM831X=m
# CONFIG_BACKTRACE_SELF_TEST is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7ba5ef998..f875d10fe 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -408,7 +408,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_LP855X=m
# CONFIG_BACKLIGHT_LV5207LP is not set
# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_PWM is not set
+CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_SAHARA is not set
CONFIG_BACKLIGHT_WM831X=m
# CONFIG_BACKTRACE_SELF_TEST is not set