September 2012 - U-Boot

[U-Boot] [PATCH] implement software SPI
by Piotr Wilczek 15 Oct '12

15 Oct '12

This patch implements software SPI for the universal C210 board. SPI is used to configure video driver. Piotr Wilczek (1): arm:exynos4:universal_c210: implement software SPI board/samsung/universal_c210/universal.c | 36 ++++++++++++++++++++++++++++++ drivers/spi/soft_spi.c | 7 +++++- include/configs/s5pc210_universal.h | 19 +++++++++++++++ 3 files changed, 61 insertions(+), 1 deletions(-) -- 1.7.5.4

3 12

[U-Boot] KernelDoc
by Marek Vasut 14 Oct '12

14 Oct '12

Hi all! I've had a discussion with Wolfgang just now about U-Boot coding style. I tried using KernelDoc in a patch, which is not part of the U-Boot Coding Style now, thus it was rejected. I really like the idea of annotating functions with proper description, thus I would like to ask, can we reach a general agreement and start using kerneldoc in U-Boot to annotate functions and possibly generate documentation? Or shall we use anything else? Or any other annotation stuff? Doxygen style? Shall it be optional or mandatory? See [1] in Linux kernel tree for what I mean. [1] Documentation/kernel-doc-nano-HOWTO.txt Best regards, Marek Vasut

9 37

[U-Boot] [PATCH 0/5] EXYNOS4: Enable I2C support
by Piotr Wilczek 12 Oct '12

12 Oct '12

This patchset enables hardware I2C support for Exynos 4. The s3c24x0 I2C driver is modified to use for for both Exynos 4 and Exynos 5. Pinmux setting is add for Exynos 4. PMIC MAX8997 driver is modified to support multi channel hardware I2C. Piotr Wilczek (5): EXYNOS: CLK: Add i2c clock EXYNOS: Add Exynos4 I2C spacing EXYNOS: PINMUX: Add pinmux support for i2c DRIVERS: I2C: Modify I2C driver for EXYNOS4 DRIVERS: MISC: PMIC: Modify pmic driver to support multibus I2C arch/arm/cpu/armv7/exynos/clock.c | 7 ++++ arch/arm/cpu/armv7/exynos/pinmux.c | 51 ++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/cpu.h | 2 + drivers/i2c/s3c24x0_i2c.c | 19 +++++++---- drivers/misc/pmic_max8997.c | 7 +++- 5 files changed, 77 insertions(+), 9 deletions(-) -- 1.7.5.4

3 13

[U-Boot] [PATCH] mxc: Fix SDHC multi-instance clock
by Benoît Thébaudeau 10 Oct '12

10 Oct '12

