May 2012 - U-Boot

[U-Boot] [PATCH 3/7] SPL: lib/Makefile: Add crc32.c to SPL build
by Stefan Roese 08 May '12

08 May '12

This is needed for the SPEAr SPL support, as SPEAr uses the mkimage header to wrap and validate the images (SPL & U-Boot). Signed-off-by: Stefan Roese <sr(a)denx.de> --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index a0fec60..9afa053 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -36,7 +36,6 @@ COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o COBJS-$(CONFIG_USB_TTY) += circbuf.o COBJS-y += crc7.o COBJS-y += crc16.o -COBJS-y += crc32.o COBJS-y += display_options.o COBJS-y += errno.o COBJS-$(CONFIG_OF_CONTROL) += fdtdec.o @@ -59,6 +58,7 @@ endif ifdef CONFIG_SPL_BUILD COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o endif +COBJS-y += crc32.o COBJS-y += ctype.o COBJS-y += div64.o COBJS-y += string.o -- 1.7.10.1

1 0

[U-Boot] [PATCH 2/7] SPL: common/Makefile: Add image.c to SPL build
by Stefan Roese 08 May '12

08 May '12

This is needed for the SPEAr SPL support, as SPEAr uses the mkimage header to wrap and validate the images (SPL & U-Boot). Signed-off-by: Stefan Roese <sr(a)denx.de> --- common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Makefile b/common/Makefile index 6e23baa..a30b3d4 100644 --- a/common/Makefile +++ b/common/Makefile @@ -31,7 +31,6 @@ COBJS-y += main.o COBJS-y += command.o COBJS-y += exports.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o -COBJS-y += image.o COBJS-y += s_record.o COBJS-$(CONFIG_SERIAL_MULTI) += serial.o COBJS-y += xyzModem.o @@ -193,6 +192,7 @@ COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o endif COBJS-y += console.o COBJS-y += dlmalloc.o +COBJS-y += image.o COBJS-y += memsize.o COBJS-y += stdio.o -- 1.7.10.1

1 0

[U-Boot] [PATCH 1/7] arm: Don't use printf() in SPL builds
by Stefan Roese 08 May '12

08 May '12

From: Simon Glass <sjg(a)chromium.org> raise() likes to call printf() if it is available, but in SPL builds it either is not available, or adds a large chunk to the resulting image size. So don't call it even if it is available. This change reduces SPL size from 10KB to 6.3KB on hawkboard, for example, using generic relocation. Signed-off-by: Simon Glass <sjg(a)chromium.org> Acked-by: Stefan Roese <sr(a)denx.de> --- arch/arm/lib/eabi_compat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c index 2028dbd..44eebe0 100644 --- a/arch/arm/lib/eabi_compat.c +++ b/arch/arm/lib/eabi_compat.c @@ -13,7 +13,8 @@ int raise (int signum) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) + /* Even if printf() is available, it's large. Punt it for SPL builds */ +#if !defined(CONFIG_SPL_BUILD) printf("raise: Signal # %d caught\n", signum); #endif return 0; -- 1.7.10.1

1 0

[U-Boot] [PATCH] GPIO: Add SPEAr GPIO driver
by Stefan Roese 08 May '12

08 May '12

