diff options
| author | John Stultz <john.stultz@linaro.org> | 2016-12-07 15:12:09 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-12-07 15:12:09 -0800 |
| commit | 7cb061c920aae5e7ee7cffdd9de6904890c395dd (patch) | |
| tree | c16d93de35a0286e44522d1fbc0bce8707828998 | |
| parent | a033ddb0524eb70c2ae5d97ffbff7ecf6e178c14 (diff) | |
Revert "HACK: misc: hi3660-sysconfig: adv7533 regulator power-up"dev/hi3660-4.4-aosp-take2
This reverts commit 3264a2cd419e24127682dfb4a494aa5fae81fc92.
This breaks HiKey.
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/misc/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 1 | ||||
| -rw-r--r-- | drivers/misc/hi3660-sysconfig.c | 38 |
3 files changed, 0 insertions, 46 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 4c345769fbdb..1154e1fefe4a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -545,13 +545,6 @@ config MEMORY_STATE_TIME help Memory time statistics exported to /sys/kernel/memory_state_time -config HI3660_SYSCFG - bool "Hisilicon HI3660 System Configuration driver" - default y - help - Hisilicon HI3660 uses some registers to configure some chip hosts to - work or not, e.g. disable the UART hosts reset and let's them work. - source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 70b05670a482..f5c436618898 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -59,4 +59,3 @@ obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o obj-$(CONFIG_CXL_BASE) += cxl/ obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o obj-$(CONFIG_MEMORY_STATE_TIME) += memory_state_time.o -obj-$(CONFIG_HI3660_SYSCFG) += hi3660-sysconfig.o diff --git a/drivers/misc/hi3660-sysconfig.c b/drivers/misc/hi3660-sysconfig.c deleted file mode 100644 index 0f13a04ee7e8..000000000000 --- a/drivers/misc/hi3660-sysconfig.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * HACK: For Hisilicon Hi3660 SoC, do ugly init things here - * - * Copyright (C) 2015 Hisilicon Ltd. - * Author: Bintian Wang <bintian.wang@huawei.com> - * - */ - -#include <linux/io.h> -#include <linux/ioport.h> -#include <linux/printk.h> - -static void set_adv7533_pmic_reg(void) -{ - unsigned char data = 0; - void __iomem *iomem = ioremap(0xfff34000, 0x1000); - - data = readb(iomem + (0x60 << 2)) | (1 << 1); - writeb(data, iomem + (0x60 << 2)); - data = (readb(iomem + (0x61 << 2)) & ~(0xF)) | 2; - writeb(data, iomem + (0x61 << 2)); - - data = readb(iomem + (0x5C << 2)) | (1 << 1); - writeb(data, iomem + (0x5C << 2)); - data = (readb(iomem + (0x5D << 2)) & ~(0xF)) | 9; - writeb(data, iomem + (0x5D << 2)); - iounmap(iomem); -} - -static int __init hi3660_sysconf(void) -{ - static void __iomem *base = NULL; - - set_adv7533_pmic_reg(); - - return 0; -} -postcore_initcall(hi3660_sysconf); |