From owner-svn-src-head@freebsd.org Sat Dec 1 20:31:07 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F40981326B09; Sat, 1 Dec 2018 20:31:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6505E72F0A; Sat, 1 Dec 2018 20:31:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 453BE1CC04; Sat, 1 Dec 2018 20:31:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB1KV6wL060254; Sat, 1 Dec 2018 20:31:06 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB1KV5OC060252; Sat, 1 Dec 2018 20:31:05 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201812012031.wB1KV5OC060252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Sat, 1 Dec 2018 20:31:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341385 - head/sys/arm64/rockchip X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm64/rockchip X-SVN-Commit-Revision: 341385 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6505E72F0A X-Spamd-Result: default: False [0.71 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.22)[0.222,0]; NEURAL_SPAM_MEDIUM(0.15)[0.151,0]; NEURAL_SPAM_LONG(0.34)[0.335,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2018 20:31:07 -0000 Author: manu Date: Sat Dec 1 20:31:05 2018 New Revision: 341385 URL: https://svnweb.freebsd.org/changeset/base/341385 Log: arm64: rockchip: rk805: Add basic support for RK808 PMIC RK808 PMIC is the companion chip for RK3399 SoC. Add basic regulator support in RK805 since they are similar. MFC after: 1 month Modified: head/sys/arm64/rockchip/rk805.c head/sys/arm64/rockchip/rk805reg.h Modified: head/sys/arm64/rockchip/rk805.c ============================================================================== --- head/sys/arm64/rockchip/rk805.c Sat Dec 1 20:30:18 2018 (r341384) +++ head/sys/arm64/rockchip/rk805.c Sat Dec 1 20:31:05 2018 (r341385) @@ -51,8 +51,14 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_RK805_REG, "RK805 regulator", "RK805 power regulator"); +enum rk_pmic_type { + RK805 = 1, + RK808, +}; + static struct ofw_compat_data compat_data[] = { - {"rockchip,rk805", 1}, + {"rockchip,rk805", RK805}, + {"rockchip,rk808", RK808}, {NULL, 0} }; @@ -83,6 +89,7 @@ struct rk805_softc { struct resource * res[1]; void * intrcookie; struct intr_config_hook intr_hook; + enum rk_pmic_type type; struct rk805_reg_sc **regs; int nregs; @@ -133,6 +140,51 @@ static struct rk805_regdef rk805_regdefs[] = { }, }; +static struct rk805_regdef rk808_regdefs[] = { + { + .id = RK805_DCDC1, + .name = "DCDC_REG1", + .enable_reg = RK805_DCDC_EN, + .enable_mask = 0x1, + .voltage_reg = RK805_DCDC1_ON_VSEL, + .voltage_mask = 0x3F, + .voltage_min = 712500, + .voltage_max = 1500000, + .voltage_step = 12500, + .voltage_nstep = 64, + }, + { + .id = RK805_DCDC2, + .name = "DCDC_REG2", + .enable_reg = RK805_DCDC_EN, + .enable_mask = 0x2, + .voltage_reg = RK805_DCDC2_ON_VSEL, + .voltage_mask = 0x3F, + .voltage_min = 712500, + .voltage_max = 1500000, + .voltage_step = 12500, + .voltage_nstep = 64, + }, + { + .id = RK805_DCDC3, + .name = "DCDC_REG3", + .enable_reg = RK805_DCDC_EN, + .enable_mask = 0x4, + }, + { + .id = RK805_DCDC4, + .name = "DCDC_REG4", + .enable_reg = RK805_DCDC_EN, + .enable_mask = 0x8, + .voltage_reg = RK805_DCDC4_ON_VSEL, + .voltage_mask = 0xF, + .voltage_min = 1800000, + .voltage_max = 3300000, + .voltage_step = 100000, + .voltage_nstep = 16, + }, +}; + static int rk805_read(device_t dev, uint8_t reg, uint8_t *data, uint8_t size) { @@ -226,11 +278,17 @@ rk805_regnode_set_voltage(struct regnode *regnode, int if (!sc->def->voltage_step) return (ENXIO); + rk805_read(sc->base_dev, sc->def->voltage_reg, &val, 1); + printf("rk805_set_voltage: Current value for %x: %x\n", sc->def->voltage_reg, val); if (rk805_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0) return (ERANGE); + printf("rk805_set_voltage: Setting %x to %x\n", sc->def->voltage_reg, val); rk805_write(sc->base_dev, sc->def->voltage_reg, val); + rk805_read(sc->base_dev, sc->def->voltage_reg, &val, 1); + printf("rk805_set_voltage: Set value for %x: %x\n", sc->def->voltage_reg, val); + *udelay = 0; return (0); @@ -326,13 +384,14 @@ rk805_start(void *pdev) sc = device_get_softc(dev); sc->dev = dev; - if (bootverbose) { - err = rk805_read(dev, 0x17, data, 1); + /* No version register in RK808 */ + if (bootverbose && sc->type == RK805) { + err = rk805_read(dev, RK805_CHIP_NAME, data, 1); if (err != 0) { device_printf(dev, "Cannot read chip name reg\n"); return; } - err = rk805_read(dev, 0x18, data + 1, 1); + err = rk805_read(dev, RK805_CHIP_VER, data + 1, 1); if (err != 0) { device_printf(dev, "Cannot read chip version reg\n"); return; @@ -365,8 +424,17 @@ rk805_attach(device_t dev) sc->regs = malloc(sizeof(struct rk805_reg_sc *) * sc->nregs, M_RK805_REG, M_WAITOK | M_ZERO); - regdefs = rk805_regdefs; - sc->nregs = nitems(rk805_regdefs); + sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + switch (sc->type) { + case RK805: + regdefs = rk805_regdefs; + sc->nregs = nitems(rk805_regdefs); + break; + case RK808: + regdefs = rk808_regdefs; + sc->nregs = nitems(rk808_regdefs); + break; + } rnode = ofw_bus_find_child(ofw_bus_get_node(dev), "regulators"); if (rnode > 0) { Modified: head/sys/arm64/rockchip/rk805reg.h ============================================================================== --- head/sys/arm64/rockchip/rk805reg.h Sat Dec 1 20:30:18 2018 (r341384) +++ head/sys/arm64/rockchip/rk805reg.h Sat Dec 1 20:31:05 2018 (r341385) @@ -37,6 +37,7 @@ #define RK805_OTP_VER 0x19 #define RK805_DCDC_EN 0x23 +#define RK808_LDO_EN 0x24 #define RK805_SLEEP_DCDC_EN 0x25 #define RK805_SLEEP_LDO_EN 0x26 #define RK805_LDO_EN 0x27 @@ -67,6 +68,23 @@ enum rk805_regulator { RK805_LDO1, RK805_LDO2, RK805_LDO3, +}; + +enum rk808_regulator { + RK808_DCDC1, + RK808_DCDC2, + RK808_DCDC3, + RK808_DCDC4, + RK808_LDO1, + RK808_LDO2, + RK808_LDO3, + RK808_LDO4, + RK808_LDO5, + RK808_LDO6, + RK808_LDO7, + RK808_LDO8, + RK808_SWITCH1, + RK808_SWITCH2, }; #endif /* _RK805REG_H_ */