From e0a0cbf2472feb840a8b820838272c1204d51584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Majewski?= Date: Tue, 13 Nov 2012 03:21:59 +0000 Subject: pmic: Move pmic related code to ./drivers/power directory The PMIC framework has been moved to its more natural place ./drivers/power from ./drivers/misc directory. Signed-off-by: Lukasz Majewski Signed-off-by: Kyungmin Park --- drivers/misc/Makefile | 7 -- drivers/misc/pmic_core.c | 207 -------------------------------------------- drivers/misc/pmic_dialog.c | 43 --------- drivers/misc/pmic_fsl.c | 69 --------------- drivers/misc/pmic_i2c.c | 125 -------------------------- drivers/misc/pmic_max8997.c | 50 ----------- drivers/misc/pmic_max8998.c | 49 ----------- drivers/misc/pmic_spi.c | 108 ----------------------- 8 files changed, 658 deletions(-) delete mode 100644 drivers/misc/pmic_core.c delete mode 100644 drivers/misc/pmic_dialog.c delete mode 100644 drivers/misc/pmic_fsl.c delete mode 100644 drivers/misc/pmic_i2c.c delete mode 100644 drivers/misc/pmic_max8997.c delete mode 100644 drivers/misc/pmic_max8998.c delete mode 100644 drivers/misc/pmic_spi.c (limited to 'drivers/misc') diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 271463c..cdec88b 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o COBJS-$(CONFIG_PDSP188x) += pdsp188x.o COBJS-$(CONFIG_STATUS_LED) += status_led.o COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o -COBJS-$(CONFIG_PMIC) += pmic_core.o -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/misc/pmic_core.c b/drivers/misc/pmic_core.c deleted file mode 100644 index 4066b15..0000000 --- a/drivers/misc/pmic_core.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * (C) Copyright 2010 - * Stefano Babic, DENX Software Engineering, sbabic@denx.de - * - * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include - -static LIST_HEAD(pmic_list); - -int check_reg(struct pmic *p, u32 reg) -{ - if (reg >= p->number_of_regs) { - printf(" = %d is invalid. Should be less than %d\n", - reg, p->number_of_regs); - return -1; - } - - return 0; -} - -int pmic_set_output(struct pmic *p, u32 reg, int out, int on) -{ - u32 val; - - if (pmic_reg_read(p, reg, &val)) - return -1; - - if (on) - val |= out; - else - val &= ~out; - - if (pmic_reg_write(p, reg, val)) - return -1; - - return 0; -} - -static void pmic_show_info(struct pmic *p) -{ - printf("PMIC: %s\n", p->name); -} - -static int pmic_dump(struct pmic *p) -{ - int i, ret; - u32 val; - - if (!p) { - puts("Wrong PMIC name!\n"); - return -1; - } - - pmic_show_info(p); - for (i = 0; i < p->number_of_regs; i++) { - ret = pmic_reg_read(p, i, &val); - if (ret) - puts("PMIC: Registers dump failed\n"); - - if (!(i % 8)) - printf("\n0x%02x: ", i); - - printf("%08x ", val); - } - puts("\n"); - return 0; -} - -struct pmic *pmic_alloc(void) -{ - struct pmic *p; - - p = calloc(sizeof(*p), 1); - if (!p) { - printf("%s: No available memory for allocation!\n", __func__); - return NULL; - } - - list_add_tail(&p->list, &pmic_list); - - debug("%s: new pmic struct: 0x%p\n", __func__, p); - - return p; -} - -struct pmic *pmic_get(const char *s) -{ - struct pmic *p; - - list_for_each_entry(p, &pmic_list, list) { - if (strcmp(p->name, s) == 0) { - debug("%s: pmic %s -> 0x%p\n", __func__, p->name, p); - return p; - } - } - - return NULL; -} - -static void pmic_list_names(void) -{ - struct pmic *p; - - puts("PMIC devices:\n"); - list_for_each_entry(p, &pmic_list, list) { - printf("name: %s\n", p->name); - } -} - -int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - u32 ret, reg, val; - struct pmic *p; - char *cmd; - - /* at least two arguments please */ - if (argc < 2) - return CMD_RET_USAGE; - - cmd = argv[1]; - - if (strcmp(cmd, "list") == 0) { - pmic_list_names(); - return CMD_RET_SUCCESS; - } - - if (strcmp(cmd, "dump") == 0) { - p = pmic_get(argv[2]); - if (!p) - return CMD_RET_FAILURE; - if (pmic_dump(p)) - return CMD_RET_FAILURE; - return CMD_RET_SUCCESS; - } - - if (strcmp(cmd, "read") == 0) { - if (argc < 4) - return CMD_RET_USAGE; - - reg = simple_strtoul(argv[3], NULL, 16); - p = pmic_get(argv[2]); - if (!p) - return CMD_RET_FAILURE; - - ret = pmic_reg_read(p, reg, &val); - - if (ret) - puts("PMIC: Register read failed\n"); - - printf("\n0x%02x: 0x%08x\n", reg, val); - - return CMD_RET_SUCCESS; - } - - if (strcmp(cmd, "write") == 0) { - if (argc < 5) - return CMD_RET_USAGE; - - reg = simple_strtoul(argv[3], NULL, 16); - val = simple_strtoul(argv[4], NULL, 16); - p = pmic_get(argv[2]); - if (!p) - return CMD_RET_FAILURE; - pmic_reg_write(p, reg, val); - - return CMD_RET_SUCCESS; - } - - /* No subcommand found */ - return CMD_RET_SUCCESS; -} - -U_BOOT_CMD( - pmic, CONFIG_SYS_MAXARGS, 1, do_pmic, - "PMIC", - "list - list available PMICs\n" - "pmic dump name - dump named PMIC registers\n" - "pmic name read - read register\n" - "pmic name write - write register" -); diff --git a/drivers/misc/pmic_dialog.c b/drivers/misc/pmic_dialog.c deleted file mode 100644 index d7ebd15..0000000 --- a/drivers/misc/pmic_dialog.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -int pmic_dialog_init(unsigned char bus) -{ - static const char name[] = "DIALOG_PMIC"; - struct pmic *p = pmic_alloc(); - - if (!p) { - printf("%s: POWER allocation error!\n", __func__); - return -ENOMEM; - } - - p->name = name; - p->number_of_regs = DIALOG_NUM_OF_REGS; - - p->interface = PMIC_I2C; - p->hw.i2c.addr = CONFIG_SYS_DIALOG_PMIC_I2C_ADDR; - p->hw.i2c.tx_num = 1; - p->bus = bus; - - return 0; -} diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c deleted file mode 100644 index 0275fd9..0000000 --- a/drivers/misc/pmic_fsl.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include - -#if defined(CONFIG_PMIC_SPI) -static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write) -{ - return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF); -} -#endif - -int pmic_init(unsigned char bus) -{ - static const char name[] = "FSL_PMIC"; - struct pmic *p = pmic_alloc(); - - if (!p) { - printf("%s: POWER allocation error!\n", __func__); - return -ENOMEM; - } - - p->name = name; - p->number_of_regs = PMIC_NUM_OF_REGS; - -#if defined(CONFIG_PMIC_SPI) - p->interface = PMIC_SPI; - p->bus = CONFIG_FSL_PMIC_BUS; - p->hw.spi.cs = CONFIG_FSL_PMIC_CS; - p->hw.spi.clk = CONFIG_FSL_PMIC_CLK; - p->hw.spi.mode = CONFIG_FSL_PMIC_MODE; - p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN; - p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END; - p->hw.spi.prepare_tx = pmic_spi_prepare_tx; -#elif defined(CONFIG_PMIC_I2C) - p->interface = PMIC_I2C; - p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR; - p->hw.i2c.tx_num = 3; - p->bus = bus; -#else -#error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C" -#endif - - return 0; -} diff --git a/drivers/misc/pmic_i2c.c b/drivers/misc/pmic_i2c.c deleted file mode 100644 index 3e5a784..0000000 --- a/drivers/misc/pmic_i2c.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * (C) Copyright 2010 - * Stefano Babic, DENX Software Engineering, sbabic@denx.de - * - * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include - -int pmic_reg_write(struct pmic *p, u32 reg, u32 val) -{ - unsigned char buf[4] = { 0 }; - - if (check_reg(p, reg)) - return -1; - - switch (pmic_i2c_tx_num) { - case 3: - if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) { - buf[2] = (cpu_to_le32(val) >> 16) & 0xff; - buf[1] = (cpu_to_le32(val) >> 8) & 0xff; - buf[0] = cpu_to_le32(val) & 0xff; - } else { - buf[0] = (cpu_to_le32(val) >> 16) & 0xff; - buf[1] = (cpu_to_le32(val) >> 8) & 0xff; - buf[2] = cpu_to_le32(val) & 0xff; - } - break; - case 2: - if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) { - buf[1] = (cpu_to_le32(val) >> 8) & 0xff; - buf[0] = cpu_to_le32(val) & 0xff; - } else { - buf[0] = (cpu_to_le32(val) >> 8) & 0xff; - buf[1] = cpu_to_le32(val) & 0xff; - } - break; - case 1: - buf[0] = cpu_to_le32(val) & 0xff; - break; - default: - printf("%s: invalid tx_num: %d", __func__, pmic_i2c_tx_num); - return -1; - } - - if (i2c_write(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num)) - return -1; - - return 0; -} - -int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) -{ - unsigned char buf[4] = { 0 }; - u32 ret_val = 0; - - if (check_reg(p, reg)) - return -1; - - if (i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num)) - return -1; - - switch (pmic_i2c_tx_num) { - case 3: - if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) - ret_val = le32_to_cpu(buf[2] << 16 - | buf[1] << 8 | buf[0]); - else - ret_val = le32_to_cpu(buf[0] << 16 | - buf[1] << 8 | buf[2]); - break; - case 2: - if (p->sensor_byte_order == PMIC_SENSOR_BYTE_ORDER_BIG) - ret_val = le32_to_cpu(buf[1] << 8 | buf[0]); - else - ret_val = le32_to_cpu(buf[0] << 8 | buf[1]); - break; - case 1: - ret_val = le32_to_cpu(buf[0]); - break; - default: - printf("%s: invalid tx_num: %d", __func__, pmic_i2c_tx_num); - return -1; - } - memcpy(val, &ret_val, sizeof(ret_val)); - - return 0; -} - -int pmic_probe(struct pmic *p) -{ - I2C_SET_BUS(p->bus); - debug("Bus: %d PMIC:%s probed!\n", p->bus, p->name); - if (i2c_probe(pmic_i2c_addr)) { - printf("Can't find PMIC:%s\n", p->name); - return -1; - } - - return 0; -} diff --git a/drivers/misc/pmic_max8997.c b/drivers/misc/pmic_max8997.c deleted file mode 100644 index 7fe1b53..0000000 --- a/drivers/misc/pmic_max8997.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2012 Samsung Electronics - * Lukasz Majewski - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include -#include - -int pmic_init(unsigned char bus) -{ - static const char name[] = "MAX8997_PMIC"; - struct pmic *p = pmic_alloc(); - - if (!p) { - printf("%s: POWER allocation error!\n", __func__); - return -ENOMEM; - } - - puts("Board PMIC init\n"); - - p->name = name; - p->interface = PMIC_I2C; - p->number_of_regs = PMIC_NUM_OF_REGS; - p->hw.i2c.addr = MAX8997_I2C_ADDR; - p->hw.i2c.tx_num = 1; - p->bus = bus; - - return 0; -} diff --git a/drivers/misc/pmic_max8998.c b/drivers/misc/pmic_max8998.c deleted file mode 100644 index 452e1c8..0000000 --- a/drivers/misc/pmic_max8998.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include - -int pmic_init(unsigned char bus) -{ - static const char name[] = "MAX8998_PMIC"; - struct pmic *p = pmic_alloc(); - - if (!p) { - printf("%s: POWER allocation error!\n", __func__); - return -ENOMEM; - } - - puts("Board PMIC init\n"); - - p->name = name; - p->interface = PMIC_I2C; - p->number_of_regs = PMIC_NUM_OF_REGS; - p->hw.i2c.addr = MAX8998_I2C_ADDR; - p->hw.i2c.tx_num = 1; - p->bus = bus; - - return 0; -} diff --git a/drivers/misc/pmic_spi.c b/drivers/misc/pmic_spi.c deleted file mode 100644 index 27488ea..0000000 --- a/drivers/misc/pmic_spi.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Lukasz Majewski - * - * (C) Copyright 2010 - * Stefano Babic, DENX Software Engineering, sbabic@denx.de - * - * (C) Copyright 2008-2009 Freescale Semiconductor, Inc. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include -#include -#include - -static struct spi_slave *slave; - -void pmic_spi_free(struct spi_slave *slave) -{ - if (slave) - spi_free_slave(slave); -} - -struct spi_slave *pmic_spi_probe(struct pmic *p) -{ - return spi_setup_slave(p->bus, - p->hw.spi.cs, - p->hw.spi.clk, - p->hw.spi.mode); -} - -static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write) -{ - u32 pmic_tx, pmic_rx; - u32 tmp; - - if (!slave) { - slave = pmic_spi_probe(p); - - if (!slave) - return -1; - } - - if (check_reg(p, reg)) - return -1; - - if (spi_claim_bus(slave)) - return -1; - - pmic_tx = p->hw.spi.prepare_tx(reg, val, write); - - tmp = cpu_to_be32(pmic_tx); - - if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx, - pmic_spi_flags)) { - spi_release_bus(slave); - return -1; - } - - if (write) { - pmic_tx = p->hw.spi.prepare_tx(reg, val, 0); - tmp = cpu_to_be32(pmic_tx); - if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx, - pmic_spi_flags)) { - spi_release_bus(slave); - return -1; - } - } - - spi_release_bus(slave); - *val = cpu_to_be32(pmic_rx); - - return 0; -} - -int pmic_reg_write(struct pmic *p, u32 reg, u32 val) -{ - if (pmic_reg(p, reg, &val, 1)) - return -1; - - return 0; -} - -int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) -{ - if (pmic_reg(p, reg, val, 0)) - return -1; - - return 0; -} -- cgit v1.1