Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1421816/?format=api
{ "id": 1421816, "url": "http://patchwork.ozlabs.org/api/patches/1421816/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20210103092633.36226-2-jernej.skrabec@siol.net/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20210103092633.36226-2-jernej.skrabec@siol.net>", "list_archive_url": null, "date": "2021-01-03T09:26:17", "name": "[01/17] sunxi: Add support for AXP305 PMIC", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "06c62da3ef2c9fbc04834b97050858a236657392", "submitter": { "id": 70601, "url": "http://patchwork.ozlabs.org/api/people/70601/?format=api", "name": "Jernej Škrabec", "email": "jernej.skrabec@siol.net" }, "delegate": { "id": 114289, "url": "http://patchwork.ozlabs.org/api/users/114289/?format=api", "username": "apritzel", "first_name": "Andre", "last_name": "Przywara", "email": "andre.przywara@arm.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20210103092633.36226-2-jernej.skrabec@siol.net/mbox/", "series": [ { "id": 222511, "url": "http://patchwork.ozlabs.org/api/series/222511/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=222511", "date": "2021-01-03T09:26:16", "name": "sunxi: Introduce H616 support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/222511/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1421816/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1421816/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=siol.net", "phobos.denx.de;\n dmarc=fail (p=none dis=none) header.from=siol.net", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=siol.net", "phobos.denx.de;\n spf=pass smtp.mailfrom=jernej.skrabec@siol.net" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4D7th809Mnz9sVn\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 3 Jan 2021 20:27:19 +1100 (AEDT)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 0017E8241C;\n\tSun, 3 Jan 2021 10:26:57 +0100 (CET)", "by phobos.denx.de (Postfix, from userid 109)\n id 354428239D; Sun, 3 Jan 2021 10:26:55 +0100 (CET)", "from mail.siol.net (mailoutvs28.siol.net [185.57.226.219])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 34982801D8\n for <u-boot@lists.denx.de>; Sun, 3 Jan 2021 10:26:52 +0100 (CET)", "from localhost (localhost [127.0.0.1])\n by mail.siol.net (Zimbra) with ESMTP id D5EF3522A4B;\n Sun, 3 Jan 2021 10:26:51 +0100 (CET)", "from mail.siol.net ([127.0.0.1])\n by localhost (psrvmta12.zcs-production.pri [127.0.0.1]) (amavisd-new,\n port 10032)\n with ESMTP id axV2CvN6tEGA; Sun, 3 Jan 2021 10:26:51 +0100 (CET)", "from mail.siol.net (localhost [127.0.0.1])\n by mail.siol.net (Zimbra) with ESMTPS id 6396A522A3E;\n Sun, 3 Jan 2021 10:26:51 +0100 (CET)", "from localhost.localdomain (89-212-178-211.dynamic.t-2.net\n [89.212.178.211]) (Authenticated sender: 031275009)\n by mail.siol.net (Zimbra) with ESMTPSA id 2C1B8522A4B;\n Sun, 3 Jan 2021 10:26:49 +0100 (CET)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW,\n SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2", "From": "Jernej Skrabec <jernej.skrabec@siol.net>", "To": "jagan@amarulasolutions.com,\n\tandre.przywara@arm.com", "Cc": "hdegoede@redhat.com, jernej.skrabec@siol.net, lukma@denx.de, hs@denx.de,\n peng.fan@nxp.com, joe.hershberger@ni.com, jh80.chung@samsung.com,\n u-boot@lists.denx.de, linux-sunxi@googlegroups.com", "Subject": "[PATCH 01/17] sunxi: Add support for AXP305 PMIC", "Date": "Sun, 3 Jan 2021 10:26:17 +0100", "Message-Id": "<20210103092633.36226-2-jernej.skrabec@siol.net>", "X-Mailer": "git-send-email 2.30.0", "In-Reply-To": "<20210103092633.36226-1-jernej.skrabec@siol.net>", "References": "<20210103092633.36226-1-jernej.skrabec@siol.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "quoted-printable", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.102.3 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "This PMIC can be found on H616 boards and it's very similar to AXP805\nand AXP806.\n\nSigned-off-by: Jernej Skrabec <jernej.skrabec@siol.net>\n---\n arch/arm/mach-sunxi/pmic_bus.c | 6 +++\n board/sunxi/board.c | 10 +++--\n drivers/power/Kconfig | 13 +++++-\n drivers/power/Makefile | 1 +\n drivers/power/axp305.c | 80 ++++++++++++++++++++++++++++++++++\n include/axp305.h | 17 ++++++++\n include/axp_pmic.h | 3 ++\n 7 files changed, 126 insertions(+), 4 deletions(-)\n create mode 100644 drivers/power/axp305.c\n create mode 100644 include/axp305.h", "diff": "diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c\nindex dea42de833f1..0394ce856448 100644\n--- a/arch/arm/mach-sunxi/pmic_bus.c\n+++ b/arch/arm/mach-sunxi/pmic_bus.c\n@@ -18,6 +18,8 @@\n \n #define AXP209_I2C_ADDR\t\t\t0x34\n \n+#define AXP305_I2C_ADDR\t\t\t0x36\n+\n #define AXP221_CHIP_ADDR\t\t0x68\n #define AXP221_CTRL_ADDR\t\t0x3e\n #define AXP221_INIT_DATA\t\t0x3e\n@@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data)\n \treturn i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1);\n #elif defined CONFIG_AXP209_POWER\n \treturn i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1);\n+#elif defined CONFIG_AXP305_POWER\n+\treturn i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1);\n #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER\n # ifdef CONFIG_MACH_SUN6I\n \treturn p2wi_read(reg, data);\n@@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data)\n \treturn i2c_write(AXP152_I2C_ADDR, reg, 1, &data, 1);\n #elif defined CONFIG_AXP209_POWER\n \treturn i2c_write(AXP209_I2C_ADDR, reg, 1, &data, 1);\n+#elif defined CONFIG_AXP305_POWER\n+\treturn i2c_write(AXP305_I2C_ADDR, reg, 1, &data, 1);\n #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER\n # ifdef CONFIG_MACH_SUN6I\n \treturn p2wi_write(reg, data);\ndiff --git a/board/sunxi/board.c b/board/sunxi/board.c\nindex 708a27ed78e9..54ff9bc92396 100644\n--- a/board/sunxi/board.c\n+++ b/board/sunxi/board.c\n@@ -634,16 +634,18 @@ void sunxi_board_init(void)\n #endif\n \n #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \\\n-\tdefined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \\\n-\tdefined CONFIG_AXP818_POWER\n+\tdefined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \\\n+\tdefined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER\n \tpower_failed = axp_init();\n \n #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \\\n \tdefined CONFIG_AXP818_POWER\n \tpower_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT);\n #endif\n+#if !defined(CONFIG_AXP305_POWER)\n \tpower_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT);\n \tpower_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT);\n+#endif\n #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER)\n \tpower_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT);\n #endif\n@@ -656,8 +658,10 @@ void sunxi_board_init(void)\n \tdefined CONFIG_AXP818_POWER\n \tpower_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT);\n #endif\n+#if !defined(CONFIG_AXP305_POWER)\n \tpower_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT);\n-#if !defined(CONFIG_AXP152_POWER)\n+#endif\n+#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER)\n \tpower_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT);\n #endif\n #ifdef CONFIG_AXP209_POWER\ndiff --git a/drivers/power/Kconfig b/drivers/power/Kconfig\nindex 02050f6f3569..d17cf2d9112a 100644\n--- a/drivers/power/Kconfig\n+++ b/drivers/power/Kconfig\n@@ -48,6 +48,15 @@ config AXP221_POWER\n \tSelect this to enable support for the axp221/axp223 pmic found on most\n \tA23 and A31 boards.\n \n+config AXP305_POWER\n+\tbool \"axp305 pmic support\"\n+\tdepends on MACH_SUN50I_H616\n+\tselect AXP_PMIC_BUS\n+\tselect CMD_POWEROFF\n+\t---help---\n+\tSelect this to enable support for the axp305 pmic found on most\n+\tH616 boards.\n+\n config AXP809_POWER\n \tbool \"axp809 pmic support\"\n \tdepends on MACH_SUN9I\n@@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT\n \n config AXP_DCDC4_VOLT\n \tint \"axp pmic dcdc4 voltage\"\n-\tdepends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER\n+\tdepends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER\n \tdefault 1250 if AXP152_POWER\n \tdefault 1200 if MACH_SUN6I\n \tdefault 0 if MACH_SUN8I\n \tdefault 900 if MACH_SUN9I\n+\tdefault 1500 if AXP305_POWER\n \t---help---\n \tSet the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to\n \tdisable dcdc4.\n@@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT\n \tOn A23 / A33 boards dcdc4 is unused and should be disabled.\n \tOn A80 boards dcdc4 powers VDD-SYS, HDMI, USB OTG and should be 0.9V.\n \tOn A83T boards dcdc4 is used for VDD-GPU.\n+\tOn H616 boards dcdcd is used for VCC-DRAM.\n \n config AXP_DCDC5_VOLT\n \tint \"axp pmic dcdc5 voltage\"\ndiff --git a/drivers/power/Makefile b/drivers/power/Makefile\nindex 2dcc7bb99d02..0bef06920a7d 100644\n--- a/drivers/power/Makefile\n+++ b/drivers/power/Makefile\n@@ -6,6 +6,7 @@\n obj-$(CONFIG_AXP152_POWER)\t+= axp152.o\n obj-$(CONFIG_AXP209_POWER)\t+= axp209.o\n obj-$(CONFIG_AXP221_POWER)\t+= axp221.o\n+obj-$(CONFIG_AXP305_POWER)\t+= axp305.o\n obj-$(CONFIG_AXP809_POWER)\t+= axp809.o\n obj-$(CONFIG_AXP818_POWER)\t+= axp818.o\n obj-$(CONFIG_EXYNOS_TMU)\t+= exynos-tmu.o\ndiff --git a/drivers/power/axp305.c b/drivers/power/axp305.c\nnew file mode 100644\nindex 000000000000..f620798bb1d7\n--- /dev/null\n+++ b/drivers/power/axp305.c\n@@ -0,0 +1,80 @@\n+// SPDX-License-Identifier: GPL-2.0+\n+/*\n+ * AXP305 driver\n+ *\n+ * (C) Copyright 2020 Jernej Skrabec <jernej.skrabec@siol.net>\n+ *\n+ * Based on axp221.c\n+ * (C) Copyright 2014 Hans de Goede <hdegoede@redhat.com>\n+ * (C) Copyright 2013 Oliver Schinagl <oliver@schinagl.nl>\n+ */\n+\n+#include <common.h>\n+#include <command.h>\n+#include <errno.h>\n+#include <asm/arch/pmic_bus.h>\n+#include <axp_pmic.h>\n+\n+static u8 axp305_mvolt_to_cfg(int mvolt, int min, int max, int div)\n+{\n+\tif (mvolt < min)\n+\t\tmvolt = min;\n+\telse if (mvolt > max)\n+\t\tmvolt = max;\n+\n+\treturn (mvolt - min) / div;\n+}\n+\n+int axp_set_dcdc4(unsigned int mvolt)\n+{\n+\tint ret;\n+\tu8 cfg;\n+\n+\tif (mvolt >= 1600)\n+\t\tcfg = 46 + axp305_mvolt_to_cfg(mvolt, 1600, 3300, 100);\n+\telse\n+\t\tcfg = axp305_mvolt_to_cfg(mvolt, 600, 1500, 20);\n+\n+\tif (mvolt == 0)\n+\t\treturn pmic_bus_clrbits(AXP305_OUTPUT_CTRL1,\n+\t\t\t\t\tAXP305_OUTPUT_CTRL1_DCDCD_EN);\n+\n+\tret = pmic_bus_write(AXP305_DCDCD_VOLTAGE, cfg);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn pmic_bus_setbits(AXP305_OUTPUT_CTRL1,\n+\t\t\t\tAXP305_OUTPUT_CTRL1_DCDCD_EN);\n+}\n+\n+int axp_init(void)\n+{\n+\tu8 axp_chip_id;\n+\tint ret;\n+\n+\tret = pmic_bus_init();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tret = pmic_bus_read(AXP305_CHIP_VERSION, &axp_chip_id);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif ((axp_chip_id & AXP305_CHIP_VERSION_MASK) != 0x40)\n+\t\treturn -ENODEV;\n+\n+\treturn ret;\n+}\n+\n+#ifndef CONFIG_PSCI_RESET\n+int do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])\n+{\n+\tpmic_bus_write(AXP305_SHUTDOWN, AXP305_POWEROFF);\n+\n+\t/* infinite loop during shutdown */\n+\twhile (1) {}\n+\n+\t/* not reached */\n+\treturn 0;\n+}\n+#endif\ndiff --git a/include/axp305.h b/include/axp305.h\nnew file mode 100644\nindex 000000000000..225c5040a322\n--- /dev/null\n+++ b/include/axp305.h\n@@ -0,0 +1,17 @@\n+/* SPDX-License-Identifier: GPL-2.0+ */\n+/*\n+ * (C) Copyright 2020 Jernej Skrabec <jernej.skrabec@siol.net>\n+ */\n+\n+enum axp305_reg {\n+\tAXP305_CHIP_VERSION = 0x3,\n+\tAXP305_OUTPUT_CTRL1 = 0x10,\n+\tAXP305_DCDCD_VOLTAGE = 0x15,\n+\tAXP305_SHUTDOWN = 0x32,\n+};\n+\n+#define AXP305_CHIP_VERSION_MASK\t0xcf\n+\n+#define AXP305_OUTPUT_CTRL1_DCDCD_EN\t(1 << 3)\n+\n+#define AXP305_POWEROFF\t\t\t(1 << 7)\ndiff --git a/include/axp_pmic.h b/include/axp_pmic.h\nindex 10091d0bb278..405044c3a32f 100644\n--- a/include/axp_pmic.h\n+++ b/include/axp_pmic.h\n@@ -15,6 +15,9 @@\n #ifdef CONFIG_AXP221_POWER\n #include <axp221.h>\n #endif\n+#ifdef CONFIG_AXP305_POWER\n+#include <axp305.h>\n+#endif\n #ifdef CONFIG_AXP809_POWER\n #include <axp809.h>\n #endif\n", "prefixes": [ "01/17" ] }