Tested on x600 (SPEAr600). Signed-off-by: Stefan Roese <sr(a)denx.de> --- arch/arm/include/asm/arch-spear/gpio.h | 40 +++++++++++++ drivers/gpio/Makefile | 1 + drivers/gpio/spear_gpio.c | 102 ++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 arch/arm/include/asm/arch-spear/gpio.h create mode 100644 drivers/gpio/spear_gpio.c diff --git a/arch/arm/include/asm/arch-spear/gpio.h b/arch/arm/include/asm/arch-spear/gpio.h new file mode 100644 index 0000000..c3697de --- /dev/null +++ b/arch/arm/include/asm/arch-spear/gpio.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2012 Stefan Roese <sr(a)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 + */ + + +#ifndef __ASM_ARCH_SPEAR_GPIO_H +#define __ASM_ARCH_SPEAR_GPIO_H + +enum gpio_direction { + GPIO_DIRECTION_IN, + GPIO_DIRECTION_OUT, +}; + +struct gpio_regs { + u32 gpiodata[0x100]; /* 0x000 ... 0x3fc */ + u32 gpiodir; /* 0x400 */ +}; + +#define SPEAR_GPIO_COUNT 8 +#define DATA_REG_ADDR(gpio) (1 << (gpio + 2)) + +#endif /* __ASM_ARCH_SPEAR_GPIO_H */ diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index fb3b09a..10e82b9 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_PCA953X) += pca953x.o COBJS-$(CONFIG_PCA9698) += pca9698.o COBJS-$(CONFIG_S5P) += s5p_gpio.o COBJS-$(CONFIG_SANDBOX_GPIO) += sandbox.o +COBJS-$(CONFIG_SPEAR_GPIO) += spear_gpio.o COBJS-$(CONFIG_TEGRA2_GPIO) += tegra2_gpio.o COBJS-$(CONFIG_DA8XX_GPIO) += da8xx_gpio.o COBJS-$(CONFIG_ALTERA_PIO) += altera_pio.o diff --git a/drivers/gpio/spear_gpio.c b/drivers/gpio/spear_gpio.c new file mode 100644 index 0000000..d3c728e --- /dev/null +++ b/drivers/gpio/spear_gpio.c @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2012 Stefan Roese <sr(a)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 + */ + +/* + * Driver for SPEAr600 GPIO controller + */ + +#include <common.h> +#include <asm/arch/hardware.h> +#include <asm/gpio.h> +#include <asm/io.h> +#include <errno.h> + +static int gpio_direction(unsigned gpio, + enum gpio_direction direction) +{ + struct gpio_regs *regs = (struct gpio_regs *)CONFIG_GPIO_BASE; + u32 val; + + val = readl(&regs->gpiodir); + + if (direction == GPIO_DIRECTION_OUT) + val |= 1 << gpio; + else + val &= ~(1 << gpio); + + writel(val, &regs->gpiodir); + + return 0; +} + +int gpio_set_value(unsigned gpio, int value) +{ + struct gpio_regs *regs = (struct gpio_regs *)CONFIG_GPIO_BASE; + + writel(1 << gpio, &regs->gpiodata[DATA_REG_ADDR(gpio)]); + + return 0; +} + +int gpio_get_value(unsigned gpio) +{ + struct gpio_regs *regs = (struct gpio_regs *)CONFIG_GPIO_BASE; + u32 val; + + val = readl(&regs->gpiodata[DATA_REG_ADDR(gpio)]); + + return !!val; +} + +int gpio_request(unsigned gpio, const char *label) +{ + if (gpio >= SPEAR_GPIO_COUNT) + return -EINVAL; + + return 0; +} + +int gpio_free(unsigned gpio) +{ + return 0; +} + +void gpio_toggle_value(unsigned gpio) +{ + gpio_set_value(gpio, !gpio_get_value(gpio)); +} + +int gpio_direction_input(unsigned gpio) +{ + return gpio_direction(gpio, GPIO_DIRECTION_IN); +} + +int gpio_direction_output(unsigned gpio, int value) +{ + int ret = gpio_direction(gpio, GPIO_DIRECTION_OUT); + + if (ret < 0) + return ret; + + gpio_set_value(gpio, value); + return 0; +} -- 1.7.10.1

1 0

[U-Boot] [PATCH 1/5] pmic: Add support for the Dialog DA9053 PMIC
by Fabio Estevam 08 May '12

08 May '12