On mxc, each SDHC instance has a dedicated clock, so gd->sdhc_clk is not suitable for the multi-instance use case (initialization made directly with fsl_esdhc_initialize()). This patch fixes this issue by adding a configuration field for the SDHC input clock frequency. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Eric Bénard <eric(a)eukrea.com> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: Jason Liu <r64343(a)freescale.com> Cc: Matt Sealey <matt(a)genesi-usa.com> Cc: Andy Fleming <afleming(a)gmail.com> --- This patch should be applied after (series of series...): http://patchwork.ozlabs.org/patch/187467/ http://patchwork.ozlabs.org/patch/187468/ http://patchwork.ozlabs.org/patch/187475/ .../board/esg/ima3-mx53/ima3-mx53.c | 1 + .../board/freescale/mx35pdk/mx35pdk.c | 2 ++ .../board/freescale/mx51evk/mx51evk.c | 4 ++++ .../board/freescale/mx53ard/mx53ard.c | 4 ++++ .../board/freescale/mx53evk/mx53evk.c | 4 ++++ .../board/freescale/mx53loco/mx53loco.c | 3 +++ .../board/freescale/mx53smd/mx53smd.c | 3 +++ .../board/freescale/mx6qarm2/mx6qarm2.c | 4 ++++ .../board/freescale/mx6qsabrelite/mx6qsabrelite.c | 3 +++ .../board/genesi/mx51_efikamx/efikamx.c | 4 ++++ .../board/ttcontrol/vision2/vision2.c | 2 ++ .../drivers/mmc/fsl_esdhc.c | 5 +++-- .../include/fsl_esdhc.h | 1 + 13 files changed, 38 insertions(+), 2 deletions(-) diff --git u-boot-imx-e1eb75b.orig/board/esg/ima3-mx53/ima3-mx53.c u-boot-imx-e1eb75b/board/esg/ima3-mx53/ima3-mx53.c index e947330..41d6bb6 100644 --- u-boot-imx-e1eb75b.orig/board/esg/ima3-mx53/ima3-mx53.c +++ u-boot-imx-e1eb75b/board/esg/ima3-mx53/ima3-mx53.c @@ -217,6 +217,7 @@ int board_mmc_init(bd_t *bis) PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_HIGH | PAD_CTL_PUE_PULL | PAD_CTL_PKE_ENABLE | PAD_CTL_HYS_ENABLE | PAD_CTL_47K_PU); + esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); return fsl_esdhc_initialize(bis, &esdhc_cfg); } #endif diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx35pdk/mx35pdk.c u-boot-imx-e1eb75b/board/freescale/mx35pdk/mx35pdk.c index 7cb6b30..a12531f 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx35pdk/mx35pdk.c +++ u-boot-imx-e1eb75b/board/freescale/mx35pdk/mx35pdk.c @@ -27,6 +27,7 @@ #include <asm/errno.h> #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <asm/arch/mx35_pins.h> #include <asm/arch/iomux.h> #include <i2c.h> @@ -292,6 +293,7 @@ int board_mmc_init(bd_t *bis) mxc_request_iomux(MX35_PIN_SD1_DATA2, MUX_CONFIG_FUNC); mxc_request_iomux(MX35_PIN_SD1_DATA3, MUX_CONFIG_FUNC); + esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC1_CLK); return fsl_esdhc_initialize(bis, &esdhc_cfg); } diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx51evk/mx51evk.c u-boot-imx-e1eb75b/board/freescale/mx51evk/mx51evk.c index a94701c..3412952 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx51evk/mx51evk.c +++ u-boot-imx-e1eb75b/board/freescale/mx51evk/mx51evk.c @@ -29,6 +29,7 @@ #include <asm/errno.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <i2c.h> #include <mmc.h> #include <fsl_esdhc.h> @@ -358,6 +359,9 @@ int board_mmc_init(bd_t *bis) u32 index; s32 status = 0; + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); + for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { switch (index) { diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx53ard/mx53ard.c u-boot-imx-e1eb75b/board/freescale/mx53ard/mx53ard.c index 08c7795..2fc8570 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx53ard/mx53ard.c +++ u-boot-imx-e1eb75b/board/freescale/mx53ard/mx53ard.c @@ -26,6 +26,7 @@ #include <asm/arch/mx5x_pins.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/errno.h> #include <netdev.h> @@ -106,6 +107,9 @@ int board_mmc_init(bd_t *bis) u32 index; s32 status = 0; + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); + for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx53evk/mx53evk.c u-boot-imx-e1eb75b/board/freescale/mx53evk/mx53evk.c index b11a94c..bb4621d 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx53evk/mx53evk.c +++ u-boot-imx-e1eb75b/board/freescale/mx53evk/mx53evk.c @@ -26,6 +26,7 @@ #include <asm/arch/mx5x_pins.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/errno.h> #include <asm/imx-common/boot_mode.h> @@ -232,6 +233,9 @@ int board_mmc_init(bd_t *bis) u32 index; s32 status = 0; + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); + for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx53loco/mx53loco.c u-boot-imx-e1eb75b/board/freescale/mx53loco/mx53loco.c index 8f82125..8f9b8df 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx53loco/mx53loco.c +++ u-boot-imx-e1eb75b/board/freescale/mx53loco/mx53loco.c @@ -192,6 +192,9 @@ int board_mmc_init(bd_t *bis) u32 index; s32 status = 0; + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); + for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx53smd/mx53smd.c u-boot-imx-e1eb75b/board/freescale/mx53smd/mx53smd.c index 7f35ddd..761f727 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx53smd/mx53smd.c +++ u-boot-imx-e1eb75b/board/freescale/mx53smd/mx53smd.c @@ -26,6 +26,7 @@ #include <asm/arch/mx5x_pins.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/errno.h> #include <netdev.h> @@ -144,6 +145,8 @@ int board_mmc_init(bd_t *bis) u32 index; s32 status = 0; + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + for (index = 0; index < CONFIG_SYS_FSL_ESDHC_NUM; index++) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx6qarm2/mx6qarm2.c u-boot-imx-e1eb75b/board/freescale/mx6qarm2/mx6qarm2.c index d43b327..dad4b95 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx6qarm2/mx6qarm2.c +++ u-boot-imx-e1eb75b/board/freescale/mx6qarm2/mx6qarm2.c @@ -24,6 +24,7 @@ #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/mx6x_pins.h> +#include <asm/arch/clock.h> #include <asm/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> @@ -139,6 +140,9 @@ int board_mmc_init(bd_t *bis) s32 status = 0; u32 index = 0; + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); + usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK); + for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/freescale/mx6qsabrelite/mx6qsabrelite.c u-boot-imx-e1eb75b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index 4b4e89b..3af8437 100644 --- u-boot-imx-e1eb75b.orig/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ u-boot-imx-e1eb75b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -264,6 +264,9 @@ int board_mmc_init(bd_t *bis) s32 status = 0; u32 index = 0; + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); + usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK); + for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { switch (index) { case 0: diff --git u-boot-imx-e1eb75b.orig/board/genesi/mx51_efikamx/efikamx.c u-boot-imx-e1eb75b/board/genesi/mx51_efikamx/efikamx.c index cfd2e93..e334c01 100644 --- u-boot-imx-e1eb75b.orig/board/genesi/mx51_efikamx/efikamx.c +++ u-boot-imx-e1eb75b/board/genesi/mx51_efikamx/efikamx.c @@ -29,6 +29,7 @@ #include <asm/errno.h> #include <asm/arch/sys_proto.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <i2c.h> #include <mmc.h> #include <fsl_esdhc.h> @@ -349,6 +350,9 @@ int board_mmc_init(bd_t *bis) gpio_direction_input(EFIKASB_SDHC1_CD); } + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); + ret = fsl_esdhc_initialize(bis, &esdhc_cfg[0]); if (machine_is_efikasb()) { diff --git u-boot-imx-e1eb75b.orig/board/ttcontrol/vision2/vision2.c u-boot-imx-e1eb75b/board/ttcontrol/vision2/vision2.c index f28eab0..ba3307b 100644 --- u-boot-imx-e1eb75b.orig/board/ttcontrol/vision2/vision2.c +++ u-boot-imx-e1eb75b/board/ttcontrol/vision2/vision2.c @@ -28,6 +28,7 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/mx5x_pins.h> #include <asm/arch/crm_regs.h> +#include <asm/arch/clock.h> #include <asm/arch/iomux.h> #include <asm/gpio.h> #include <asm/arch/sys_proto.h> @@ -590,6 +591,7 @@ int board_mmc_init(bd_t *bis) mxc_iomux_set_pad(MX51_PIN_GPIO1_1, PAD_CTL_HYS_ENABLE); + esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); return fsl_esdhc_initialize(bis, &esdhc_cfg[0]); } #endif diff --git u-boot-imx-e1eb75b.orig/drivers/mmc/fsl_esdhc.c u-boot-imx-e1eb75b/drivers/mmc/fsl_esdhc.c index 3f8d30d..aa6a9f1 100644 --- u-boot-imx-e1eb75b.orig/drivers/mmc/fsl_esdhc.c +++ u-boot-imx-e1eb75b/drivers/mmc/fsl_esdhc.c @@ -410,12 +410,12 @@ esdhc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) return 0; } -void set_sysctl(struct mmc *mmc, uint clock) +static void set_sysctl(struct mmc *mmc, uint clock) { - int sdhc_clk = gd->sdhc_clk; int div, pre_div; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; volatile struct fsl_esdhc *regs = (struct fsl_esdhc *)cfg->esdhc_base; + int sdhc_clk = cfg->sdhc_clk; uint clk; if (clock < mmc->f_min) @@ -598,6 +598,7 @@ int fsl_esdhc_mmc_init(bd_t *bis) cfg = malloc(sizeof(struct fsl_esdhc_cfg)); memset(cfg, 0, sizeof(struct fsl_esdhc_cfg)); cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR; + cfg->sdhc_clk = gd->sdhc_clk; return fsl_esdhc_initialize(bis, cfg); } diff --git u-boot-imx-e1eb75b.orig/include/fsl_esdhc.h u-boot-imx-e1eb75b/include/fsl_esdhc.h index 4e321e7..47d2fe4 100644 --- u-boot-imx-e1eb75b.orig/include/fsl_esdhc.h +++ u-boot-imx-e1eb75b/include/fsl_esdhc.h @@ -167,6 +167,7 @@ struct fsl_esdhc_cfg { u32 esdhc_base; + u32 sdhc_clk; }; /* Select the correct accessors depending on endianess */

