From 9133a9c422b9d898d3d8f4dce8dcd2657ae8379d Mon Sep 17 00:00:00 2001 From: Venkata Biswanath Date: Wed, 28 Sep 2011 12:22:31 +0530 Subject: u5500: delete old regulator file This is moved to the PRCMU driver. Change-Id: I4056436f94c1c07830df2757f82156348a366e02 Signed-off-by: Venkata Biswanath Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32446 Reviewed-by: Jonas ABERG Tested-by: Jonas ABERG --- arch/arm/mach-ux500/Makefile | 1 - arch/arm/mach-ux500/regulator-u5500.c | 84 ----------------------------------- 2 files changed, 85 deletions(-) delete mode 100644 arch/arm/mach-ux500/regulator-u5500.c diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 6754a3cd4eb..481f0893215 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -11,7 +11,6 @@ obj-y += pm/ ifeq ($(CONFIG_UX500_SOC_DB5500), y) -obj-$(CONFIG_REGULATOR) += regulator-u5500.o obj-$(CONFIG_UX500_SOC_DBX500) += cpu-db5500.o dma-db5500.o \ devices-db5500.o clock-db5500.o obj-$(CONFIG_TOUCHSCREEN_CYTTSP_SPI) += board-u5500-cyttsp.o diff --git a/arch/arm/mach-ux500/regulator-u5500.c b/arch/arm/mach-ux500/regulator-u5500.c deleted file mode 100644 index 4aca065d6e8..00000000000 --- a/arch/arm/mach-ux500/regulator-u5500.c +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2011 - * - * License Terms: GNU General Public License v2 - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include "regulator-ux500.h" -#include "regulator-u5500.h" - -#define U5500_REGULATOR_SWITCH(_name, reg) \ - [U5500_REGULATOR_SWITCH_##reg] = { \ - .desc = { \ - .name = _name, \ - .id = U5500_REGULATOR_SWITCH_##reg, \ - .ops = &ux500_regulator_switch_ops, \ - .type = REGULATOR_VOLTAGE, \ - .owner = THIS_MODULE, \ - }, \ - .epod_id = DB5500_EPOD_ID_##reg, \ -} - -static struct u8500_regulator_info -u5500_regulator_info[U5500_NUM_REGULATORS] = { - [U5500_REGULATOR_VAPE] = { - .desc = { - .name = "u5500-vape", - .id = U5500_REGULATOR_VAPE, - .ops = &ux500_regulator_ops, - .type = REGULATOR_VOLTAGE, - .owner = THIS_MODULE, - }, - }, - U5500_REGULATOR_SWITCH("u5500-sga", SGA), - U5500_REGULATOR_SWITCH("u5500-hva", HVA), - U5500_REGULATOR_SWITCH("u5500-sia", SIA), - U5500_REGULATOR_SWITCH("u5500-disp", DISP), - U5500_REGULATOR_SWITCH("u5500-esram12", ESRAM12), -}; - -static int __devinit u5500_regulator_probe(struct platform_device *pdev) -{ - return ux500_regulator_probe(pdev, u5500_regulator_info, - ARRAY_SIZE(u5500_regulator_info)); -} - -static int __devexit u5500_regulator_remove(struct platform_device *pdev) -{ - return ux500_regulator_remove(pdev, u5500_regulator_info, - ARRAY_SIZE(u5500_regulator_info)); -} - -static struct platform_driver u5500_regulator_driver = { - .driver = { - .name = "u5500-regulators", - .owner = THIS_MODULE, - }, - .probe = u5500_regulator_probe, - .remove = __devexit_p(u5500_regulator_remove), -}; - -static int __init u5500_regulator_init(void) -{ - return platform_driver_register(&u5500_regulator_driver); -} - -static void __exit u5500_regulator_exit(void) -{ - platform_driver_unregister(&u5500_regulator_driver); -} - -arch_initcall(u5500_regulator_init); -module_exit(u5500_regulator_exit); - -MODULE_DESCRIPTION("U5500 regulator driver"); -MODULE_LICENSE("GPL v2"); -- cgit v1.2.3