Add support for the Dialog DA9053 PMIC. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/misc/Makefile | 1 + drivers/misc/pmic_dialog.c | 37 +++++++++ include/dialog_pmic.h | 187 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 225 insertions(+), 0 deletions(-) create mode 100644 drivers/misc/pmic_dialog.c create mode 100644 include/dialog_pmic.h diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index a709707..6511713 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -39,6 +39,7 @@ 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_DIALOG_PMIC) += pmic_dialog.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/misc/pmic_dialog.c b/drivers/misc/pmic_dialog.c new file mode 100644 index 0000000..7242073 --- /dev/null +++ b/drivers/misc/pmic_dialog.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2011 Samsung Electronics + * Lukasz Majewski <l.majewski(a)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. + */ + +#include <common.h> +#include <pmic.h> +#include <dialog_pmic.h> + +int pmic_init(void) +{ + struct pmic *p = get_pmic(); + static const char name[] = "DIALOG_PMIC"; + + p->name = name; + p->number_of_regs = PMIC_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 = I2C_PMIC; + + return 0; +} diff --git a/include/dialog_pmic.h b/include/dialog_pmic.h new file mode 100644 index 0000000..8ac9551 --- /dev/null +++ b/include/dialog_pmic.h @@ -0,0 +1,187 @@ +/* + * da9053 register declarations. + * + * Copyright(c) 2009 Dialog Semiconductor Ltd. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#ifndef __DIALOG_PMIC_H__ +#define __DIALOG_PMIC_H__ + +enum { + DA9053_PAGECON0_REG = 0, + DA9053_STATUSA_REG, + DA9053_STATUSB_REG, + DA9053_STATUSC_REG, + DA9053_STATUSD_REG, + DA9053_EVENTA_REG, + DA9053_EVENTB_REG, + DA9053_EVENTC_REG, + DA9053_EVENTD_REG, + DA9053_FAULTLOG_REG, + DA9053_IRQMASKA_REG, + DA9053_IRQMASKB_REG, + DA9053_IRQMASKC_REG, + DA9053_IRQMASKD_REG, + DA9053_CONTROLA_REG, + DA9053_CONTROLB_REG, + DA9053_CONTROLC_REG, + DA9053_CONTROLD_REG, + DA9053_PDDIS_REG, + DA9053_INTERFACE_REG, + DA9053_RESET_REG, + DA9053_GPIO0001_REG, + DA9053_GPIO0203_REG, + DA9053_GPIO0405_REG, + DA9053_GPIO0607_REG, + DA9053_GPIO0809_REG, + DA9053_GPIO1011_REG, + DA9053_GPIO1213_REG, + DA9053_GPIO1415_REG, + DA9053_ID01_REG, + DA9053_ID23_REG, + DA9053_ID45_REG, + DA9053_ID67_REG, + DA9053_ID89_REG, + DA9053_ID1011_REG, + DA9053_ID1213_REG, + DA9053_ID1415_REG, + DA9053_ID1617_REG, + DA9053_ID1819_REG, + DA9053_ID2021_REG, + DA9053_SEQSTATUS_REG, + DA9053_SEQA_REG, + DA9053_SEQB_REG, + DA9053_SEQTIMER_REG, + DA9053_BUCKA_REG, + DA9053_BUCKB_REG, + DA9053_BUCKCORE_REG, + DA9053_BUCKPRO_REG, + DA9053_BUCKMEM_REG, + DA9053_BUCKPERI_REG, + DA9053_LDO1_REG, + DA9053_LDO2_REG, + DA9053_LDO3_REG, + DA9053_LDO4_REG, + DA9053_LDO5_REG, + DA9053_LDO6_REG, + DA9053_LDO7_REG, + DA9053_LDO8_REG, + DA9053_LDO9_REG, + DA9053_LDO10_REG, + DA9053_SUPPLY_REG, + DA9053_PULLDOWN_REG, + DA9053_CHGBUCK_REG, + DA9053_WAITCONT_REG, + DA9053_ISET_REG, + DA9053_BATCHG_REG, + DA9053_CHGCONT_REG, + DA9053_INPUTCONT_REG, + DA9053_CHGTIME_REG, + DA9053_BBATCONT_REG, + DA9053_BOOST_REG, + DA9053_LEDCONT_REG, + DA9053_LEDMIN123_REG, + DA9053_LED1CONF_REG, + DA9053_LED2CONF_REG, + DA9053_LED3CONF_REG, + DA9053_LED1CONT_REG, + DA9053_LED2CONT_REG, + DA9053_LED3CONT_REG, + DA9053_LED4CONT_REG, + DA9053_LED5CONT_REG, + DA9053_ADCMAN_REG, + DA9053_ADCCONT_REG, + DA9053_ADCRESL_REG, + DA9053_ADCRESH_REG, + DA9053_VDDRES_REG, + DA9053_VDDMON_REG, + DA9053_ICHGAV_REG, + DA9053_ICHGTHD_REG, + DA9053_ICHGEND_REG, + DA9053_TBATRES_REG, + DA9053_TBATHIGHP_REG, + DA9053_TBATHIGHIN_REG, + DA9053_TBATLOW_REG, + DA9053_TOFFSET_REG, + DA9053_ADCIN4RES_REG, + DA9053_AUTO4HIGH_REG, + DA9053_AUTO4LOW_REG, + DA9053_ADCIN5RES_REG, + DA9053_AUTO5HIGH_REG, + DA9053_AUTO5LOW_REG, + DA9053_ADCIN6RES_REG, + DA9053_AUTO6HIGH_REG, + DA9053_AUTO6LOW_REG, + DA9053_TJUNCRES_REG, + DA9053_TSICONTA_REG, + DA9053_TSICONTB_REG, + DA9053_TSIXMSB_REG, + DA9053_TSIYMSB_REG, + DA9053_TSILSB_REG, + DA9053_TSIZMSB_REG, + DA9053_COUNTS_REG, + DA9053_COUNTMI_REG, + DA9053_COUNTH_REG, + DA9053_COUNTD_REG, + DA9053_COUNTMO_REG, + DA9053_COUNTY_REG, + DA9053_ALARMMI_REG, + DA9053_ALARMH_REG, + DA9053_ALARMD_REG, + DA9053_ALARMMO_REG, + DA9053_ALARMY_REG, + DA9053_SECONDA_REG, + DA9053_SECONDB_REG, + DA9053_SECONDC_REG, + DA9053_SECONDD_REG, + DA9053_PAGECON128_REG, + DA9053_CHIPID_REG, + DA9053_CONFIGID_REG, + DA9053_OTPCONT_REG, + DA9053_OSCTRIM_REG, + DA9053_GPID0_REG, + DA9053_GPID1_REG, + DA9053_GPID2_REG, + DA9053_GPID3_REG, + DA9053_GPID4_REG, + DA9053_GPID5_REG, + DA9053_GPID6_REG, + DA9053_GPID7_REG, + DA9053_GPID8_REG, + DA9053_GPID9_REG, + PMIC_NUM_OF_REGS, +}; + +#define DA_BUCKCORE_VBCORE_1_250V 0x1E + +/* BUCKCORE REGISTER */ +#define DA9052_BUCKCORE_BCORECONF (1 << 7) +#define DA9052_BUCKCORE_BCOREEN (1 << 6) +#define DA9052_BUCKCORE_VBCORE 63 + +/* SUPPLY REGISTER */ +#define DA9052_SUPPLY_VLOCK (1 << 7) +#define DA9052_SUPPLY_VMEMSWEN (1 << 6) +#define DA9052_SUPPLY_VPERISWEN (1 << 5) +#define DA9052_SUPPLY_VLDO3GO (1 << 4) +#define DA9052_SUPPLY_VLDO2GO (1 << 3) +#define DA9052_SUPPLY_VBMEMGO (1 << 2) +#define DA9052_SUPPLY_VBPROGO (1 << 1) +#define DA9052_SUPPLY_VBCOREGO (1 << 0) + +#endif /* __DIALOG_PMIC_H__ */ -- 1.7.1

