Because twl4030 now has its own device files, move exiting omap3 power_init_r to a new location. power_init_r is the only function in board/omap3/common. It initializes the twl4030 power for the board and enables the led. The power part of the the function is moved to twl4030_power_init in drivers/power/twl4030.c The power compilation is conditional on the existing config variable CONFIG_TWL4030_POWER. The led part is moved to twl4030_led_init in the new file drivers/misc/twl4030_led.c The led compilation is conditional on the new config variable CONFIG_TWL4030_LED The directory board/omap3/common was removed because power_init_r was the only function in it. Signed-off-by: Tom Rix <Tom.Rix@windriver.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Heiko Schocher <hs@denx.de>master
Tom Rix
16 years ago
committed by
Heiko Schocher
parent
cd7826359e
commit
2c15513010
@ -1,54 +0,0 @@ |
||||
#
|
||||
# (C) Copyright 2006
|
||||
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||
#
|
||||
# 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 $(TOPDIR)/config.mk |
||||
|
||||
ifneq ($(OBJTREE),$(SRCTREE)) |
||||
$(shell mkdir -p $(obj)board/$(VENDOR)/common) |
||||
endif |
||||
|
||||
LIB = $(obj)lib$(VENDOR).a
|
||||
|
||||
COBJS-$(CONFIG_OMAP3_BEAGLE) += power.o
|
||||
COBJS-$(CONFIG_OMAP3_OVERO) += power.o
|
||||
COBJS-$(CONFIG_OMAP3_PANDORA) += power.o
|
||||
COBJS-$(CONFIG_OMAP3_ZOOM1) += power.o
|
||||
COBJS-$(CONFIG_OMAP3_ZOOM2) += power.o
|
||||
|
||||
COBJS := $(COBJS-y)
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
|
||||
all: $(LIB) |
||||
|
||||
$(LIB): $(obj).depend $(OBJS) |
||||
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||
|
||||
#########################################################################
|
||||
|
||||
# defines $(obj).depend target
|
||||
include $(SRCTREE)/rules.mk |
||||
|
||||
sinclude $(obj).depend |
||||
|
||||
#########################################################################
|
||||
@ -1,74 +0,0 @@ |
||||
/*
|
||||
* (C) Copyright 2004-2008 |
||||
* Texas Instruments, <www.ti.com> |
||||
* |
||||
* Author : |
||||
* Sunil Kumar <sunilsaini05@gmail.com> |
||||
* Shashi Ranjan <shashiranjanmca05@gmail.com> |
||||
* |
||||
* Derived from Beagle Board and 3430 SDP code by |
||||
* Richard Woodruff <r-woodruff2@ti.com> |
||||
* Syed Mohammed Khasim <khasim@ti.com> |
||||
* |
||||
* |
||||
* 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 <common.h> |
||||
#include <asm/arch/sys_proto.h> |
||||
#include <i2c.h> |
||||
|
||||
/******************************************************************************
|
||||
* Routine: power_init_r |
||||
* Description: Configure power supply |
||||
*****************************************************************************/ |
||||
void power_init_r(void) |
||||
{ |
||||
unsigned char byte; |
||||
|
||||
#ifdef CONFIG_DRIVER_OMAP34XX_I2C |
||||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); |
||||
#endif |
||||
|
||||
/*
|
||||
* Configure OMAP3 supply voltages in power management |
||||
* companion chip. |
||||
*/ |
||||
|
||||
/* set VAUX3 to 2.8V */ |
||||
byte = DEV_GRP_P1; |
||||
i2c_write(PWRMGT_ADDR_ID4, VAUX3_DEV_GRP, 1, &byte, 1); |
||||
byte = VAUX3_VSEL_28; |
||||
i2c_write(PWRMGT_ADDR_ID4, VAUX3_DEDICATED, 1, &byte, 1); |
||||
|
||||
/* set VPLL2 to 1.8V */ |
||||
byte = DEV_GRP_ALL; |
||||
i2c_write(PWRMGT_ADDR_ID4, VPLL2_DEV_GRP, 1, &byte, 1); |
||||
byte = VPLL2_VSEL_18; |
||||
i2c_write(PWRMGT_ADDR_ID4, VPLL2_DEDICATED, 1, &byte, 1); |
||||
|
||||
/* set VDAC to 1.8V */ |
||||
byte = DEV_GRP_P1; |
||||
i2c_write(PWRMGT_ADDR_ID4, VDAC_DEV_GRP, 1, &byte, 1); |
||||
byte = VDAC_VSEL_18; |
||||
i2c_write(PWRMGT_ADDR_ID4, VDAC_DEDICATED, 1, &byte, 1); |
||||
|
||||
/* enable LED */ |
||||
byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON; |
||||
i2c_write(PWRMGT_ADDR_ID3, LEDEN, 1, &byte, 1); |
||||
} |
||||
@ -0,0 +1,52 @@ |
||||
/*
|
||||
* Copyright (c) 2009 Wind River Systems, Inc. |
||||
* Tom Rix <Tom.Rix at windriver.com> |
||||
* |
||||
* 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 |
||||
* |
||||
* twl4030_led_init is from cpu/omap3/common.c, power_init_r |
||||
* |
||||
* (C) Copyright 2004-2008 |
||||
* Texas Instruments, <www.ti.com> |
||||
* |
||||
* Author : |
||||
* Sunil Kumar <sunilsaini05 at gmail.com> |
||||
* Shashi Ranjan <shashiranjanmca05 at gmail.com> |
||||
* |
||||
* Derived from Beagle Board and 3430 SDP code by |
||||
* Richard Woodruff <r-woodruff2 at ti.com> |
||||
* Syed Mohammed Khasim <khasim at ti.com> |
||||
* |
||||
*/ |
||||
|
||||
#include <twl4030.h> |
||||
|
||||
#define LEDAON (0x1 << 0) |
||||
#define LEDBON (0x1 << 1) |
||||
#define LEDAPWM (0x1 << 4) |
||||
#define LEDBPWM (0x1 << 5) |
||||
|
||||
void twl4030_led_init(void) |
||||
{ |
||||
unsigned char byte; |
||||
|
||||
/* enable LED */ |
||||
byte = LEDBPWM | LEDAPWM | LEDBON | LEDAON; |
||||
|
||||
twl4030_i2c_write_u8(TWL4030_CHIP_LED, byte, |
||||
TWL4030_LED_LEDEN); |
||||
|
||||
} |
||||
Loading…
Reference in new issue