2 5

[U-Boot] [PATCH 1/7] mx35: Move clock enums to clock.h
by Benoît Thébaudeau 10 Oct '12

10 Oct '12

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/cpu/arm1136/mx35/generic.c | 4 +-- .../arch/arm/include/asm/arch-mx35/clock.h | 28 +++++++++++++++++++- .../arch/arm/include/asm/arch-mx35/imx-regs.h | 26 ------------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c index 986b1f9..dba4903 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c @@ -205,7 +205,7 @@ u32 imx_get_uartclk(void) return freq; } -unsigned int mxc_get_main_clock(enum mxc_main_clocks clk) +unsigned int mxc_get_main_clock(enum mxc_main_clock clk) { u32 nfc_pdf, hsp_podf; u32 pll, ret_val = 0, usb_prdf, usb_podf; @@ -270,7 +270,7 @@ unsigned int mxc_get_main_clock(enum mxc_main_clocks clk) return ret_val; } -unsigned int mxc_get_peri_clock(enum mxc_peri_clocks clk) +unsigned int mxc_get_peri_clock(enum mxc_peri_clock clk) { u32 ret_val = 0, pdf, pre_pdf, clk_sel; struct ccm_regs *ccm = diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/clock.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/clock.h index 4c0ddfd..5dc53ba 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/clock.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/clock.h @@ -25,7 +25,7 @@ #define __ASM_ARCH_CLOCK_H enum mxc_clock { - MXC_ARM_CLK = 0, + MXC_ARM_CLK, MXC_AHB_CLK, MXC_IPG_CLK, MXC_IPG_PERCLK, @@ -36,6 +36,32 @@ enum mxc_clock { MXC_FEC_CLK, }; +enum mxc_main_clock { + CPU_CLK, + AHB_CLK, + IPG_CLK, + IPG_PER_CLK, + NFC_CLK, + USB_CLK, + HSP_CLK, +}; + +enum mxc_peri_clock { + UART1_BAUD, + UART2_BAUD, + UART3_BAUD, + SSI1_BAUD, + SSI2_BAUD, + CSI_BAUD, + MSHC_CLK, + ESDHC1_CLK, + ESDHC2_CLK, + ESDHC3_CLK, + SPDIF_CLK, + SPI1_CLK, + SPI2_CLK, +}; + unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref); u32 imx_get_uartclk(void); diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h index 3146006..fba29b2 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h @@ -216,32 +216,6 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/types.h> -enum mxc_main_clocks { - CPU_CLK, - AHB_CLK, - IPG_CLK, - IPG_PER_CLK, - NFC_CLK, - USB_CLK, - HSP_CLK, -}; - -enum mxc_peri_clocks { - UART1_BAUD, - UART2_BAUD, - UART3_BAUD, - SSI1_BAUD, - SSI2_BAUD, - CSI_BAUD, - MSHC_CLK, - ESDHC1_CLK, - ESDHC2_CLK, - ESDHC3_CLK, - SPDIF_CLK, - SPI1_CLK, - SPI2_CLK, -}; - /* Clock Control Module (CCM) registers */ struct ccm_regs { u32 ccmr; /* Control */

3 30

[U-Boot] [PATCH 1/3] mx35: Remove duplicate GPIO3_BASE_ADDR
by Benoît Thébaudeau 10 Oct '12

10 Oct '12

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/include/asm/arch-mx35/imx-regs.h | 1 - 1 file changed, 1 deletion(-) diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h index 3146006..5cb7656 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h @@ -72,7 +72,6 @@ #define MMC_SDHC2_BASE_ADDR 0x53FB8000 #define MMC_SDHC3_BASE_ADDR 0x53FBC000 #define IPU_CTRL_BASE_ADDR 0x53FC0000 -#define GPIO3_BASE_ADDR 0x53FA4000 #define GPIO1_BASE_ADDR 0x53FCC000 #define GPIO2_BASE_ADDR 0x53FD0000 #define SDMA_BASE_ADDR 0x53FD4000

4 12

[U-Boot] [PATCH 3/4] EXYNOS: additional Exynos4 SoC series support
by snow.jhkim＠gmail.com 10 Oct '12

10 Oct '12

From: Jeong-Hyeon Kim <jhkim(a)insignal.co.kr> - Fixed MPLL register address It's different between Exynos4210 and Exynos4412. - Added pinmux functions for Exynos4 - Added extended gpios for Exynos4412 Exynos4412 has more gpios than Exynos4210. Signed-off-by: Jeong-Hyeon Kim <jhkim(a)insignal.co.kr> --- arch/arm/cpu/armv7/exynos/clock.c | 11 ++ arch/arm/cpu/armv7/exynos/pinmux.c | 241 ++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/clock.h | 27 ++++ arch/arm/include/asm/arch-exynos/cpu.h | 4 + arch/arm/include/asm/arch-exynos/gpio.h | 21 +++- 5 files changed, 303 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index 680aeeb..84a6725 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -79,14 +79,25 @@ static unsigned long exynos4_get_pll_clk(int pllreg) /* FOUT = (MDIV + K / 65536) * FIN / (PDIV * 2^SDIV) */ fout = (m + k / 65536) * (freq / (p * (1 << s))); } else if (pllreg == VPLL) { +#ifdef CONFIG_EXYNOS4210 k = k & 0xfff; /* FOUT = (MDIV + K / 1024) * FIN / (PDIV * 2^SDIV) */ fout = (m + k / 1024) * (freq / (p * (1 << s))); +#else + k = k & 0xffff; + /* FOUT = (MDIV + K / 65536) * FIN / (PDIV * 2^SDIV) */ + fout = (m + k / 65536) * (freq / (p * (1 << s))); +#endif } else { +#ifdef CONFIG_EXYNOS4210 if (s < 1) s = 1; /* FOUT = MDIV * FIN / (PDIV * 2^(SDIV - 1)) */ fout = m * (freq / (p * (1 << (s - 1)))); +#else + /* FOUT = MDIV * FIN / (PDIV * 2^SDIV) */ + fout = m * (freq / (p * (1 << s))); +#endif } return fout; diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index 7776add..0746878 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -26,6 +26,245 @@ #include <asm/arch/pinmux.h> #include <asm/arch/sromc.h> +static void exynos4_uart_config(int peripheral) +{ + struct exynos4_gpio_part1 *gpio1 = + (struct exynos4_gpio_part1 *) samsung_get_base_gpio_part1(); + struct s5p_gpio_bank *bank; + int i, start, count; + + 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)); + } +} + +static int exynos4_mmc_config(int peripheral, int flags) +{ + struct exynos4_gpio_part2 *gpio2 = + (struct exynos4_gpio_part2 *) samsung_get_base_gpio_part2(); + struct s5p_gpio_bank *bank, *bank_ext; + int i, start = 0, gpio_func = 0; + + switch (peripheral) { + case PERIPH_ID_SDMMC0: + bank = &gpio2->k0; + bank_ext = &gpio2->k1; + start = 3; + gpio_func = GPIO_FUNC(0x2); + break; + case PERIPH_ID_SDMMC1: + bank = &gpio2->k1; + bank_ext = NULL; + break; + case PERIPH_ID_SDMMC2: + bank = &gpio2->k2; + bank_ext = &gpio2->k3; + start = 3; + gpio_func = GPIO_FUNC(0x3); + break; + case PERIPH_ID_SDMMC3: + bank = &gpio2->k3; + 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 = start; i <= (start + 3); i++) { + s5p_gpio_cfg_pin(bank_ext, i, gpio_func); + 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); + } + return 0; +} + +static void exynos4_sromc_config(int flags) +{ + struct exynos4_gpio_part2 *gpio2 = + (struct exynos4_gpio_part2 *) samsung_get_base_gpio_part2(); + 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(&gpio2->y0, (flags & PINMUX_FLAG_BANK), + GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio2->y0, 4, GPIO_FUNC(2)); + s5p_gpio_cfg_pin(&gpio2->y0, 5, GPIO_FUNC(2)); + + for (i = 0; i < 4; i++) + s5p_gpio_cfg_pin(&gpio2->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(&gpio2->y3, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio2->y3, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio2->y5, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio2->y5, i, GPIO_PULL_UP); + + s5p_gpio_cfg_pin(&gpio2->y6, i, GPIO_FUNC(2)); + s5p_gpio_set_pull(&gpio2->y6, i, GPIO_PULL_UP); + } +} + +static void exynos4_i2c_config(int peripheral, int flags) +{ + + struct exynos4_gpio_part1 *gpio1 = + (struct exynos4_gpio_part1 *) samsung_get_base_gpio_part1(); + + switch (peripheral) { + case PERIPH_ID_I2C0: + s5p_gpio_cfg_pin(&gpio1->d1, 0, GPIO_FUNC(0x2)); + s5p_gpio_cfg_pin(&gpio1->d1, 1, GPIO_FUNC(0x2)); + break; + case PERIPH_ID_I2C1: + s5p_gpio_cfg_pin(&gpio1->d1, 2, GPIO_FUNC(0x2)); + s5p_gpio_cfg_pin(&gpio1->d1, 3, GPIO_FUNC(0x2)); + break; + case PERIPH_ID_I2C2: + s5p_gpio_cfg_pin(&gpio1->a0, 6, GPIO_FUNC(0x3)); + s5p_gpio_cfg_pin(&gpio1->a0, 7, GPIO_FUNC(0x3)); + break; + case PERIPH_ID_I2C3: + s5p_gpio_cfg_pin(&gpio1->a1, 2, GPIO_FUNC(0x3)); + s5p_gpio_cfg_pin(&gpio1->a1, 3, GPIO_FUNC(0x3)); + break; + case PERIPH_ID_I2C4: + s5p_gpio_cfg_pin(&gpio1->b, 0, GPIO_FUNC(0x3)); + s5p_gpio_cfg_pin(&gpio1->b, 1, GPIO_FUNC(0x3)); + break; + case PERIPH_ID_I2C5: + s5p_gpio_cfg_pin(&gpio1->b, 2, GPIO_FUNC(0x3)); + s5p_gpio_cfg_pin(&gpio1->b, 3, GPIO_FUNC(0x3)); + break; + case PERIPH_ID_I2C6: + s5p_gpio_cfg_pin(&gpio1->c1, 3, GPIO_FUNC(0x4)); + s5p_gpio_cfg_pin(&gpio1->c1, 4, GPIO_FUNC(0x4)); + break; + case PERIPH_ID_I2C7: + s5p_gpio_cfg_pin(&gpio1->d0, 2, GPIO_FUNC(0x3)); + s5p_gpio_cfg_pin(&gpio1->d0, 3, GPIO_FUNC(0x3)); + break; + } +} + +static int exynos4_pinmux_config(int peripheral, int flags) +{ + switch (peripheral) { + case PERIPH_ID_UART0: + case PERIPH_ID_UART1: + case PERIPH_ID_UART2: + case PERIPH_ID_UART3: + exynos4_uart_config(peripheral); + break; + case PERIPH_ID_SDMMC0: + case PERIPH_ID_SDMMC1: + case PERIPH_ID_SDMMC2: + case PERIPH_ID_SDMMC3: + return exynos4_mmc_config(peripheral, flags); + case PERIPH_ID_SROMC: + exynos4_sromc_config(flags); + break; + case PERIPH_ID_I2C0: + case PERIPH_ID_I2C1: + case PERIPH_ID_I2C2: + case PERIPH_ID_I2C3: + case PERIPH_ID_I2C4: + case PERIPH_ID_I2C5: + case PERIPH_ID_I2C6: + case PERIPH_ID_I2C7: + exynos4_i2c_config(peripheral, flags); + break; + default: + debug("%s: invalid peripheral %d", __func__, peripheral); + return -1; + } + + return 0; +} + static void exynos5_uart_config(int peripheral) { struct exynos5_gpio_part1 *gpio1 = @@ -269,6 +508,8 @@ int exynos_pinmux_config(int peripheral, int flags) { if (cpu_is_exynos5()) return exynos5_pinmux_config(peripheral, flags); + else if (cpu_is_exynos4()) + return exynos4_pinmux_config(peripheral, flags); else { debug("pinmux functionality not supported\n"); return -1; diff --git a/arch/arm/include/asm/arch-exynos/clock.h b/arch/arm/include/asm/arch-exynos/clock.h index fce38ef..e238810 100644 --- a/arch/arm/include/asm/arch-exynos/clock.h +++ b/arch/arm/include/asm/arch-exynos/clock.h @@ -57,10 +57,20 @@ struct exynos4_clock { unsigned char res16[0xec]; unsigned int epll_con0; unsigned int epll_con1; +#ifdef CONFIG_EXYNOS4210 unsigned char res17[0x8]; +#else + unsigned int epll_con2; + unsigned char res17[0x4]; +#endif unsigned int vpll_con0; unsigned int vpll_con1; +#ifdef CONFIG_EXYNOS4210 unsigned char res18[0xe8]; +#else + unsigned int vpll_con2; + unsigned char res18[0xe4]; +#endif unsigned int src_top0; unsigned int src_top1; unsigned char res19[0x8]; @@ -161,7 +171,16 @@ struct exynos4_clock { unsigned char res38[0x8c]; unsigned int clkout_cmu_top; unsigned int clkout_cmu_top_div_stat; +#ifdef CONFIG_EXYNOS4210 unsigned char res39[0x37f8]; +#else + unsigned char res39[0x3600]; + unsigned int mpll_lock; + unsigned char res3a[0xfc]; + unsigned int mpll_con0; + unsigned int mpll_con1; + unsigned char res3b[0xf0]; +#endif unsigned int src_dmc; unsigned char res40[0xfc]; unsigned int src_mask_dmc; @@ -195,14 +214,22 @@ struct exynos4_clock { unsigned int maxperf; unsigned char res51[0x2f78]; unsigned int apll_lock; +#ifdef CONFIG_EXYNOS4210 unsigned char res52[0x4]; unsigned int mpll_lock; +#else + unsigned char res52[0x8]; +#endif unsigned char res53[0xf4]; unsigned int apll_con0; unsigned int apll_con1; +#ifdef CONFIG_EXYNOS4210 unsigned int mpll_con0; unsigned int mpll_con1; unsigned char res54[0xf0]; +#else + unsigned char res54[0xf8]; +#endif unsigned int src_cpu; unsigned char res55[0x1fc]; unsigned int mux_stat_cpu; diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 2cd4ae1..d1117c0 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -55,7 +55,11 @@ #define EXYNOS4_MODEM_BASE 0x13A00000 #define EXYNOS4_USBPHY_CONTROL 0x10020704 +#ifdef CONFIG_EXYNOS4412 +#define EXYNOS4_GPIO_PART4_BASE 0x106E0000 +#else #define EXYNOS4_GPIO_PART4_BASE DEVICE_NOT_AVAILABLE +#endif #define EXYNOS4_DP_BASE DEVICE_NOT_AVAILABLE /* EXYNOS5 */ diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h index 97be4ea..9539aa0 100644 --- a/arch/arm/include/asm/arch-exynos/gpio.h +++ b/arch/arm/include/asm/arch-exynos/gpio.h @@ -49,6 +49,9 @@ struct exynos4_gpio_part1 { struct s5p_gpio_bank f1; struct s5p_gpio_bank f2; struct s5p_gpio_bank f3; + struct s5p_gpio_bank res1[2]; + struct s5p_gpio_bank j0; + struct s5p_gpio_bank j1; }; struct exynos4_gpio_part2 { @@ -68,7 +71,13 @@ struct exynos4_gpio_part2 { struct s5p_gpio_bank y4; struct s5p_gpio_bank y5; struct s5p_gpio_bank y6; - struct s5p_gpio_bank res1[80]; + struct s5p_gpio_bank res1[3]; + struct s5p_gpio_bank m0; + struct s5p_gpio_bank m1; + struct s5p_gpio_bank m2; + struct s5p_gpio_bank m3; + struct s5p_gpio_bank m4; + struct s5p_gpio_bank res2[72]; struct s5p_gpio_bank x0; struct s5p_gpio_bank x1; struct s5p_gpio_bank x2; @@ -79,6 +88,16 @@ struct exynos4_gpio_part3 { struct s5p_gpio_bank z; }; +struct exynos4_gpio_part4 { + struct s5p_gpio_bank v0; + struct s5p_gpio_bank v1; + struct s5p_gpio_bank res1[1]; + struct s5p_gpio_bank v2; + struct s5p_gpio_bank v3; + struct s5p_gpio_bank res2[1]; + struct s5p_gpio_bank v4; +}; + struct exynos5_gpio_part1 { struct s5p_gpio_bank a0; struct s5p_gpio_bank a1; -- 1.7.1

3 5

[U-Boot] [PATCH 00/71] serial: Massive rework of the serial subsystem
by Marek Vasut 10 Oct '12

10 Oct '12

This patchset is a STAGE 1 of preparation of the stdio and serial subsys for the driver model. The idea of this patchset is: 1) Clean up the struct serial_device Do a coding style cleanup. 2) Replace .init and .uninit with .start and .stop This is to bring struct serial_device much closer to struct stdio_dev so later on, these structures can be overlayed and struct serial_device can be easily passed to stdio subsystem directly. 3) Do minor cleanups on the PXA and MPC512X Basically for PXA this means to remove default_serial_console() call from every single PXA board and move it into PXA serial driver. For MPC512X, that means properly defining PSC console number. 4) Add support for CONFIG_SERIAL_MULTI into every single driver Implement support for both non-multi and multi operation into every single serial driver in the U-Boot source tree. This is a vast majority of this patchset. 5) Unconditionally enable CONFIG_SERIAL_MULTI Enable the multi operation throughout the whole U-Boot tree, both for SPL and non-SPL builds. There was also some breakage due to this, so this patchset also addresses that with minor fixes. 6) Remove unused code used for the non-multi operation Remove code that was used when CONFIG_SERIAL_MULTI was not selected. Also remove all occurances of CONFIG_SERIAL_MULTI throughout the source tree. Some parts of the code must have been adjusted to cope with this since they were initially only written for non-multi operation. These were minor adjustments mostly in macros though. This changeset obviously does mean size growth of U-Boot, therefore some statistics (stock U-Boot first, patchset last): Configuring for omap3_beagle board... text data bss dec hex filename 325687 8456 266888 601031 92bc7 ./u-boot 326912 8648 266944 602504 93188 ./u-boot 43082 1812 198020 242914 3b4e2 ./spl/u-boot-spl 45794 1860 198020 245674 3bfaa ./spl/u-boot-spl Configuring for P1020RDB-PC_36BIT_SPIFLASH - Board: p1_p2_rdb_pc, Options: P1020RDB,36BIT,SPIFLASH text data bss dec hex filename 392469 30628 267568 690665 a89e9 ./u-boot 394550 30940 267600 693090 a9362 ./u-boot Configuring for grsim_leon2 board... text data bss dec hex filename 95658 3328 2640 101626 18cfa ./u-boot 97058 3384 2640 103082 192aa ./u-boot Configuring for sandbox board... text data bss dec hex filename 137394 6364 28488 172246 2a0d6 ./u-boot 138674 6456 28504 173634 2a642 ./u-boot Marek Vasut (71): serial: Coding style cleanup of struct serial_device serial: Rename .init() and .uninit() in serial_device serial: Properly spell out the structure member names of serial_driver serial: pxa: Implement default_serial_console in serial_pxa.c serial: pxa: Make use of default_serial_console in serial_pxa serial: pxa: Make local functions static serial: mpc512x: Properly define CONFIG_SYS_PSC3 in config files serial: Implement serial_initfunc() macro serial: mpc8xx: Move serial registration from serial_initialize() serial: s3c24xx: Move serial registration from serial_initialize() serial: pxa: Move serial registration from serial_initialize() serial: s5p: Move serial registration from serial_initialize() serial: microblaze: Move serial registration from serial_initialize() serial: mpc512x: Move serial registration from serial_initialize() serial: ns16550: Move serial registration from serial_initialize() serial: bfin: Remove the bfin_serialN_device exports from serial.h serial: bfin: Adjust serial_register_bfin_uart() serial: zoom2: Remove zoom2 serial prototypes from serial.h serial: bfin: Flip the jtag serial console to CONFIG_SERIAL_MULTI serial: mips: Implement CONFIG_SERIAL_MULTI into au1x00 serial driver serial: mips: Implement CONFIG_SERIAL_MULTI into asc serial driver serial: mips: Implement CONFIG_SERIAL_MULTI into JZ serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc5xx serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc8220 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc8260 serial drivers serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc85xx serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into iop480 serial driver serial: sparc: Implement CONFIG_SERIAL_MULTI into leon2 serial driver serial: sparc: Implement CONFIG_SERIAL_MULTI into leon3 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into marvell serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into amirix serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into bmw serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into cogent serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into cpci750 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into evb64260 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into ml2 serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into sconsole serial driver serial: powerpc: Implement CONFIG_SERIAL_MULTI into p3mx serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into altera_jtag serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into altera serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into atmel serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lpc32xx serial driver serial: mcf: Implement CONFIG_SERIAL_MULTI into MCF serial driver serial: Implement CONFIG_SERIAL_MULTI into ns9750 serial driver serial: oc: Implement CONFIG_SERIAL_MULTI into OpenCores serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c4510b serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c64xx serial driver serial: sandbox: Implement CONFIG_SERIAL_MULTI into sandbox serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into clps7111 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into imx serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into ixp serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into ks8695 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lh7a40x serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into lpc2292 serial driver serial: Implement CONFIG_SERIAL_MULTI into max3100 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into mxc serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into netarm serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into pl01x serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into s3c44b0 serial driver serial: arm: Implement CONFIG_SERIAL_MULTI into sa1100 serial driver serial: sh: Implement CONFIG_SERIAL_MULTI into sh serial driver serial: spl: Implement empty functions for SPL serial: mxs: spl: Remove empty serial_* functions from SPL code serial: ns16550: Call usbtty_poll only in non-SPL build serial: Use puts() and hang() instead of panic() in SPL serial: Unconditionally enable CONFIG_SERIAL_MULTI serial: Remove CONFIG_SERIAL_MULTI from config files serial: Remove CONFIG_SERIAL_MULTI from serial drivers serial: Remove CONFIG_SERIAL_MULTI from remaining sources serial: Compile common/serial.c by default serial: Enhance the manual relocation arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 4 - arch/arm/lib/board.c | 2 - arch/blackfin/cpu/jtag-console.c | 37 +++- arch/blackfin/cpu/serial.c | 6 +- arch/blackfin/lib/board.c | 2 - arch/m68k/lib/board.c | 2 - arch/microblaze/lib/board.c | 2 - arch/mips/cpu/mips32/au1x00/au1x00_serial.c | 42 ++++- arch/mips/cpu/mips32/incaip/asc_serial.c | 35 +++- arch/mips/cpu/xburst/jz_serial.c | 35 +++- arch/nds32/lib/board.c | 2 - arch/powerpc/cpu/mpc512x/serial.c | 92 +++------- arch/powerpc/cpu/mpc5xx/serial.c | 69 ++++--- arch/powerpc/cpu/mpc5xxx/serial.c | 181 ++++++------------- arch/powerpc/cpu/mpc8220/uart.c | 35 +++- arch/powerpc/cpu/mpc8260/serial_scc.c | 39 ++-- arch/powerpc/cpu/mpc8260/serial_smc.c | 39 ++-- arch/powerpc/cpu/mpc85xx/serial_scc.c | 39 ++-- arch/powerpc/cpu/mpc8xx/serial.c | 43 +++-- arch/powerpc/cpu/ppc4xx/iop480_uart.c | 36 +++- arch/powerpc/lib/board.c | 2 - arch/sandbox/lib/board.c | 2 - arch/sparc/cpu/leon2/serial.c | 51 ++++-- arch/sparc/cpu/leon3/serial.c | 51 ++++-- arch/x86/lib/board.c | 2 - board/Marvell/common/serial.c | 48 +++-- board/amirix/ap1000/serial.c | 35 +++- board/balloon3/balloon3.c | 5 - board/bmw/serial.c | 36 +++- board/cogent/serial.c | 34 +++- board/esd/cpci750/serial.c | 36 +++- board/evb64260/serial.c | 54 ++++-- board/logicpd/zoom2/zoom2_serial.c | 7 +- board/logicpd/zoom2/zoom2_serial.h | 16 +- board/ml2/serial.c | 35 +++- board/palmld/palmld.c | 5 - board/palmtc/palmtc.c | 5 - board/pcippc2/sconsole.c | 35 +++- board/pdm360ng/pdm360ng.c | 6 - board/prodrive/p3mx/serial.c | 36 +++- board/toradex/colibri_pxa270/colibri_pxa270.c | 5 - board/trizepsiv/conxs.c | 7 - board/vpac270/vpac270.c | 5 - board/zipitz2/zipitz2.c | 5 - common/Makefile | 2 +- common/cmd_nvedit.c | 2 - common/fdt_support.c | 4 - common/iomux.c | 2 - common/serial.c | 241 ++++++++++++++++--------- common/stdio.c | 2 - drivers/serial/altera_jtag_uart.c | 39 +++- drivers/serial/altera_uart.c | 51 ++++-- drivers/serial/atmel_usart.c | 35 +++- drivers/serial/lpc32xx_hsuart.c | 57 +++--- drivers/serial/mcfuart.c | 33 +++- drivers/serial/ns16550.c | 2 +- drivers/serial/ns9750_serial.c | 33 +++- drivers/serial/opencores_yanu.c | 35 +++- drivers/serial/s3c4510b_uart.c | 33 +++- drivers/serial/s3c64xx.c | 33 +++- drivers/serial/sandbox.c | 35 +++- drivers/serial/serial.c | 128 +++---------- drivers/serial/serial_clps7111.c | 34 +++- drivers/serial/serial_imx.c | 36 +++- drivers/serial/serial_ixp.c | 36 +++- drivers/serial/serial_ks8695.c | 41 ++++- drivers/serial/serial_lh7a40x.c | 34 +++- drivers/serial/serial_lpc2292.c | 34 +++- drivers/serial/serial_max3100.c | 42 +++-- drivers/serial/serial_mxc.c | 40 ++-- drivers/serial/serial_netarm.c | 33 +++- drivers/serial/serial_pl01x.c | 37 +++- drivers/serial/serial_pxa.c | 65 ++++--- drivers/serial/serial_s3c24x0.c | 78 ++------ drivers/serial/serial_s3c44b0.c | 36 +++- drivers/serial/serial_s5p.c | 27 ++- drivers/serial/serial_sa1100.c | 36 +++- drivers/serial/serial_sh.c | 33 +++- drivers/serial/serial_xuartlite.c | 70 +++---- include/common.h | 12 -- include/configs/DU440.h | 1 - include/configs/KAREF.h | 1 - include/configs/METROBOX.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/P1010RDB.h | 1 - include/configs/P1_P2_RDB.h | 1 - include/configs/P2020COME.h | 1 - include/configs/PMC440.h | 1 - include/configs/TB5200.h | 1 - include/configs/amcc-common.h | 1 - include/configs/aria.h | 1 + include/configs/balloon3.h | 1 + include/configs/bfin_adi_common.h | 1 - include/configs/colibri_pxa270.h | 1 + include/configs/coreboot.h | 1 - include/configs/eNET.h | 1 - include/configs/harmony.h | 1 - include/configs/jadecpu.h | 1 - include/configs/korat.h | 1 - include/configs/lubbock.h | 1 + include/configs/lwmon.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mcc200.h | 5 - include/configs/mecp5123.h | 1 + include/configs/medcom.h | 1 - include/configs/mpc5121ads.h | 1 + include/configs/omap3_zoom2.h | 3 +- include/configs/origen.h | 1 - include/configs/palmld.h | 1 + include/configs/palmtc.h | 1 + include/configs/paz00.h | 1 - include/configs/pcs440ep.h | 1 - include/configs/pdm360ng.h | 3 - include/configs/plutux.h | 1 - include/configs/pxa255_idp.h | 1 + include/configs/quad100hd.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/sc3.h | 1 - include/configs/seaboard.h | 1 - include/configs/smdk5250.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/tec.h | 1 - include/configs/tegra20-common-post.h | 5 - include/configs/trats.h | 1 - include/configs/trimslice.h | 1 - include/configs/trizepsiv.h | 2 +- include/configs/ventana.h | 1 - include/configs/vpac270.h | 1 + include/configs/whistler.h | 1 - include/configs/xaeniax.h | 2 +- include/configs/zeus.h | 1 - include/configs/zipitz2.h | 1 + include/serial.h | 79 ++------ post/board/pdm360ng/coproc_com.c | 3 - 136 files changed, 1740 insertions(+), 1166 deletions(-) Cc: Tom Rini <trini(a)ti.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> Cc: Mike Frysinger <vapier(a)gentoo.org> Cc: Michal Simek <monstr(a)monstr.eu> Cc: U-Boot DM <u-boot-dm(a)lists.denx.de> -- 1.7.10.4

15 305

[U-Boot] [PATCH v2] tools: Add cleanpatch
by Fabio Estevam 09 Oct '12

09 Oct '12

There are some errors reported by checkpatch.pl that can be easily cleaned up by using the cleanpatch tool. Import the cleanpatch script from linux kernel 3.5.4 stable version as from the following commit: commit cb3ed5b7e09c6c0462e396d55e3fecc0980a333a Author: H. Peter Anvin <hpa(a)zytor.com> Date: Fri May 25 17:58:26 2007 -0700 scripts: Make cleanfile/cleanpatch warn about long lines Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Add linux kernel commit id tools/cleanpatch | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) create mode 100755 tools/cleanpatch diff --git a/tools/cleanpatch b/tools/cleanpatch new file mode 100755 index 0000000..9680d03 --- /dev/null +++ b/tools/cleanpatch @@ -0,0 +1,258 @@ +#!/usr/bin/perl -w +# +# Clean a patch file -- or directory of patch files -- of stealth whitespace. +# WARNING: this can be a highly destructive operation. Use with caution. +# + +use bytes; +use File::Basename; + +# Default options +$max_width = 79; + +# Clean up space-tab sequences, either by removing spaces or +# replacing them with tabs. +sub clean_space_tabs($) +{ + no bytes; # Tab alignment depends on characters + + my($li) = @_; + my($lo) = ''; + my $pos = 0; + my $nsp = 0; + my($i, $c); + + for ($i = 0; $i < length($li); $i++) { + $c = substr($li, $i, 1); + if ($c eq "\t") { + my $npos = ($pos+$nsp+8) & ~7; + my $ntab = ($npos >> 3) - ($pos >> 3); + $lo .= "\t" x $ntab; + $pos = $npos; + $nsp = 0; + } elsif ($c eq "\n" || $c eq "\r") { + $lo .= " " x $nsp; + $pos += $nsp; + $nsp = 0; + $lo .= $c; + $pos = 0; + } elsif ($c eq " ") { + $nsp++; + } else { + $lo .= " " x $nsp; + $pos += $nsp; + $nsp = 0; + $lo .= $c; + $pos++; + } + } + $lo .= " " x $nsp; + return $lo; +} + +# Compute the visual width of a string +sub strwidth($) { + no bytes; # Tab alignment depends on characters + + my($li) = @_; + my($c, $i); + my $pos = 0; + my $mlen = 0; + + for ($i = 0; $i < length($li); $i++) { + $c = substr($li,$i,1); + if ($c eq "\t") { + $pos = ($pos+8) & ~7; + } elsif ($c eq "\n") { + $mlen = $pos if ($pos > $mlen); + $pos = 0; + } else { + $pos++; + } + } + + $mlen = $pos if ($pos > $mlen); + return $mlen; +} + +$name = basename($0); + +@files = (); + +while (defined($a = shift(@ARGV))) { + if ($a =~ /^-/) { + if ($a eq '-width' || $a eq '-w') { + $max_width = shift(@ARGV)+0; + } else { + print STDERR "Usage: $name [-width #] files...\n"; + exit 1; + } + } else { + push(@files, $a); + } +} + +foreach $f ( @files ) { + print STDERR "$name: $f\n"; + + if (! -f $f) { + print STDERR "$f: not a file\n"; + next; + } + + if (!open(FILE, '+<', $f)) { + print STDERR "$name: Cannot open file: $f: $!\n"; + next; + } + + binmode FILE; + + # First, verify that it is not a binary file; consider any file + # with a zero byte to be a binary file. Is there any better, or + # additional, heuristic that should be applied? + $is_binary = 0; + + while (read(FILE, $data, 65536) > 0) { + if ($data =~ /\0/) { + $is_binary = 1; + last; + } + } + + if ($is_binary) { + print STDERR "$name: $f: binary file\n"; + next; + } + + seek(FILE, 0, 0); + + $in_bytes = 0; + $out_bytes = 0; + $lineno = 0; + + @lines = (); + + $in_hunk = 0; + $err = 0; + + while ( defined($line = <FILE>) ) { + $lineno++; + $in_bytes += length($line); + + if (!$in_hunk) { + if ($line =~ + /^\@\@\s+\-([0-9]+),([0-9]+)\s+\+([0-9]+),([0-9]+)\s\@\@/) { + $minus_lines = $2; + $plus_lines = $4; + if ($minus_lines || $plus_lines) { + $in_hunk = 1; + @hunk_lines = ($line); + } + } else { + push(@lines, $line); + $out_bytes += length($line); + } + } else { + # We're in a hunk + + if ($line =~ /^\+/) { + $plus_lines--; + + $text = substr($line, 1); + $text =~ s/[ \t\r]*$//; # Remove trailing spaces + $text = clean_space_tabs($text); + + $l_width = strwidth($text); + if ($max_width && $l_width > $max_width) { + print STDERR + "$f:$lineno: adds line exceeds $max_width ", + "characters ($l_width)\n"; + } + + push(@hunk_lines, '+'.$text); + } elsif ($line =~ /^\-/) { + $minus_lines--; + push(@hunk_lines, $line); + } elsif ($line =~ /^ /) { + $plus_lines--; + $minus_lines--; + push(@hunk_lines, $line); + } else { + print STDERR "$name: $f: malformed patch\n"; + $err = 1; + last; + } + + if ($plus_lines < 0 || $minus_lines < 0) { + print STDERR "$name: $f: malformed patch\n"; + $err = 1; + last; + } elsif ($plus_lines == 0 && $minus_lines == 0) { + # End of a hunk. Process this hunk. + my $i; + my $l; + my @h = (); + my $adj = 0; + my $done = 0; + + for ($i = scalar(@hunk_lines)-1; $i > 0; $i--) { + $l = $hunk_lines[$i]; + if (!$done && $l eq "+\n") { + $adj++; # Skip this line + } elsif ($l =~ /^[ +]/) { + $done = 1; + unshift(@h, $l); + } else { + unshift(@h, $l); + } + } + + $l = $hunk_lines[0]; # Hunk header + undef @hunk_lines; # Free memory + + if ($adj) { + die unless + ($l =~ /^\@\@\s+\-([0-9]+),([0-9]+)\s+\+([0-9]+),([0-9]+)\s\@\@(.*)$/); + my $mstart = $1; + my $mlin = $2; + my $pstart = $3; + my $plin = $4; + my $tail = $5; # doesn't include the final newline + + $l = sprintf("@@ -%d,%d +%d,%d @@%s\n", + $mstart, $mlin, $pstart, $plin-$adj, + $tail); + } + unshift(@h, $l); + + # Transfer to the output array + foreach $l (@h) { + $out_bytes += length($l); + push(@lines, $l); + } + + $in_hunk = 0; + } + } + } + + if ($in_hunk) { + print STDERR "$name: $f: malformed patch\n"; + $err = 1; + } + + if (!$err) { + if ($in_bytes != $out_bytes) { + # Only write to the file if changed + seek(FILE, 0, 0); + print FILE @lines; + + if ( !defined($where = tell(FILE)) || + !truncate(FILE, $where) ) { + die "$name: Failed to truncate modified file: $f: $!\n"; + } + } + } + + close(FILE); +} -- 1.7.9.5

2 1

[U-Boot] [PATCH] add check infrastructure, default sparse
by Kim Phillips 09 Oct '12

09 Oct '12

Add support for running source code checkers on u-boot source, e.g., using sparse to aid with typechecking. This comes in especially handy as SoC vendors mix and match cores and devices with different endianness, thus here we add CHECK_ENDIAN to the otherwise linux kernel default CHECKFLAGS. Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- Makefile | 18 ++++++++++++++++++ config.mk | 9 +++++++++ 2 files changed, 27 insertions(+) diff --git a/Makefile b/Makefile index 058fb53..6969763 100644 --- a/Makefile +++ b/Makefile @@ -92,6 +92,24 @@ BUILD_DIR := $(O) endif endif +# Call a source code checker (by default, "sparse") as part of the +# C compilation. +# +# Use 'make C=1' to enable checking of re-compiled files. +# +# See the linux kernel file "Documentation/sparse.txt" for more details, +# including where to get the "sparse" utility. + +ifdef C +ifeq ("$(origin C)", "command line") +CHECKSRC := $(C) +endif +endif +ifndef CHECKSRC + CHECKSRC = 0 +endif +export CHECKSRC + ifneq ($(BUILD_DIR),) saved-output := $(BUILD_DIR) diff --git a/config.mk b/config.mk index c3822a2..e572902 100644 --- a/config.mk +++ b/config.mk @@ -148,6 +148,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump RANLIB = $(CROSS_COMPILE)RANLIB DTC = dtc +CHECK = sparse ######################################################################### @@ -274,6 +275,10 @@ ifneq ($(CONFIG_SPL_TEXT_BASE),) LDFLAGS_u-boot-spl += -Ttext $(CONFIG_SPL_TEXT_BASE) endif +# Linus' kernel sanity checking tool +CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ + -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF) + # Location of a usable BFD library, where we define "usable" as # "built for ${HOST}, supports ${TARGET}". Sensible values are # - When cross-compiling: the root of the cross-environment @@ -321,6 +326,9 @@ $(obj)%.s: %.S $(obj)%.o: %.S $(CC) $(ALL_AFLAGS) -o $@ $< -c $(obj)%.o: %.c +ifneq ($(CHECKSRC),0) + $(CHECK) $(CHECKFLAGS) $(ALL_CFLAGS) $< +endif $(CC) $(ALL_CFLAGS) -o $@ $< -c $(obj)%.i: %.c $(CPP) $(ALL_CFLAGS) -o $@ $< -c -- 1.7.12

2 4