5 15

Re: [U-Boot] [PATCH] mmc: support the revision check for eMMC4.5
by Andy Fleming 08 May '12

08 May '12

On Tue, Mar 27, 2012 at 1:55 AM, Jaehoon Chung <jh80.chung(a)samsung.com> wrote: > eMMC card is introduced the eMMC4.5. > But now eMMC card is checked up to eMMC4.0. > This patch is supported until eMMC4.5 > > Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> > --- > common/cmd_mmc.c | 5 ++++- > drivers/mmc/mmc.c | 25 +++++++++++++++++++++++++ > include/mmc.h | 8 ++++++++ > 3 files changed, 37 insertions(+), 1 deletions(-) > > diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c > index 8f13c22..ff150ca 100644 > --- a/common/cmd_mmc.c > +++ b/common/cmd_mmc.c > @@ -106,7 +106,10 @@ static void print_mmcinfo(struct mmc *mmc) > printf("Rd Block Len: %d\n", mmc->read_bl_len); > > printf("%s version %d.%d\n", IS_SD(mmc) ? "SD" : "MMC", > - (mmc->version >> 4) & 0xf, mmc->version & 0xf); > + (mmc->version >> 4) & 0xf, > + (mmc->version & 0xf) == EXT_CSD_REV_1_5 ? > + 41 :((mmc->version & 0xf) > EXT_CSD_REV_1_5 ? > + (mmc->version & 0xf) - 1 : (mmc->version & 0xf))); This is very confusing. Let's pull some of that math and control code out of the printf invocation. > > printf("High Capacity: %s\n", mmc->high_capacity ? "Yes" : "No"); > puts("Capacity: "); > diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c > index 49c3349..e035012 100644 > --- a/drivers/mmc/mmc.c > +++ b/drivers/mmc/mmc.c > @@ -651,6 +651,31 @@ int mmc_change_freq(struct mmc *mmc) > if (err) > return err; > > + switch (ext_csd[EXT_CSD_REV]) { > + case EXT_CSD_REV_1_0: > + mmc->version |= EXT_CSD_REV_1_0; > + break; > + case EXT_CSD_REV_1_1: > + mmc->version |= EXT_CSD_REV_1_1; > + break; > + case EXT_CSD_REV_1_2: > + mmc->version |= EXT_CSD_REV_1_2; > + break; > + case EXT_CSD_REV_1_3: > + mmc->version |= EXT_CSD_REV_1_3; > + break; > + case EXT_CSD_REV_1_5: > + mmc->version |= EXT_CSD_REV_1_5; > + break; > + case EXT_CSD_REV_1_6: > + mmc->version |= EXT_CSD_REV_1_6; > + break; > + case EXT_CSD_REV_1_4: > + default: > + printf("Unknown revision - %x\n", ext_csd[EXT_CSD_REV]); > + return 0; > + } > + This seems broken, and the wrong place to do this. the mmc->version field will already be set based on the CSD, to values that overlap with the ones you are ORing, here. Also, the case statement appears to serve no function, other than to paradoxically identify that version 1.4 is unknown. I think that, if we want to do any version checking, we should do it in mmc_startup(). I suspect that the version information obtained here is only appropriate for certain versions of the spec, so that should be checked before adding in the information. Andy

2 1

[U-Boot] [PATCH] arm: Don't use printf() in SPL builds
by Simon Glass 08 May '12

08 May '12

raise() likes to call printf() if it is available, but in SPL builds it either is not available, or adds a large chunk to the resulting image size. So don't call it even if it is available. This change reduces SPL size from 10KB to 6.3KB on hawkboard, for example, using generic relocation. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/arm/lib/eabi_compat.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c index 2028dbd..44eebe0 100644 --- a/arch/arm/lib/eabi_compat.c +++ b/arch/arm/lib/eabi_compat.c @@ -13,7 +13,8 @@ int raise (int signum) { -#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT) + /* Even if printf() is available, it's large. Punt it for SPL builds */ +#if !defined(CONFIG_SPL_BUILD) printf("raise: Signal # %d caught\n", signum); #endif return 0; -- 1.7.7.3

6 11

[U-Boot] [PATCH] davinci: added Marvell 88E1111 PHY support
by Brilliantov Kirill Vladimirovich 08 May '12

08 May '12

added Marvell 88E1111 PHY support for Davinchi DM36x tested on DM368ZCEF Signed-off-by: Brilliantov Kirill Vladimirovich <brilliantov(a)byterg.ru> --- arch/arm/cpu/arm926ejs/davinci/Makefile | 1 + arch/arm/cpu/arm926ejs/davinci/marvell.c | 232 +++++++++++++++++++++++++ arch/arm/include/asm/arch-davinci/emac_defs.h | 6 + drivers/net/davinci_emac.c | 18 ++ 4 files changed, 257 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/davinci/marvell.c diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile index da7efac..687c58b 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Makefile +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_SOC_DM644X) += dm644x.o COBJS-$(CONFIG_SOC_DM646X) += dm646x.o COBJS-$(CONFIG_SOC_DA850) += da850_pinmux.o COBJS-$(CONFIG_DRIVER_TI_EMAC) += lxt972.o dp83848.o et1011c.o ksz8873.o +COBJS-$(CONFIG_DRIVER_TI_EMAC) += marvell.o ifdef CONFIG_SPL_BUILD COBJS-y += spl.o diff --git a/arch/arm/cpu/arm926ejs/davinci/marvell.c b/arch/arm/cpu/arm926ejs/davinci/marvell.c new file mode 100644 index 0000000..00e896a --- /dev/null +++ b/arch/arm/cpu/arm926ejs/davinci/marvell.c @@ -0,0 +1,232 @@ +/* + * Marvel 88E1111 Driver for TI DaVinci (TMS320DM635) based boards. + * + * Copyright (C) 2011 Brilliantov Kirill Vladimirovich <brilliantov(a)byterg.ru> + * References: 88E1111 Datasheet Integrated 10/100/1000 + * Ultra Gigabit Ethernet Transceiver + * Doc. No. MV-S100649-00, Rev. F + * December, 3, 2004 + * -------------------------------------------------------- + * + * 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 <miiphy.h> +#include <net.h> +#include <asm/arch/emac_defs.h> +#include "../../../../../drivers/net/davinci_emac.h" + +#ifdef CONFIG_DRIVER_TI_EMAC + +#ifdef CONFIG_CMD_NET + +#define DEBUG 0 +#define DBG(f, a...) \ + do { \ + if (DEBUG) \ + printf("Marvell: " f "\n", ##a);\ + } while (0) +#define ERR(f, a...) printf("Marvell: " f "\n", ##a) + +#define EXTENDED_PHY_SPECIFIC_STATUS_REGISTER 27 + +int m88e1111_is_phy_connected(int phy_addr) +{ + u_int16_t id1 = 0, id2 = 0; + + DBG("starting %s", __func__); + + if (!davinci_eth_phy_read(phy_addr, MII_PHYSID1, &id1)) { + ERR("can't read register %d (MII_PHYSID1)", MII_PHYSID1); + return (0); + } + + if (!davinci_eth_phy_read(phy_addr, MII_PHYSID2, &id2)) { + ERR("can't read register %d (MII_PHYSID2)", MII_PHYSID2); + return (0); + } + + DBG("ID1 %#x, ID2 %#x", id1, id2); + + if ((id1 == 0x141) && ((id2 & 0xFFF0) == 0x0CC0)) + return (1); + + ERR("ID1 or ID2 not corrected"); + + return (0); +} + +int m88e1111_get_link_speed(int phy_addr) +{ + u_int16_t val = 0; + volatile emac_regs *emac = (emac_regs *) EMAC_BASE_ADDR; + + DBG("starting %s", __func__); + + if (!davinci_eth_phy_read(phy_addr, MII_BMSR, &val)) { + ERR("can't read register %d (MII_BMSR)", MII_BMSR); + return (0); + } + + if (!(val & BMSR_LSTATUS)) { + ERR("link down"); + return (0); + } + DBG("link up"); + + if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &val)) { + ERR("can't read register %d (MII_BMCR)", MII_BMCR); + return (0); + } + + emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE; + if (val & BMCR_FULLDPLX) + emac->MACCONTROL |= EMAC_MACCONTROL_FULLDUPLEX_ENABLE; + DBG("set emac in %s duplex mode", + val & BMCR_FULLDPLX ? "full" : "half"); + + return (1); +} + +int m88e1111_auto_negotiate(int phy_addr) +{ + u_int16_t val = 0; + + DBG("starting %s", __func__); + +#if defined(CONFIG_SOC_DM365) + /* disable 1000Mb/s auto-negotination */ + if (!davinci_eth_phy_read(phy_addr, MII_CTRL1000, &val)) { + ERR("can't read register %d (MII_CTRL1000)", MII_CTRL1000); + return (0); + } + + if (!davinci_eth_phy_write(phy_addr, MII_CTRL1000, + val & (~(ADVERTISE_1000FULL | ADVERTISE_1000HALF)))) { + ERR("can't disable 1000Mb/s autonegotiation"); + return (0); + } + DBG("1000Mb/s autonegotiation disabled"); +#endif + + if (!davinci_eth_phy_read(phy_addr, MII_ADVERTISE, &val)) { + ERR("can't read register %d (MII_ADVERTISE)", MII_ADVERTISE); + return (0); + } + + val |= (ADVERTISE_100FULL | ADVERTISE_100HALF | + ADVERTISE_10FULL | ADVERTISE_10HALF); + if (!davinci_eth_phy_write(phy_addr, MII_ADVERTISE, val)) { + ERR("can't set 100Mb/s autonegotiation"); + return (0); + } + + if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &val)) { + ERR("can't read register %d (MII_BMCR)", MII_BMCR); + return (0); + } + + davinci_eth_phy_write(phy_addr, MII_BMCR, val | BMCR_RESET); + + /* TODO: very long time on auto-negotiation */ + udelay(2000000); + if (!davinci_eth_phy_read(phy_addr, MII_BMSR, &val)) { + ERR("can't read register %d (MII_BMSR)", MII_BMSR); + return (0); + } + + if (DEBUG) { + u_int8_t i; + u_int16_t v = 0; + + for (i = 0; i < 32; i++) { + davinci_eth_phy_read(phy_addr, i, &v); + printf("Register %d: value %#x\n", i, v); + } + } + + if (!(val & BMSR_ANEGCOMPLETE)) { + ERR("autonegotiation not completed"); + return (0); + } + DBG("autonegotiation completed"); + + return (m88e1111_get_link_speed(phy_addr)); +} + +int m88e1111_init_phy(int phy_addr) +{ + int ret = 1; + u_int16_t val = 0; + + DBG("starting %s", __func__); + + if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &val)) { + ERR("can't read register %d (MII_BMCR)", MII_BMCR); + return(0); + } + + if (!davinci_eth_phy_write(phy_addr, MII_BMCR, val | BMCR_RESET)) { + ERR("can't set soft reset"); + return(0); + } + + udelay(20000); + if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &val)) { + ERR("can't read register %d (MII_BMCR)", MII_BMCR); + return(0); + } + while (val & BMCR_RESET) { + udelay(10000); + davinci_eth_phy_read(phy_addr, MII_BMCR, &val); + } + +#if defined(CONFIG_SOC_DM365) + if (!davinci_eth_phy_read(phy_addr, + EXTENDED_PHY_SPECIFIC_STATUS_REGISTER, &val)) { + ERR("can't read register %d (Extended PHY Status)", + EXTENDED_PHY_SPECIFIC_STATUS_REGISTER); + return (0); + } + if (!davinci_eth_phy_write(phy_addr, + EXTENDED_PHY_SPECIFIC_STATUS_REGISTER, + val | 0xF)) { + ERR("can't set GMII to cooper mode"); + return (0); + } + DBG("hardware configred set in GMII to cooper mode"); + + if (!m88e1111_auto_negotiate(phy_addr)) + ret = m88e1111_auto_negotiate(phy_addr); +#else + if (!m88e1111_get_link_speed(phy_addr)) + ret = m88e1111_get_link_speed(phy_addr); +#endif + + return (ret); +} + + + +#endif /* CONFIG_CMD_NET */ + +#endif /* CONFIG_DRIVER_ETHER */ + +/* vim: set noet sw=8 ts=8: */ diff --git a/arch/arm/include/asm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h index 8a17de9..5f27600 100644 --- a/arch/arm/include/asm/arch-davinci/emac_defs.h +++ b/arch/arm/include/asm/arch-davinci/emac_defs.h @@ -105,4 +105,10 @@ int dp83848_auto_negotiate(int phy_addr); #define PHY_ET1011C (0x282f013) int et1011c_get_link_speed(int phy_addr); +#define PHY_M88E1111 (0x1410CC2) +int m88e1111_is_phy_connected(int phy_addr); +int m88e1111_get_link_speed(int phy_addr); +int m88e1111_init_phy(int phy_addr); +int m88e1111_auto_negotiate(int phy_addr); + #endif /* _DM644X_EMAC_H_ */ diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index fbd0f1b..fdca1ae 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -881,6 +881,16 @@ int davinci_emac_initialize(void) phy[i].auto_negotiate = gen_auto_negotiate; break; #endif +#ifdef PHY_M88E1111 + case PHY_M88E1111: + sprintf(phy[i].name, "MARVELL88E1111 @ 0x%02x", + active_phy_addr[i]); + phy[i].init = m88e1111_init_phy; + phy[i].is_phy_connected = m88e1111_is_phy_connected; + phy[i].get_link_speed = m88e1111_get_link_speed; + phy[i].auto_negotiate = m88e1111_auto_negotiate; + break; +#endif default: sprintf(phy[i].name, "GENERIC @ 0x%02x", active_phy_addr[i]); @@ -892,6 +902,14 @@ int davinci_emac_initialize(void) debug("Ethernet PHY: %s\n", phy[i].name); +#if defined(PHY_M88E1111) && defined(CONFIG_SOC_DM365) + /* I always get 1000Mb/s without this */ + if (PHY_M88E1111 == phy_id) { + if (!phy[i].init(active_phy_addr[i])) + return(0); + } +#endif + miiphy_register(phy[i].name, davinci_mii_phy_read, davinci_mii_phy_write); } -- 1.7.9

2 3

[U-Boot] [Patch v2 4/4] powerpc/mpc85xx: Fix Handling the lack of L2 cache on P2040/P2040E
by York Sun 07 May '12

07 May '12

Fix SVR checking for commit acf3f8da. Signed-off-by: York Sun <yorksun(a)freescale.com> --- Change since v1: No change arch/powerpc/cpu/mpc85xx/release.S | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 36c79d3..1860684 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -171,15 +171,12 @@ __secondary_start_page: #ifdef CONFIG_BACKSIDE_L2_CACHE /* skip L2 setup on P2040/P2040E as they have no L2 */ - mfspr r2,SPRN_SVR + mfspr r3,SPRN_SVR + rlwinm r6,r3,24,~0x800 /* clear E bit of SVR */ + lis r3,SVR_P2040@h ori r3,r3,SVR_P2040@l - cmpw r2,r3 - beq 3f - - lis r3,SVR_P2040_E@h - ori r3,r3,SVR_P2040_E@l - cmpw r2,r3 + cmpw r6,r3 beq 3f /* Enable/invalidate the L2 cache */ -- 1.7.0.4

1 0

[U-Boot] v2 patch with a change in 2/4
by York Sun 07 May '12

07 May '12

I have a change in 2/4 in this series. Resend all of them as v2. York

1 4