[U-Boot] [PATCH 1/2 V2] EXYNOS5: PINMUX: Added default pinumx settings
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com --- changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2012 Samsung Electronics. + * Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h> +#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h> + +static int exynos5_pinmux_config(int peripheral, int flags) +{ + struct exynos5_gpio_part1 *gpio1 = + (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1(); + struct s5p_gpio_bank *bank, *bank_ext; + int i, start, count; + + switch (peripheral) { + case PERIPH_ID_UART0: + case PERIPH_ID_UART1: + case PERIPH_ID_UART2: + case PERIPH_ID_UART3: + switch (peripheral) { + case PERIPH_ID_UART0: + bank = &gpio1->a0; + start = 0; count = 4; + break; + case PERIPH_ID_UART1: + bank = &gpio1->a0; + start = 4; count = 4; + break; + case PERIPH_ID_UART2: + bank = &gpio1->a1; + start = 0; count = 4; + break; + case PERIPH_ID_UART3: + bank = &gpio1->a1; + start = 4; count = 2; + break; + } + for (i = start; i < start + count; i++) { + s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE); + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + } + break; + case PERIPH_ID_SDMMC0: + case PERIPH_ID_SDMMC1: + case PERIPH_ID_SDMMC2: + case PERIPH_ID_SDMMC3: + switch (peripheral) { + case PERIPH_ID_SDMMC0: + bank = &gpio1->c0; bank_ext = &gpio1->c1; + break; + case PERIPH_ID_SDMMC1: + bank = &gpio1->c1; bank_ext = NULL; + break; + case PERIPH_ID_SDMMC2: + bank = &gpio1->c2; bank_ext = &gpio1->c3; + break; + case PERIPH_ID_SDMMC3: + bank = &gpio1->c3; bank_ext = NULL; + break; + } + if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) { + debug("SDMMC device %d does not support 8bit mode", + peripheral); + return -1; + } + if (flags & PINMUX_FLAG_8BIT_MODE) { + for (i = 3; i <= 6; i++) { + s5p_gpio_cfg_pin(bank_ext, i, GPIO_FUNC(0x3)); + s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_UP); + s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X); + } + } + for (i = 0; i < 2; i++) { + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE); + s5p_gpio_set_drv(bank, i, GPIO_DRV_4X); + } + for (i = 3; i <= 6; i++) { + s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2)); + s5p_gpio_set_pull(bank, i, GPIO_PULL_UP); + s5p_gpio_set_drv(bank, i, GPIO_DRV_4X); + } + break; + case PERIPH_ID_SROMC: + /* + * SROM:CS1 and EBI + * + * GPY0[0] SROM_CSn[0] + * GPY0[1] SROM_CSn[1](2) + * GPY0[2] SROM_CSn[2] + * GPY0[3] SROM_CSn[3] + * GPY0[4] EBI_OEn(2) + * GPY0[5] EBI_EEn(2) + * + * GPY1[0] EBI_BEn[0](2) + * GPY1[1] EBI_BEn[1](2) + * GPY1[2] SROM_WAIT(2) + * GPY1[3] EBI_DATA_RDn(2) + */ + s5p_gpio_cfg_pin(&gpio1->y0, (flags & PINMUX_FLAG_BANK), + GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2)); + + for (i = 0; i < 4; i++) + s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2)); + + /* + * EBI: 8 Addrss Lines + * + * GPY3[0] EBI_ADDR[0](2) + * GPY3[1] EBI_ADDR[1](2) + * GPY3[2] EBI_ADDR[2](2) + * GPY3[3] EBI_ADDR[3](2) + * GPY3[4] EBI_ADDR[4](2) + * GPY3[5] EBI_ADDR[5](2) + * GPY3[6] EBI_ADDR[6](2) + * GPY3[7] EBI_ADDR[7](2) + * + * EBI: 16 Data Lines + * + * GPY5[0] EBI_DATA[0](2) + * GPY5[1] EBI_DATA[1](2) + * GPY5[2] EBI_DATA[2](2) + * GPY5[3] EBI_DATA[3](2) + * GPY5[4] EBI_DATA[4](2) + * GPY5[5] EBI_DATA[5](2) + * GPY5[6] EBI_DATA[6](2) + * GPY5[7] EBI_DATA[7](2) + * + * GPY6[0] EBI_DATA[8](2) + * GPY6[1] EBI_DATA[9](2) + * GPY6[2] EBI_DATA[10](2) + * GPY6[3] EBI_DATA[11](2) + * GPY6[4] EBI_DATA[12](2) + * GPY6[5] EBI_DATA[13](2) + * GPY6[6] EBI_DATA[14](2) + * GPY6[7] EBI_DATA[15](2) + */ + for (i = 0; i < 8; i++) { + s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP); + } + break; + default: + debug("%s: invalid peripheral %d", __func__, peripheral); + return -1; + } + + return 0; +} + +int exynos_pinmux_config(int peripheral, int flags) +{ + if (cpu_is_exynos5()) + return exynos5_pinmux_config(peripheral, flags); + else{ + debug("pinmux functionality not supported\n"); + return -1; + } +} diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/include/asm/arch-exynos/pinmux.h new file mode 100644 index 0000000..306f521 --- /dev/null +++ b/arch/arm/include/asm/arch-exynos/pinmux.h @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * Abhilash Kesavan a.kesavan@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 + */ + +#ifndef __ASM_ARM_ARCH_PINMUX_H +#define __ASM_ARM_ARCH_PINMUX_H + +/* + * Peripherals requiring clock/pinmux configuration. List will + * grow with support for more devices getting added. + * + */ +enum periph_id { + PERIPH_ID_SDMMC0, + PERIPH_ID_SDMMC1, + PERIPH_ID_SDMMC2, + PERIPH_ID_SDMMC3, + PERIPH_ID_SDMMC4, + PERIPH_ID_SROMC, + PERIPH_ID_UART0, + PERIPH_ID_UART1, + PERIPH_ID_UART2, + PERIPH_ID_UART3, + + PERIPH_ID_COUNT, + PERIPH_ID_NONE = -1, +}; + +/* + * Flags for setting specific configarations of peripherals. + * List will grow with support for more devices getting added. + */ +enum { + PINMUX_FLAG_NONE = 0x00000000, + + /* Flags for eMMC */ + PINMUX_FLAG_8BIT_MODE = 1 << 0, /* SDMMC 8-bit mode */ + + /* Flags for SROM controller */ + PINMUX_FLAG_BANK = 3 << 0, /* bank number (0-3) */ + PINMUX_FLAG_16BIT = 1 << 2, /* 16-bit width */ +}; + +/** + * Configures the pinmux for a particular peripheral. + * + * Each gpio can be configured in many different ways (4 bits on exynos) + * such as "input", "output", "special function", "external interrupt" + * etc. This function will configure the peripheral pinmux along with + * pull-up/down and drive strength. + * + * @param peripheral peripheral to be configured + * @param flags configure flags + * @return 0 if ok, -1 on error (e.g. unsupported peripheral) + */ +int exynos_pinmux_config(int peripheral, int flags); + +#endif
Use the pinmux configuration function for SMDK5250.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com --- changes in V2: - Removed exynos5_gpio_part1 *gpio1 global variable as initialised in pinmux.c board/samsung/smdk5250/smdk5250.c | 163 ++++++------------------------------- 1 files changed, 25 insertions(+), 138 deletions(-)
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 32786e2..b7d7a79 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -26,81 +26,16 @@ #include <asm/arch/cpu.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> +#include <asm/arch/pinmux.h> #include <asm/arch/sromc.h>
DECLARE_GLOBAL_DATA_PTR; -struct exynos5_gpio_part1 *gpio1;
#ifdef CONFIG_SMC911X static void smc9115_pre_init(void) { u32 smc_bw_conf, smc_bc_conf; - int i; - - /* - * SROM:CS1 and EBI - * - * GPY0[0] SROM_CSn[0] - * GPY0[1] SROM_CSn[1](2) - * GPY0[2] SROM_CSn[2] - * GPY0[3] SROM_CSn[3] - * GPY0[4] EBI_OEn(2) - * GPY0[5] EBI_EEn(2) - * - * GPY1[0] EBI_BEn[0](2) - * GPY1[1] EBI_BEn[1](2) - * GPY1[2] SROM_WAIT(2) - * GPY1[3] EBI_DATA_RDn(2) - */ - s5p_gpio_cfg_pin(&gpio1->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2)); - s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2)); - s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2)); - - for (i = 0; i < 4; i++) - s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2)); - - /* - * EBI: 8 Addrss Lines - * - * GPY3[0] EBI_ADDR[0](2) - * GPY3[1] EBI_ADDR[1](2) - * GPY3[2] EBI_ADDR[2](2) - * GPY3[3] EBI_ADDR[3](2) - * GPY3[4] EBI_ADDR[4](2) - * GPY3[5] EBI_ADDR[5](2) - * GPY3[6] EBI_ADDR[6](2) - * GPY3[7] EBI_ADDR[7](2) - * - * EBI: 16 Data Lines - * - * GPY5[0] EBI_DATA[0](2) - * GPY5[1] EBI_DATA[1](2) - * GPY5[2] EBI_DATA[2](2) - * GPY5[3] EBI_DATA[3](2) - * GPY5[4] EBI_DATA[4](2) - * GPY5[5] EBI_DATA[5](2) - * GPY5[6] EBI_DATA[6](2) - * GPY5[7] EBI_DATA[7](2) - * - * GPY6[0] EBI_DATA[8](2) - * GPY6[1] EBI_DATA[9](2) - * GPY6[2] EBI_DATA[10](2) - * GPY6[3] EBI_DATA[11](2) - * GPY6[4] EBI_DATA[12](2) - * GPY6[5] EBI_DATA[13](2) - * GPY6[6] EBI_DATA[14](2) - * GPY6[7] EBI_DATA[15](2) - */ - for (i = 0; i < 8; i++) { - s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2)); - s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP); - - s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2)); - s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP); - - s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2)); - s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP); - } + int err;
/* Ethernet needs data bus width of 16 bits */ smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK) @@ -112,14 +47,17 @@ static void smc9115_pre_init(void) | SROMC_BC_PMC(0x01);
/* Select and configure the SROMC bank */ + err = exynos_pinmux_config(PERIPH_ID_SROMC, + CONFIG_ENV_SROM_BANK | PINMUX_FLAG_16BIT); + if (err < 0) + debug("SROMC not configured\n"); + s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf); } #endif
int board_init(void) { - gpio1 = (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1(); - gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); return 0; } @@ -186,31 +124,12 @@ int checkboard(void) #ifdef CONFIG_GENERIC_MMC int board_mmc_init(bd_t *bis) { - int i, err; + int err;
- /* - * MMC2 SD card GPIO: - * - * GPC2[0] SD_2_CLK(2) - * GPC2[1] SD_2_CMD(2) - * GPC2[2] SD_2_CDn - * GPC2[3:6] SD_2_DATA[0:3](2) - */ - for (i = 0; i < 7; i++) { - /* GPC2[0:6] special function 2 */ - s5p_gpio_cfg_pin(&gpio1->c2, i, GPIO_FUNC(0x2)); - - /* GPK2[0:6] drv 4x */ - s5p_gpio_set_drv(&gpio1->c2, i, GPIO_DRV_4X); - - /* GPK2[0:1] pull disable */ - if (i == 0 || i == 1) { - s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_NONE); - continue; - } - - /* GPK2[2:6] pull up */ - s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_UP); + err = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); + if (err < 0) { + debug("SDMMC2 not configured\n"); + return err; }
err = s5p_mmc_init(2, 4); @@ -220,55 +139,23 @@ int board_mmc_init(bd_t *bis)
static void board_uart_init(void) { - struct exynos5_gpio_part1 *gpio1 = - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1(); - int i; - - /* - * UART0 GPIOs : GPA0CON[3:0] 0x2222 - * Must set CFG17 switches to select UART0 to use. - */ - for (i = 0; i <= 3; i++) { - s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE); - s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2)); - } + int err;
- /* - * UART1 GPIOs : GPA0CON[5:4] 0x22 - * Must set CFG17 switches to select UART1 to use. - * - * This only sets RXD/TXD, as RTS/CTS need a resistor soldered down - * in order to use them (so that those pins can be used for I2C). - */ - for (i = 4; i <= 5; i++) { - s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE); - s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2)); - } + err = exynos_pinmux_config(PERIPH_ID_UART0, PINMUX_FLAG_NONE); + if (err < 0) + debug("UART0 not configured\n");
- /* - * UART2 GPIOs : GPA1CON[1:0] 0x22 - * Must set CFG17 switches to select UART2 to use. - * - * This only sets RXD/TXD, as RTS/CTS need a resistor soldered down - * in order to use them (so that those pins can be used for I2C). - */ - for (i = 0; i <= 1; i++) { - s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE); - s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2)); - } + err = exynos_pinmux_config(PERIPH_ID_UART1, PINMUX_FLAG_NONE); + if (err < 0) + debug("UART1 not configured\n");
- /* - * UART3 GPIOs : GPA1CON[5:4] 0x22 - * Must set CFG16 switches to select UART3 to use. - */ - for (i = 4; i <= 5; i++) { - s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE); - s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2)); - } + err = exynos_pinmux_config(PERIPH_ID_UART2, PINMUX_FLAG_NONE); + if (err < 0) + debug("UART2 not configured\n");
- /* - * There's no mux for UART4--it's internal only - */ + err = exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE); + if (err < 0) + debug("UART3 not configured\n"); }
#ifdef CONFIG_BOARD_EARLY_INIT_F
Dear Rajeshwari,
On 23 May 2012 14:24, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
Use the pinmux configuration function for SMDK5250.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Removed exynos5_gpio_part1 *gpio1 global variable as initialised in pinmux.c board/samsung/smdk5250/smdk5250.c | 163 ++++++------------------------------- 1 files changed, 25 insertions(+), 138 deletions(-)
Acked-by: Chander Kashyap chander.kashyap@linaro.org
Hi,
On Wed, May 23, 2012 at 1:54 AM, Rajeshwari Shinde <rajeshwari.s@samsung.com
wrote:
Use the pinmux configuration function for SMDK5250.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
Acked-by: Simon Glass sjg@chromium.org
I would prefer to have an error return from smc9115_pre_init() though.
Regards, Simon
changes in V2: - Removed exynos5_gpio_part1 *gpio1 global variable as initialised in pinmux.c board/samsung/smdk5250/smdk5250.c | 163 ++++++------------------------------- 1 files changed, 25 insertions(+), 138 deletions(-)
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c index 32786e2..b7d7a79 100644 --- a/board/samsung/smdk5250/smdk5250.c +++ b/board/samsung/smdk5250/smdk5250.c @@ -26,81 +26,16 @@ #include <asm/arch/cpu.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> +#include <asm/arch/pinmux.h> #include <asm/arch/sromc.h>
DECLARE_GLOBAL_DATA_PTR; -struct exynos5_gpio_part1 *gpio1;
#ifdef CONFIG_SMC911X static void smc9115_pre_init(void) { u32 smc_bw_conf, smc_bc_conf;
int i;/** SROM:CS1 and EBI** GPY0[0] SROM_CSn[0]* GPY0[1] SROM_CSn[1](2)* GPY0[2] SROM_CSn[2]* GPY0[3] SROM_CSn[3]* GPY0[4] EBI_OEn(2)* GPY0[5] EBI_EEn(2)** GPY1[0] EBI_BEn[0](2)* GPY1[1] EBI_BEn[1](2)* GPY1[2] SROM_WAIT(2)* GPY1[3] EBI_DATA_RDn(2)*/s5p_gpio_cfg_pin(&gpio1->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2));s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2));for (i = 0; i < 4; i++)s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2));/** EBI: 8 Addrss Lines** GPY3[0] EBI_ADDR[0](2)* GPY3[1] EBI_ADDR[1](2)* GPY3[2] EBI_ADDR[2](2)* GPY3[3] EBI_ADDR[3](2)* GPY3[4] EBI_ADDR[4](2)* GPY3[5] EBI_ADDR[5](2)* GPY3[6] EBI_ADDR[6](2)* GPY3[7] EBI_ADDR[7](2)** EBI: 16 Data Lines** GPY5[0] EBI_DATA[0](2)* GPY5[1] EBI_DATA[1](2)* GPY5[2] EBI_DATA[2](2)* GPY5[3] EBI_DATA[3](2)* GPY5[4] EBI_DATA[4](2)* GPY5[5] EBI_DATA[5](2)* GPY5[6] EBI_DATA[6](2)* GPY5[7] EBI_DATA[7](2)** GPY6[0] EBI_DATA[8](2)* GPY6[1] EBI_DATA[9](2)* GPY6[2] EBI_DATA[10](2)* GPY6[3] EBI_DATA[11](2)* GPY6[4] EBI_DATA[12](2)* GPY6[5] EBI_DATA[13](2)* GPY6[6] EBI_DATA[14](2)* GPY6[7] EBI_DATA[15](2)*/for (i = 0; i < 8; i++) {s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP);s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP);s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP);}
int err; /* Ethernet needs data bus width of 16 bits */ smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK)@@ -112,14 +47,17 @@ static void smc9115_pre_init(void) | SROMC_BC_PMC(0x01);
/* Select and configure the SROMC bank */
err = exynos_pinmux_config(PERIPH_ID_SROMC,CONFIG_ENV_SROM_BANK | PINMUX_FLAG_16BIT);if (err < 0)debug("SROMC not configured\n");s5p_config_sromc(CONFIG_ENV_SROM_BANK, smc_bw_conf, smc_bc_conf);} #endif
int board_init(void) {
gpio1 = (struct exynos5_gpio_part1 *)samsung_get_base_gpio_part1();
gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL); return 0;} @@ -186,31 +124,12 @@ int checkboard(void) #ifdef CONFIG_GENERIC_MMC int board_mmc_init(bd_t *bis) {
int i, err;
int err;
/** MMC2 SD card GPIO:** GPC2[0] SD_2_CLK(2)* GPC2[1] SD_2_CMD(2)* GPC2[2] SD_2_CDn* GPC2[3:6] SD_2_DATA[0:3](2)*/for (i = 0; i < 7; i++) {/* GPC2[0:6] special function 2 */s5p_gpio_cfg_pin(&gpio1->c2, i, GPIO_FUNC(0x2));/* GPK2[0:6] drv 4x */s5p_gpio_set_drv(&gpio1->c2, i, GPIO_DRV_4X);/* GPK2[0:1] pull disable */if (i == 0 || i == 1) {s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_NONE);continue;}/* GPK2[2:6] pull up */s5p_gpio_set_pull(&gpio1->c2, i, GPIO_PULL_UP);
err = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE);if (err < 0) {debug("SDMMC2 not configured\n");return err; } err = s5p_mmc_init(2, 4);@@ -220,55 +139,23 @@ int board_mmc_init(bd_t *bis)
static void board_uart_init(void) {
struct exynos5_gpio_part1 *gpio1 =(struct exynos5_gpio_part1 *)samsung_get_base_gpio_part1();
int i;/** UART0 GPIOs : GPA0CON[3:0] 0x2222* Must set CFG17 switches to select UART0 to use.*/for (i = 0; i <= 3; i++) {s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2));}
int err;
/** UART1 GPIOs : GPA0CON[5:4] 0x22* Must set CFG17 switches to select UART1 to use.** This only sets RXD/TXD, as RTS/CTS need a resistor soldered down* in order to use them (so that those pins can be used for I2C).*/for (i = 4; i <= 5; i++) {s5p_gpio_set_pull(&gpio1->a0, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(&gpio1->a0, i, GPIO_FUNC(0x2));}
err = exynos_pinmux_config(PERIPH_ID_UART0, PINMUX_FLAG_NONE);if (err < 0)debug("UART0 not configured\n");
/** UART2 GPIOs : GPA1CON[1:0] 0x22* Must set CFG17 switches to select UART2 to use.** This only sets RXD/TXD, as RTS/CTS need a resistor soldered down* in order to use them (so that those pins can be used for I2C).*/for (i = 0; i <= 1; i++) {s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2));}
err = exynos_pinmux_config(PERIPH_ID_UART1, PINMUX_FLAG_NONE);if (err < 0)debug("UART1 not configured\n");
/** UART3 GPIOs : GPA1CON[5:4] 0x22* Must set CFG16 switches to select UART3 to use.*/for (i = 4; i <= 5; i++) {s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC(0x2));}
err = exynos_pinmux_config(PERIPH_ID_UART2, PINMUX_FLAG_NONE);if (err < 0)debug("UART2 not configured\n");
/** There's no mux for UART4--it's internal only*/
err = exynos_pinmux_config(PERIPH_ID_UART3, PINMUX_FLAG_NONE);if (err < 0)debug("UART3 not configured\n");}
#ifdef CONFIG_BOARD_EARLY_INIT_F
1.7.4.4
Dear Rajeshwari,
On 23 May 2012 14:24, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
Acked-by: Chander Kashyap chander.kashyap@linaro.org
- with warm regards, Chander Kashyap
Dear Rajeshwari Shinde,
On 23 May 2012 17:54, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/*
- Copyright (c) 2012 Samsung Electronics.
- Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h>
cpu.h is already included.
+#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h>
+static int exynos5_pinmux_config(int peripheral, int flags) +{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
- struct s5p_gpio_bank *bank, *bank_ext;
- int i, start, count;
- switch (peripheral) {
- case PERIPH_ID_UART0:
- case PERIPH_ID_UART1:
- case PERIPH_ID_UART2:
- case PERIPH_ID_UART3:
- switch (peripheral) {
- case PERIPH_ID_UART0:
- bank = &gpio1->a0;
- start = 0; count = 4;
Please don't put multiple statement on a single line. fix it globally.
- break;
- case PERIPH_ID_UART1:
- bank = &gpio1->a0;
- start = 4; count = 4;
- break;
- case PERIPH_ID_UART2:
- bank = &gpio1->a1;
- start = 0; count = 4;
- break;
- case PERIPH_ID_UART3:
- bank = &gpio1->a1;
- start = 4; count = 2;
- break;
- }
- for (i = start; i < start + count; i++) {
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- }
- break;
Looks confused. Why don't you make function for each peripherals? e.g: exynos5_uart_config, exynos5_mmc_config.
- case PERIPH_ID_SDMMC0:
- case PERIPH_ID_SDMMC1:
- case PERIPH_ID_SDMMC2:
- case PERIPH_ID_SDMMC3:
- switch (peripheral) {
- case PERIPH_ID_SDMMC0:
- bank = &gpio1->c0; bank_ext = &gpio1->c1;
- break;
- case PERIPH_ID_SDMMC1:
- bank = &gpio1->c1; bank_ext = NULL;
- break;
- case PERIPH_ID_SDMMC2:
- bank = &gpio1->c2; bank_ext = &gpio1->c3;
- break;
- case PERIPH_ID_SDMMC3:
- bank = &gpio1->c3; bank_ext = NULL;
- break;
- }
- if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) {
- debug("SDMMC device %d does not support 8bit mode",
- peripheral);
- return -1;
- }
- if (flags & PINMUX_FLAG_8BIT_MODE) {
- for (i = 3; i <= 6; i++) {
- s5p_gpio_cfg_pin(bank_ext, i, GPIO_FUNC(0x3));
- s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_UP);
- s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);
- }
- }
- for (i = 0; i < 2; i++) {
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
- }
- for (i = 3; i <= 6; i++) {
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- s5p_gpio_set_pull(bank, i, GPIO_PULL_UP);
- s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
- }
- break;
- case PERIPH_ID_SROMC:
- /*
- * SROM:CS1 and EBI
- *
- * GPY0[0] SROM_CSn[0]
- * GPY0[1] SROM_CSn[1](2)
- * GPY0[2] SROM_CSn[2]
- * GPY0[3] SROM_CSn[3]
- * GPY0[4] EBI_OEn(2)
- * GPY0[5] EBI_EEn(2)
- *
- * GPY1[0] EBI_BEn[0](2)
- * GPY1[1] EBI_BEn[1](2)
- * GPY1[2] SROM_WAIT(2)
- * GPY1[3] EBI_DATA_RDn(2)
- */
- s5p_gpio_cfg_pin(&gpio1->y0, (flags & PINMUX_FLAG_BANK),
- GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2));
- for (i = 0; i < 4; i++)
- s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2));
- /*
- * EBI: 8 Addrss Lines
- *
- * GPY3[0] EBI_ADDR[0](2)
- * GPY3[1] EBI_ADDR[1](2)
- * GPY3[2] EBI_ADDR[2](2)
- * GPY3[3] EBI_ADDR[3](2)
- * GPY3[4] EBI_ADDR[4](2)
- * GPY3[5] EBI_ADDR[5](2)
- * GPY3[6] EBI_ADDR[6](2)
- * GPY3[7] EBI_ADDR[7](2)
- *
- * EBI: 16 Data Lines
- *
- * GPY5[0] EBI_DATA[0](2)
- * GPY5[1] EBI_DATA[1](2)
- * GPY5[2] EBI_DATA[2](2)
- * GPY5[3] EBI_DATA[3](2)
- * GPY5[4] EBI_DATA[4](2)
- * GPY5[5] EBI_DATA[5](2)
- * GPY5[6] EBI_DATA[6](2)
- * GPY5[7] EBI_DATA[7](2)
- *
- * GPY6[0] EBI_DATA[8](2)
- * GPY6[1] EBI_DATA[9](2)
- * GPY6[2] EBI_DATA[10](2)
- * GPY6[3] EBI_DATA[11](2)
- * GPY6[4] EBI_DATA[12](2)
- * GPY6[5] EBI_DATA[13](2)
- * GPY6[6] EBI_DATA[14](2)
- * GPY6[7] EBI_DATA[15](2)
- */
- for (i = 0; i < 8; i++) {
- s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP);
- s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP);
- s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP);
- }
- break;
- default:
- debug("%s: invalid peripheral %d", __func__, peripheral);
- return -1;
- }
- return 0;
+}
+int exynos_pinmux_config(int peripheral, int flags) +{
- if (cpu_is_exynos5())
- return exynos5_pinmux_config(peripheral, flags);
- else{
need space between else and { Well, I think you don't need this else statement.
- debug("pinmux functionality not supported\n");
- return -1;
- }
+}
Thanks. Minkyu Kang.
Hi,
On Thu, May 31, 2012 at 2:57 AM, Minkyu Kang promsoft@gmail.com wrote:
Dear Rajeshwari Shinde,
On 23 May 2012 17:54, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189
+++++++++++++++++++++++++++++
arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile
b/arch/arm/cpu/armv7/exynos/Makefile
index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c
b/arch/arm/cpu/armv7/exynos/pinmux.c
new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/*
- Copyright (c) 2012 Samsung Electronics.
- Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h>
cpu.h is already included.
+#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h>
+static int exynos5_pinmux_config(int peripheral, int flags) +{
struct exynos5_gpio_part1 *gpio1 =(struct exynos5_gpio_part1 *)samsung_get_base_gpio_part1();
struct s5p_gpio_bank *bank, *bank_ext;int i, start, count;switch (peripheral) {case PERIPH_ID_UART0:case PERIPH_ID_UART1:case PERIPH_ID_UART2:case PERIPH_ID_UART3:switch (peripheral) {case PERIPH_ID_UART0:bank = &gpio1->a0;start = 0; count = 4;Please don't put multiple statement on a single line. fix it globally.
break;case PERIPH_ID_UART1:bank = &gpio1->a0;start = 4; count = 4;break;case PERIPH_ID_UART2:bank = &gpio1->a1;start = 0; count = 4;break;case PERIPH_ID_UART3:bank = &gpio1->a1;start = 4; count = 2;break;}for (i = start; i < start + count; i++) {s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));}break;Looks confused. Why don't you make function for each peripherals? e.g: exynos5_uart_config, exynos5_mmc_config.
The idea here is that later we can configure a peripheral just with the ID. Ultimately we might do pinmux in a generic way using device tree.
case PERIPH_ID_SDMMC0:case PERIPH_ID_SDMMC1:case PERIPH_ID_SDMMC2:case PERIPH_ID_SDMMC3:switch (peripheral) {case PERIPH_ID_SDMMC0:bank = &gpio1->c0; bank_ext = &gpio1->c1;break;case PERIPH_ID_SDMMC1:bank = &gpio1->c1; bank_ext = NULL;break;case PERIPH_ID_SDMMC2:bank = &gpio1->c2; bank_ext = &gpio1->c3;break;case PERIPH_ID_SDMMC3:bank = &gpio1->c3; bank_ext = NULL;break;}if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) {debug("SDMMC device %d does not support 8bitmode",
peripheral);return -1;}if (flags & PINMUX_FLAG_8BIT_MODE) {for (i = 3; i <= 6; i++) {s5p_gpio_cfg_pin(bank_ext, i,GPIO_FUNC(0x3));
s5p_gpio_set_pull(bank_ext, i,GPIO_PULL_UP);
s5p_gpio_set_drv(bank_ext, i,GPIO_DRV_4X);
}}for (i = 0; i < 2; i++) {s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);}for (i = 3; i <= 6; i++) {s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));s5p_gpio_set_pull(bank, i, GPIO_PULL_UP);s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);}break;case PERIPH_ID_SROMC:/** SROM:CS1 and EBI** GPY0[0] SROM_CSn[0]* GPY0[1] SROM_CSn[1](2)* GPY0[2] SROM_CSn[2]* GPY0[3] SROM_CSn[3]* GPY0[4] EBI_OEn(2)* GPY0[5] EBI_EEn(2)** GPY1[0] EBI_BEn[0](2)* GPY1[1] EBI_BEn[1](2)* GPY1[2] SROM_WAIT(2)* GPY1[3] EBI_DATA_RDn(2)*/s5p_gpio_cfg_pin(&gpio1->y0, (flags & PINMUX_FLAG_BANK),GPIO_FUNC(2));s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2));s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2));for (i = 0; i < 4; i++)s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2));/** EBI: 8 Addrss Lines** GPY3[0] EBI_ADDR[0](2)* GPY3[1] EBI_ADDR[1](2)* GPY3[2] EBI_ADDR[2](2)* GPY3[3] EBI_ADDR[3](2)* GPY3[4] EBI_ADDR[4](2)* GPY3[5] EBI_ADDR[5](2)* GPY3[6] EBI_ADDR[6](2)* GPY3[7] EBI_ADDR[7](2)** EBI: 16 Data Lines** GPY5[0] EBI_DATA[0](2)* GPY5[1] EBI_DATA[1](2)* GPY5[2] EBI_DATA[2](2)* GPY5[3] EBI_DATA[3](2)* GPY5[4] EBI_DATA[4](2)* GPY5[5] EBI_DATA[5](2)* GPY5[6] EBI_DATA[6](2)* GPY5[7] EBI_DATA[7](2)** GPY6[0] EBI_DATA[8](2)* GPY6[1] EBI_DATA[9](2)* GPY6[2] EBI_DATA[10](2)* GPY6[3] EBI_DATA[11](2)* GPY6[4] EBI_DATA[12](2)* GPY6[5] EBI_DATA[13](2)* GPY6[6] EBI_DATA[14](2)* GPY6[7] EBI_DATA[15](2)*/for (i = 0; i < 8; i++) {s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP);s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP);s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2));s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP);}break;default:debug("%s: invalid peripheral %d", __func__, peripheral);return -1;}return 0;+}
+int exynos_pinmux_config(int peripheral, int flags) +{
if (cpu_is_exynos5())return exynos5_pinmux_config(peripheral, flags);else{need space between else and { Well, I think you don't need this else statement.
It is nice because there is some indication of failure. But see my previous comments about whether this should in fact be in the exynos5 directory (with perhaps a static inline to make this do nothing on exynos4).
debug("pinmux functionality not supported\n");
return -1;
}+}
Thanks. Minkyu Kang. -- from. prom. www.promsoft.net _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Regards, Simon
Dear Simon Glass,
On 1 June 2012 10:40, Simon Glass sjg@chromium.org wrote:
Hi,
On Thu, May 31, 2012 at 2:57 AM, Minkyu Kang promsoft@gmail.com wrote:
Dear Rajeshwari Shinde,
On 23 May 2012 17:54, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/*
- Copyright (c) 2012 Samsung Electronics.
- Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h>
cpu.h is already included.
+#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h>
+static int exynos5_pinmux_config(int peripheral, int flags) +{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *)
samsung_get_base_gpio_part1();
- struct s5p_gpio_bank *bank, *bank_ext;
- int i, start, count;
- switch (peripheral) {
- case PERIPH_ID_UART0:
- case PERIPH_ID_UART1:
- case PERIPH_ID_UART2:
- case PERIPH_ID_UART3:
- switch (peripheral) {
- case PERIPH_ID_UART0:
- bank = &gpio1->a0;
- start = 0; count = 4;
Please don't put multiple statement on a single line. fix it globally.
- break;
- case PERIPH_ID_UART1:
- bank = &gpio1->a0;
- start = 4; count = 4;
- break;
- case PERIPH_ID_UART2:
- bank = &gpio1->a1;
- start = 0; count = 4;
- break;
- case PERIPH_ID_UART3:
- bank = &gpio1->a1;
- start = 4; count = 2;
- break;
- }
- for (i = start; i < start + count; i++) {
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- }
- break;
Looks confused. Why don't you make function for each peripherals? e.g: exynos5_uart_config, exynos5_mmc_config.
The idea here is that later we can configure a peripheral just with the ID. Ultimately we might do pinmux in a generic way using device tree.
I know. It seems to me you misunderstand my opinion. Please see below pseudo code.
static int exynos5_pinmux_config(args) { switch (peripheral) { case PERIPH_ID_UART0: case PERIPH_ID_UART1: case PERIPH_ID_UART2: case PERIPH_ID_UART3: exynos5_uart_config(args); break; case PERIPH_ID_SDMMC0: case PERIPH_ID_SDMMC1: case PERIPH_ID_SDMMC2: case PERIPH_ID_SDMMC3: exynos5_mmc_config(args); break; } }
Thanks. Minkyu Kang.
Hi Minkyu Kang,
Thank you for comments.
On Fri, Jun 1, 2012 at 12:11 PM, Minkyu Kang promsoft@gmail.com wrote:
Dear Simon Glass,
On 1 June 2012 10:40, Simon Glass sjg@chromium.org wrote:
Hi,
On Thu, May 31, 2012 at 2:57 AM, Minkyu Kang promsoft@gmail.com wrote:
Dear Rajeshwari Shinde,
On 23 May 2012 17:54, Rajeshwari Shinde rajeshwari.s@samsung.com wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/*
- Copyright (c) 2012 Samsung Electronics.
- Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h>
cpu.h is already included.
+#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h>
+static int exynos5_pinmux_config(int peripheral, int flags) +{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *)
samsung_get_base_gpio_part1();
- struct s5p_gpio_bank *bank, *bank_ext;
- int i, start, count;
- switch (peripheral) {
- case PERIPH_ID_UART0:
- case PERIPH_ID_UART1:
- case PERIPH_ID_UART2:
- case PERIPH_ID_UART3:
- switch (peripheral) {
- case PERIPH_ID_UART0:
- bank = &gpio1->a0;
- start = 0; count = 4;
Please don't put multiple statement on a single line. fix it globally.
- break;
- case PERIPH_ID_UART1:
- bank = &gpio1->a0;
- start = 4; count = 4;
- break;
- case PERIPH_ID_UART2:
- bank = &gpio1->a1;
- start = 0; count = 4;
- break;
- case PERIPH_ID_UART3:
- bank = &gpio1->a1;
- start = 4; count = 2;
- break;
- }
- for (i = start; i < start + count; i++) {
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- }
- break;
Looks confused. Why don't you make function for each peripherals? e.g: exynos5_uart_config, exynos5_mmc_config.
The idea here is that later we can configure a peripheral just with the ID. Ultimately we might do pinmux in a generic way using device tree.
I know. It seems to me you misunderstand my opinion. Please see below pseudo code.
-- will do this modification will create separate function for each.
static int exynos5_pinmux_config(args) { switch (peripheral) { case PERIPH_ID_UART0: case PERIPH_ID_UART1: case PERIPH_ID_UART2: case PERIPH_ID_UART3: exynos5_uart_config(args); break; case PERIPH_ID_SDMMC0: case PERIPH_ID_SDMMC1: case PERIPH_ID_SDMMC2: case PERIPH_ID_SDMMC3: exynos5_mmc_config(args); break; } }
Thanks. Minkyu Kang. -- from. prom. www.promsoft.net _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Regards, Rajeshwari Shinde.
Hi Minkyu,
On Thu, May 31, 2012 at 11:41 PM, Minkyu Kang promsoft@gmail.com wrote:
Dear Simon Glass,
On 1 June 2012 10:40, Simon Glass sjg@chromium.org wrote:
Hi,
On Thu, May 31, 2012 at 2:57 AM, Minkyu Kang promsoft@gmail.com wrote:
Dear Rajeshwari Shinde,
On 23 May 2012 17:54, Rajeshwari Shinde rajeshwari.s@samsung.com
wrote:
This patch performs the pinmux configuration in a common file. As of now only EXYNOS5 pinmux for SDMMC, UART and Ethernet is supported.
Signed-off-by: Abhilash Kesavan a.kesavan@samsung.com Signed-off-by: Che-Liang Chiou clchiou@chromium.org Signed-off-by: Rajeshwari Shinde rajeshwari.s@samsung.com
changes in V2: - Adding pinmux.c to Makefile moved to this patch. - exynos5_pinmux_config made static. arch/arm/cpu/armv7/exynos/Makefile | 2 +- arch/arm/cpu/armv7/exynos/pinmux.c | 189 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/pinmux.h | 77 ++++++++++++ 3 files changed, 267 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/exynos/pinmux.c create mode 100644 arch/arm/include/asm/arch-exynos/pinmux.h
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/cpu/armv7/exynos/Makefile index 90ec2bd..9119961 100644 --- a/arch/arm/cpu/armv7/exynos/Makefile +++ b/arch/arm/cpu/armv7/exynos/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS += clock.o power.o soc.o system.o +COBJS += clock.o power.o soc.o system.o pinmux.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c new file mode 100644 index 0000000..c6392b2 --- /dev/null +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -0,0 +1,189 @@ +/*
- Copyright (c) 2012 Samsung Electronics.
- Abhilash Kesavan a.kesavan@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 <asm/arch/cpu.h>
cpu.h is already included.
+#include <asm/arch/gpio.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/sromc.h>
+static int exynos5_pinmux_config(int peripheral, int flags) +{
struct exynos5_gpio_part1 *gpio1 =(struct exynos5_gpio_part1 *)samsung_get_base_gpio_part1();
struct s5p_gpio_bank *bank, *bank_ext;int i, start, count;switch (peripheral) {case PERIPH_ID_UART0:case PERIPH_ID_UART1:case PERIPH_ID_UART2:case PERIPH_ID_UART3:switch (peripheral) {case PERIPH_ID_UART0:bank = &gpio1->a0;start = 0; count = 4;Please don't put multiple statement on a single line. fix it globally.
break;case PERIPH_ID_UART1:bank = &gpio1->a0;start = 4; count = 4;break;case PERIPH_ID_UART2:bank = &gpio1->a1;start = 0; count = 4;break;case PERIPH_ID_UART3:bank = &gpio1->a1;start = 4; count = 2;break;}for (i = start; i < start + count; i++) {s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));}break;Looks confused. Why don't you make function for each peripherals? e.g: exynos5_uart_config, exynos5_mmc_config.
The idea here is that later we can configure a peripheral just with the
ID.
Ultimately we might do pinmux in a generic way using device tree.
I know. It seems to me you misunderstand my opinion. Please see below pseudo code.
Yes I did - thank you for the explanation. It will complicate dealing with the config/flags, but that is ok.
Regards, Simon
static int exynos5_pinmux_config(args) { switch (peripheral) { case PERIPH_ID_UART0: case PERIPH_ID_UART1: case PERIPH_ID_UART2: case PERIPH_ID_UART3: exynos5_uart_config(args); break; case PERIPH_ID_SDMMC0: case PERIPH_ID_SDMMC1: case PERIPH_ID_SDMMC2: case PERIPH_ID_SDMMC3: exynos5_mmc_config(args); break; } }
Thanks. Minkyu Kang. -- from. prom. www.promsoft.net
participants (5)
-
Chander Kashyap -
Minkyu Kang -
Rajeshwari Birje -
Rajeshwari Shinde -
Simon Glass