Merge remote-tracking branch 'docularxu/working-hikey-tracking-misc-sysconfig-v4.4' into lts-4.4.y-hikey

3 files changed, 81 insertions, 0 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 4bf7d50b1bc7..c4bbd7280e9d 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -466,6 +466,14 @@ config BMP085_SPI
 	  To compile this driver as a module, choose M here: the
 	  module will be called bmp085-spi.
 
+config HI6220_SYSCFG
+	bool "Hisilicon HI6220 System Configuration driver"
+	depends on ARCH_HISI
+	default y
+	help
+	  Hisilicon HI6220 uses some registers to configure some chip hosts to
+          work or not, e.g. disable the UART hosts reset and let's them work.
+
 config PCH_PHUB
 	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"
 	select GENERIC_NET_UTILS
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 537d7f3b78da..b84697a9010b 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
 obj-$(CONFIG_BMP085)		+= bmp085.o
 obj-$(CONFIG_BMP085_I2C)	+= bmp085-i2c.o
 obj-$(CONFIG_BMP085_SPI)	+= bmp085-spi.o
+obj-$(CONFIG_HI6220_SYSCFG)     += hi6220-sysconfig.o
 obj-$(CONFIG_DUMMY_IRQ)		+= dummy-irq.o
 obj-$(CONFIG_ICS932S401)	+= ics932s401.o
 obj-$(CONFIG_LKDTM)		+= lkdtm.o
diff --git a/drivers/misc/hi6220-sysconfig.c b/drivers/misc/hi6220-sysconfig.c
new file mode 100644
index 000000000000..9b9d5d8bff19
--- /dev/null
+++ b/drivers/misc/hi6220-sysconfig.c
@@ -0,0 +1,72 @@
+/*
+ * For Hisilicon Hi6220 SoC, the reset of some hosts (e.g. UART) should be disabled
+ * before using them, this driver will handle the host chip reset disable.
+ *
+ * Copyright (C) 2015 Hisilicon Ltd.
+ * Author: Bintian Wang <bintian.wang@huawei.com>
+ *
+ */
+
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+
+#define reset_offset 0x334
+#define pclk_offset 0x230
+#define PMUSSI_REG_EX(pmu_base, reg_addr) (((reg_addr) << 2) + (char *)pmu_base)
+
+static int __init hi6220_sysconf(void)
+{
+        static void __iomem *base = NULL;
+        struct device_node *node;
+        static void __iomem *base1 = NULL;
+        struct device_node *node1;
+	unsigned char ret;
+
+        node = of_find_compatible_node(NULL, NULL, "hisilicon,hi6220-sysctrl");
+        if (!node)
+                return -ENOENT;
+
+        base = of_iomap(node, 0);
+        if (base == NULL) {
+                printk(KERN_ERR "hi6220: sysctrl reg iomap failed!\n");
+                return -ENOMEM;
+        }
+
+        /*Disable UART1 reset and set pclk*/
+        writel(BIT(5), base + reset_offset);
+        writel(BIT(5), base + pclk_offset);
+
+        /*Disable UART2 reset and set pclk*/
+        writel(BIT(6), base + reset_offset);
+        writel(BIT(6), base + pclk_offset);
+
+        /*Disable UART3 reset and set pclk*/
+        writel(BIT(7), base + reset_offset);
+        writel(BIT(7), base + pclk_offset);
+
+        /*Disable UART4 reset and set pclk*/
+        writel(BIT(8), base + reset_offset);
+        writel(BIT(8), base + pclk_offset);
+
+        iounmap(base);
+
+        node1 = of_find_compatible_node(NULL, NULL, "hisilicon,hi655x-pmic");
+        if (!node1)
+                return -ENOENT;
+
+        base1 = of_iomap(node1, 0);
+        if (base1 == NULL) {
+                printk(KERN_ERR "hi6220: pmic reg iomap failed!\n");
+                return -ENOMEM;
+        }
+
+	/*enable clk for BT/WIFI*/
+	ret = *(volatile unsigned char*)PMUSSI_REG_EX(base1, 0x1c);
+	ret |= 0x40;
+	*(volatile unsigned char*)PMUSSI_REG_EX(base1, 0x1c) = ret;
+
+        iounmap(base1);
+        return 0;
+}
+postcore_initcall(hi6220_sysconf);