Merge branch 'master' of git://git.denx.de/u-boot-i2c
This commit is contained in:
Tom Rini
commit
037e9d33db
|
|
@ -138,6 +138,7 @@ struct watchdog {
|
|||
#define I2C_BASE1 (OMAP44XX_L4_PER_BASE + 0x70000)
|
||||
#define I2C_BASE2 (OMAP44XX_L4_PER_BASE + 0x72000)
|
||||
#define I2C_BASE3 (OMAP44XX_L4_PER_BASE + 0x60000)
|
||||
#define I2C_BASE4 (OMAP44XX_L4_PER_BASE + 0x350000)
|
||||
|
||||
/* MUSB base */
|
||||
#define MUSB_BASE (OMAP44XX_L4_CORE_BASE + 0xAB000)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef _OMAP4_I2C_H_
|
||||
#define _OMAP4_I2C_H_
|
||||
|
||||
#define I2C_BUS_MAX 3
|
||||
#define I2C_BUS_MAX 4
|
||||
#define I2C_DEFAULT_BASE I2C_BASE1
|
||||
|
||||
struct i2c {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# Copyright (C) 2012 Samsung Electronics
|
||||
# Lukasz Majewski <l.majewski@samsung.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 $(TOPDIR)/config.mk
|
||||
|
||||
LIB = $(obj)libsamsung.o
|
||||
|
||||
COBJS-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o
|
||||
|
||||
SRCS := $(COBJS-y:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS-y))
|
||||
|
||||
$(LIB): $(obj).depend $(OBJS)
|
||||
$(call cmd_link_o_target, $(OBJS))
|
||||
|
||||
#########################################################################
|
||||
|
||||
# defines $(obj).depend target
|
||||
include $(SRCTREE)/rules.mk
|
||||
|
||||
sinclude $(obj).depend
|
||||
|
||||
#########################################################################
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright (C) 2012 Samsung Electronics
|
||||
* Lukasz Majewski <l.majewski@samsung.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 <i2c.h>
|
||||
|
||||
/* Handle multiple I2C buses instances */
|
||||
int get_multi_scl_pin(void)
|
||||
{
|
||||
unsigned int bus = I2C_GET_BUS();
|
||||
|
||||
switch (bus) {
|
||||
case I2C_0: /* I2C_0 definition - compatibility layer */
|
||||
case I2C_5:
|
||||
return CONFIG_SOFT_I2C_I2C5_SCL;
|
||||
case I2C_9:
|
||||
return CONFIG_SOFT_I2C_I2C9_SCL;
|
||||
default:
|
||||
printf("I2C_%d not supported!\n", bus);
|
||||
};
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_multi_sda_pin(void)
|
||||
{
|
||||
unsigned int bus = I2C_GET_BUS();
|
||||
|
||||
switch (bus) {
|
||||
case I2C_0: /* I2C_0 definition - compatibility layer */
|
||||
case I2C_5:
|
||||
return CONFIG_SOFT_I2C_I2C5_SDA;
|
||||
case I2C_9:
|
||||
return CONFIG_SOFT_I2C_I2C9_SDA;
|
||||
default:
|
||||
printf("I2C_%d not supported!\n", bus);
|
||||
};
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int multi_i2c_init(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -75,6 +75,21 @@ int board_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void i2c_init_board(void)
|
||||
{
|
||||
struct exynos4_gpio_part1 *gpio1 =
|
||||
(struct exynos4_gpio_part1 *)samsung_get_base_gpio_part1();
|
||||
struct exynos4_gpio_part2 *gpio2 =
|
||||
(struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
|
||||
|
||||
/* I2C_5 -> PMIC */
|
||||
s5p_gpio_direction_output(&gpio1->b, 7, 1);
|
||||
s5p_gpio_direction_output(&gpio1->b, 6, 1);
|
||||
/* I2C_9 -> FG */
|
||||
s5p_gpio_direction_output(&gpio2->y4, 0, 1);
|
||||
s5p_gpio_direction_output(&gpio2->y4, 1, 1);
|
||||
}
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) +
|
||||
|
|
|
|||
|
|
@ -442,6 +442,14 @@ int i2c_set_bus_num(unsigned int bus)
|
|||
return -1;
|
||||
}
|
||||
|
||||
#if I2C_BUS_MAX == 4
|
||||
if (bus == 3)
|
||||
i2c_base = (struct i2c *)I2C_BASE4;
|
||||
else
|
||||
if (bus == 2)
|
||||
i2c_base = (struct i2c *)I2C_BASE3;
|
||||
else
|
||||
#endif
|
||||
#if I2C_BUS_MAX == 3
|
||||
if (bus == 2)
|
||||
i2c_base = (struct i2c *)I2C_BASE3;
|
||||
|
|
|
|||
|
|
@ -212,18 +212,28 @@
|
|||
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - GENERATED_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_CACHELINE_SIZE 32
|
||||
|
||||
#include <asm/arch/gpio.h>
|
||||
/*
|
||||
* I2C Settings
|
||||
*/
|
||||
#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_part1_get_nr(b, 7)
|
||||
#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_part1_get_nr(b, 6)
|
||||
|
||||
#define CONFIG_SOFT_I2C
|
||||
#define CONFIG_SOFT_I2C_READ_REPEATED_START
|
||||
#define CONFIG_SYS_I2C_INIT_BOARD
|
||||
#define CONFIG_SYS_I2C_SPEED 50000
|
||||
#define CONFIG_I2C_MULTI_BUS
|
||||
#define CONFIG_SYS_MAX_I2C_BUS 7
|
||||
#define CONFIG_SOFT_I2C_MULTI_BUS
|
||||
#define CONFIG_SYS_MAX_I2C_BUS 15
|
||||
|
||||
#include <asm/arch/gpio.h>
|
||||
|
||||
/* I2C PMIC */
|
||||
#define CONFIG_SOFT_I2C_I2C5_SCL exynos4_gpio_part1_get_nr(b, 7)
|
||||
#define CONFIG_SOFT_I2C_I2C5_SDA exynos4_gpio_part1_get_nr(b, 6)
|
||||
|
||||
/* I2C FG */
|
||||
#define CONFIG_SOFT_I2C_I2C9_SCL exynos4_gpio_part2_get_nr(y4, 1)
|
||||
#define CONFIG_SOFT_I2C_I2C9_SDA exynos4_gpio_part2_get_nr(y4, 0)
|
||||
|
||||
#define CONFIG_SOFT_I2C_GPIO_SCL get_multi_scl_pin()
|
||||
#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin()
|
||||
#define I2C_INIT multi_i2c_init()
|
||||
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
|
|
|
|||
|
|
@ -250,4 +250,16 @@ static inline void I2C_SET_BUS(unsigned int bus)
|
|||
i2c_set_bus_num(bus);
|
||||
}
|
||||
|
||||
/* Multi I2C definitions */
|
||||
enum {
|
||||
I2C_0, I2C_1, I2C_2, I2C_3, I2C_4, I2C_5, I2C_6, I2C_7,
|
||||
I2C_8, I2C_9, I2C_10,
|
||||
};
|
||||
|
||||
/* Multi I2C busses handling */
|
||||
#ifdef CONFIG_SOFT_I2C_MULTI_BUS
|
||||
extern int get_multi_scl_pin(void);
|
||||
extern int get_multi_sda_pin(void);
|
||||
extern int multi_i2c_init(void);
|
||||
#endif
|
||||
#endif /* _I2C_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue