summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-06-09 18:08:09 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-06-09 18:08:09 +0100
commit09ee9a8e2ad023a6641631df96198010dd0a445a (patch)
treee3ae20c4bd874a3acd9a561e4fc700d695f29cbc
parentc98f6679400ad5015d0e0ba46597e8ff34ce8b2d (diff)
downloadkernel-09ee9a8e2ad023a6641631df96198010dd0a445a.tar.gz
kernel-09ee9a8e2ad023a6641631df96198010dd0a445a.tar.xz
kernel-09ee9a8e2ad023a6641631df96198010dd0a445a.zip
minor ARM cleanup
-rw-r--r--baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP1
-rw-r--r--baseconfig/arm/armv7/CONFIG_REGULATOR_ACT88651
-rw-r--r--baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP1
-rw-r--r--kernel-aarch64-debug.config1
-rw-r--r--kernel-aarch64.config1
-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
9 files changed, 11 insertions, 10 deletions
diff --git a/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP
new file mode 100644
index 000000000..86d2137bd
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP
@@ -0,0 +1 @@
+CONFIG_ROCKCHIP_CDN_DP=y
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 b/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865
deleted file mode 100644
index f1e82abd5..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_ACT8865 is not set
diff --git a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP
deleted file mode 100644
index 98a696d76..000000000
--- a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ROCKCHIP_CDN_DP is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4ea1aa200..c28ec4aeb 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4331,6 +4331,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c0808b8cc..9ed873353 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4309,6 +4309,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index a765d4402..edfd318bd 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4579,7 +4579,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PM800 is not set
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_AD5398=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_AS3722=m
@@ -4677,7 +4677,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 9f1613c8c..564bb8fa4 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4312,7 +4312,7 @@ CONFIG_REGMAP_IRQ=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_SPI=y
CONFIG_REGMAP=y
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_AD5398=m
# CONFIG_REGULATOR_ANATOP is not set
CONFIG_REGULATOR_AS3722=m
@@ -4397,7 +4397,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 95f9b8ca1..408e69f2f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4290,7 +4290,7 @@ CONFIG_REGMAP_IRQ=y
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_SPI=y
CONFIG_REGMAP=y
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_AD5398=m
# CONFIG_REGULATOR_ANATOP is not set
CONFIG_REGULATOR_AS3722=m
@@ -4375,7 +4375,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6e59acefb..07070ee8f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4557,7 +4557,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_REGMAP_SPMI=m
CONFIG_REGMAP=y
# CONFIG_REGULATOR_88PM800 is not set
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
CONFIG_REGULATOR_AD5398=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_AS3722=m
@@ -4655,7 +4655,7 @@ CONFIG_RMI4_I2C=m
CONFIG_RMI4_SMB=m
CONFIG_RMI4_SPI=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
CONFIG_ROCKCHIP_EFUSE=m