November 2015 - U-Boot

[U-Boot] [v2] please pull u-boot-samsung master
by Minkyu Kang 05 Nov '15

05 Nov '15

Dear Tom, The following changes since commit 0e067a65f57189703668826d9841fea477026bf6: x86: Select the ns16550 debug UART for minnowmax, chromebook_link (2015-10-30 18:04:14 -0400) are available in the git repository at: http://git.denx.de/u-boot-samsung for you to fetch changes up to 58cb44cf6623faeebd9b04ac44cf11d2eb39ea36: sandbox: adc: Add missing header file (2015-11-05 12:58:04 +0900) ---------------------------------------------------------------- Minkyu Kang (5): arm: exynos: clean up checkpatch issues smdkv310: clean up checkpatch issues smdk2410: clean up checkpatch issues odroid: clean up checkpatch issues samsung: clean up checkpatch issues Przemyslaw Marczak (17): samsung: board/misc: check returned pointer for get_board_type() calls s5p: cpu_info: print "cpu-model" if exists in dts Peach-Pi: dts: add cpu-model string Exynos5422/5800: set cpu id to 0x5422 dm: pmic: add s2mps11 PMIC I/O driver dm: regulator: add function device_get_supply_regulator() dm: adc: add simple ADC uclass implementation dm: adc: add Exynos54xx compatible ADC driver Odroid-XU3: enable s2mps11 PMIC support Exynos54xx: dts: add ADC node Odroid-XU3: dts: enable ADC, with request for pre-reloc bind exynos5-dt-types: add board detection for Odroid XU3/XU3L/XU4. sandbox: add ADC driver sandbox: add ADC unit tests Exynos4412: pinmux: disable pull for MMC pins s5p sdhci: call pinmux for card's gpio pins before use them sandbox: adc: Add missing header file arch/arm/cpu/armv7/s5p-common/cpu_info.c | 14 +- arch/arm/dts/exynos5422-odroidxu3.dts | 12 + arch/arm/dts/exynos54xx.dtsi | 7 + arch/arm/dts/exynos5800-peach-pi.dts | 1 + arch/arm/mach-exynos/clock.c | 16 +- arch/arm/mach-exynos/clock_init_exynos5.c | 2 +- arch/arm/mach-exynos/common_setup.h | 4 +- arch/arm/mach-exynos/dmc_init_ddr3.c | 8 +- arch/arm/mach-exynos/include/mach/adc.h | 44 ++++ arch/arm/mach-exynos/include/mach/cpu.h | 6 +- arch/arm/mach-exynos/include/mach/gpio.h | 4 +- arch/arm/mach-exynos/pinmux.c | 4 +- arch/arm/mach-exynos/power.c | 2 +- arch/sandbox/dts/sandbox_pmic.dtsi | 2 +- arch/sandbox/dts/test.dts | 6 + board/samsung/common/Makefile | 5 +- board/samsung/common/board.c | 4 +- board/samsung/common/exynos5-dt-types.c | 196 ++++++++++++++ board/samsung/common/exynos5-dt.c | 12 + board/samsung/common/misc.c | 10 +- board/samsung/odroid/odroid.c | 15 +- board/samsung/smdk2410/smdk2410.c | 10 +- board/samsung/smdkv310/smdkv310.c | 8 +- configs/odroid-xu3_defconfig | 5 + configs/sandbox_defconfig | 2 + doc/device-tree-bindings/adc/adc.txt | 62 +++++ doc/device-tree-bindings/exynos/soc.txt | 21 ++ doc/device-tree-bindings/pmic/s2mps11.txt | 17 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/adc/Kconfig | 30 +++ drivers/adc/Makefile | 10 + drivers/adc/adc-uclass.c | 409 +++++++++++++++++++++++++++++ drivers/adc/exynos-adc.c | 145 ++++++++++ drivers/adc/sandbox.c | 174 ++++++++++++ drivers/mmc/s5p_sdhci.c | 14 +- drivers/power/pmic/Kconfig | 14 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/s2mps11.c | 62 +++++ drivers/power/regulator/regulator-uclass.c | 7 + include/adc.h | 288 ++++++++++++++++++++ include/configs/odroid_xu3.h | 12 + include/dm/uclass-id.h | 1 + include/power/regulator.h | 16 ++ include/power/s2mps11.h | 109 ++++++++ include/power/sandbox_pmic.h | 4 + include/samsung/exynos5-dt-types.h | 27 ++ include/sandbox-adc.h | 31 +++ test/dm/Makefile | 1 + test/dm/adc.c | 165 ++++++++++++ 50 files changed, 1966 insertions(+), 56 deletions(-) create mode 100644 board/samsung/common/exynos5-dt-types.c create mode 100644 doc/device-tree-bindings/adc/adc.txt create mode 100644 doc/device-tree-bindings/exynos/soc.txt create mode 100644 doc/device-tree-bindings/pmic/s2mps11.txt create mode 100644 drivers/adc/Kconfig create mode 100644 drivers/adc/Makefile create mode 100644 drivers/adc/adc-uclass.c create mode 100644 drivers/adc/exynos-adc.c create mode 100644 drivers/adc/sandbox.c create mode 100644 drivers/power/pmic/s2mps11.c create mode 100644 include/adc.h create mode 100644 include/power/s2mps11.h create mode 100644 include/samsung/exynos5-dt-types.h create mode 100644 include/sandbox-adc.h create mode 100644 test/dm/adc.c -- Thanks, Minkyu Kang.

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 05 Nov '15

05 Nov '15

The following changes since commit 96d59e9d6aa74e35c63dc74da10e41f8ba0f6de4: mpc85xx/t2081: enable parsing DDR ratio for T2081 rev1.1 (2015-11-02 08:51:50 -0800) are available in the git repository at: git://git.denx.de/u-boot-usb.git for you to fetch changes up to f6fcebf5c181365a3c9ebc672d88121d54359eed: usb: udc: Fix warnings on 64-bit builds (2015-11-03 17:29:54 +0100) ---------------------------------------------------------------- Hans de Goede (1): ohci: Add missing cache-flush for hcca area Michal Simek (3): usb: dwc3: Fix warnings on 64-bit builds usb: lthor: Specify correct parameter for sizeof type usb: udc: Fix warnings on 64-bit builds Tom Rini (1): common/usb_storage.c: Clean up usb_storage_probe() Vignesh R (2): dfu: dfu_sf: Pass duplicate devstr to parse_dev ARM: dra7xx_evm: Add DFU support for qspi flash common/usb_storage.c | 29 ++--------------------------- drivers/dfu/dfu_sf.c | 4 +++- drivers/usb/dwc3/core.c | 7 ++++--- drivers/usb/dwc3/ep0.c | 10 +++++----- drivers/usb/dwc3/gadget.c | 10 +++++----- drivers/usb/dwc3/io.h | 4 ++-- drivers/usb/gadget/f_thor.c | 2 +- drivers/usb/gadget/udc/udc-core.c | 2 +- drivers/usb/host/ohci-hcd.c | 1 + include/configs/dra7xx_evm.h | 16 +++++++++++++++- 10 files changed, 39 insertions(+), 46 deletions(-)

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 05 Nov '15

05 Nov '15

The following changes since commit 96d59e9d6aa74e35c63dc74da10e41f8ba0f6de4: mpc85xx/t2081: enable parsing DDR ratio for T2081 rev1.1 (2015-11-02 08:51:50 -0800) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git for you to fetch changes up to a55f28624e97e1e43ac333c39713b8b9435fcbd3: arm: dts: socfpga: Increase the spi-max-frequency for QSPI flash (2015-11-05 02:34:15 +0100) ---------------------------------------------------------------- Chin Liang See (5): lib, fdt: Adding fdtdec_get_uint function spi: cadence_qspi: Ensure spi_calibration is run when sclk change spi: cadence_qspi: Fix fdt read of spi-max-frequency spi: cadence_qspi: Ensure check for max frequency in place arm: dts: socfpga: Increase the spi-max-frequency for QSPI flash Dinh Nguyen (1): arm: socfpga: reset: correct dma, qspi, and sdmmc reset bit defines arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 +- arch/arm/mach-socfpga/include/mach/reset_manager.h | 6 +++--- drivers/spi/cadence_qspi.c | 33 ++++++++++++++++++++------------- drivers/spi/cadence_qspi.h | 1 + include/fdtdec.h | 13 +++++++++++++ lib/fdtdec_common.c | 18 ++++++++++++++++++ 6 files changed, 56 insertions(+), 17 deletions(-)

2 1

[U-Boot] [PATCH 1/4] mips: Use the generic bitops headers
by Fabio Estevam 05 Nov '15

05 Nov '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> The generic bitops headers are required when calling logarithimic functions, such as ilog2(). Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Applies against u-boot-spi next arch/mips/include/asm/bitops.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h index b5c2a63..c31ff6e 100644 --- a/arch/mips/include/asm/bitops.h +++ b/arch/mips/include/asm/bitops.h @@ -17,6 +17,11 @@ #include <asm/sgidefs.h> #include <asm/system.h> +#include <asm-generic/bitops/fls.h> +#include <asm-generic/bitops/__fls.h> +#include <asm-generic/bitops/fls64.h> +#include <asm-generic/bitops/__ffs.h> + /* * clear_bit() doesn't provide any barrier for the compiler. */ -- 1.9.1

3 7

[U-Boot] Remove sparc archiecture?
by Simon Glass 05 Nov '15

05 Nov '15

Hi, It looks like sparc has no maintainer and has not been converted to generic board. Should we remove it? Regards, Simon

6 9

[U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others
by Wenyou Yang 05 Nov '15

05 Nov '15

This patches is to make matix initialization and saic redirect code sharing with other SoCs, move them to seperate files from SAMA5D4 particular file. Wenyou Yang (3): arm: at91/spl: matrix: move matrix init to separate file arm: at91/spl: matrix: improve implementation of matrix arm: at91: spl/atmel_sfr: move saic redirect to separate file arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/armv7/sama5d4_devices.c | 55 --------------------------- arch/arm/mach-at91/atmel_sfr.c | 21 ++++++++++ arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 - arch/arm/mach-at91/include/mach/sama5d4.h | 28 ++++++++++++++ arch/arm/mach-at91/matrix.c | 34 +++++++++++++++++ 6 files changed, 84 insertions(+), 57 deletions(-) create mode 100644 arch/arm/mach-at91/atmel_sfr.c create mode 100644 arch/arm/mach-at91/matrix.c -- 1.7.9.5

3 9

[U-Boot] [PATCH v4 00/16] spi: zynq qspi support
by Jagan Teki 05 Nov '15

05 Nov '15

These are the previous version patches- https://patchwork.ozlabs.org/patch/302945/ https://patchwork.ozlabs.org/patch/264440/ This series adds zynq qspi controller driver in driver model and enabled support on relevent zynq boards and tested the same. Branch to verify: $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b master-next origin/master-next Changes for v4: - Rebase to master Changes for v3: - Added driver-model to zynq-qspi driver - devicetree support on zynq-qspi - Enabled qspi nodes on relevent board dts files - Enabled qspi driver on relevent board config files Changes for v3: - Fixes with macro's addition Jagan Teki (16): spi: Add zynq qspi controller driver dts: zynq: Add zynq qspi controller nodes doc: device-tree-bindings: spi: Add zynq qspi info dts: microzed: Enable zynq qspi controller node dts: zc702: Enable zynq qspi controller node dts: zc706: Enable zynq qspi controller node dts: zc770-xm010: Enable zynq qspi controller node dts: zed: Enable zynq qspi controller node configs: Enable legacy SPI flash interface support zynq-common: Enable zynq qspi controller support zynq-common: Enable Bank/Extended address register support configs: zynq: Enable zynq qspi controller spi: Kconfig: Add Zynq QSPI controller entry spi: zynq_spi: Add config reg shift named macros spi: zynq_spi: Rename baudrate divisor mask name spi: zynq_spi: Store cs value into private data arch/arm/dts/zynq-7000.dtsi | 12 + arch/arm/dts/zynq-microzed.dts | 5 + arch/arm/dts/zynq-zc702.dts | 5 + arch/arm/dts/zynq-zc706.dts | 5 + arch/arm/dts/zynq-zc770-xm010.dts | 5 + arch/arm/dts/zynq-zed.dts | 5 + configs/zynq_microzed_defconfig | 2 + configs/zynq_zc702_defconfig | 2 + configs/zynq_zc706_defconfig | 2 + configs/zynq_zc70x_defconfig | 2 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zed_defconfig | 2 + doc/device-tree-bindings/spi/spi-zynq-qspi.txt | 26 ++ drivers/spi/Kconfig | 9 + drivers/spi/Makefile | 1 + drivers/spi/zynq_qspi.c | 622 +++++++++++++++++++++++++ drivers/spi/zynq_spi.c | 20 +- include/configs/zynq-common.h | 10 + 18 files changed, 729 insertions(+), 7 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-zynq-qspi.txt create mode 100644 drivers/spi/zynq_qspi.c -- 1.9.1

4 33

[U-Boot] [PATCH 1/2] video: Drop DEV_FLAGS_SYSTEM flag
by Bin Meng 05 Nov '15

05 Nov '15

DEV_FLAGS_SYSTEM does not have any actual meaning, hence drop it. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/blackfin/cpu/jtag-console.c | 2 +- board/bf527-ezkit/video.c | 1 - board/bf533-stamp/video.c | 1 - board/bf548-ezkit/video.c | 1 - board/cm-bf548/video.c | 1 - board/kosagi/novena/novena.c | 2 +- board/mpl/common/kbd.c | 2 +- board/mpl/pati/pati.c | 2 +- common/cmd_console.c | 3 +-- common/stdio.c | 4 ++-- common/usb_kbd.c | 2 +- drivers/input/cros_ec_keyb.c | 2 +- drivers/input/keyboard.c | 2 +- drivers/input/tegra-kbc.c | 2 +- drivers/net/netconsole.c | 2 +- drivers/video/cfb_console.c | 2 +- include/stdio_dev.h | 1 - 17 files changed, 13 insertions(+), 19 deletions(-) diff --git a/arch/blackfin/cpu/jtag-console.c b/arch/blackfin/cpu/jtag-console.c index b0abeda..29e7a44 100644 --- a/arch/blackfin/cpu/jtag-console.c +++ b/arch/blackfin/cpu/jtag-console.c @@ -183,7 +183,7 @@ int drv_jtag_console_init(void) memset(&dev, 0x00, sizeof(dev)); strcpy(dev.name, "jtag"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.putc = jtag_putc; dev.puts = jtag_puts; dev.tstc = jtag_tstc; diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c index c2bf145..530b956 100644 --- a/board/bf527-ezkit/video.c +++ b/board/bf527-ezkit/video.c @@ -439,7 +439,6 @@ int drv_video_init(void) strcpy(videodev.name, "video"); videodev.ext = DEV_EXT_VIDEO; /* Video extensions */ - videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */ error = stdio_register(&videodev); diff --git a/board/bf533-stamp/video.c b/board/bf533-stamp/video.c index 75b8adc..a451f97 100644 --- a/board/bf533-stamp/video.c +++ b/board/bf533-stamp/video.c @@ -165,7 +165,6 @@ int drv_video_init(void) memset(&videodev, 0, sizeof(videodev)); strcpy(videodev.name, "video"); videodev.ext = DEV_EXT_VIDEO; - videodev.flags = DEV_FLAGS_SYSTEM; return stdio_register(&videodev); } diff --git a/board/bf548-ezkit/video.c b/board/bf548-ezkit/video.c index 47e68c6..9cc6c74 100644 --- a/board/bf548-ezkit/video.c +++ b/board/bf548-ezkit/video.c @@ -329,7 +329,6 @@ int drv_video_init(void) strcpy(videodev.name, "video"); videodev.ext = DEV_EXT_VIDEO; /* Video extensions */ - videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */ error = stdio_register(&videodev); diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c index b098615..2867260 100644 --- a/board/cm-bf548/video.c +++ b/board/cm-bf548/video.c @@ -333,7 +333,6 @@ int drv_video_init(void) strcpy(videodev.name, "video"); videodev.ext = DEV_EXT_VIDEO; /* Video extensions */ - videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */ error = stdio_register(&videodev); diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 69f5be3..919133b 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -77,7 +77,7 @@ int drv_keyboard_init(void) int error; struct stdio_dev dev = { .name = "button", - .flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM, + .flags = DEV_FLAGS_INPUT, .start = novena_gpio_button_init, .getc = novena_gpio_button_getc, .tstc = novena_gpio_button_tstc, diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c index 99de2ca..1da72c5 100644 --- a/board/mpl/common/kbd.c +++ b/board/mpl/common/kbd.c @@ -203,7 +203,7 @@ int drv_isa_kbd_init (void) return -1; memset (&kbddev, 0, sizeof(kbddev)); strcpy(kbddev.name, DEVNAME); - kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + kbddev.flags = DEV_FLAGS_INPUT; kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c index b9d88ee..958cdec 100644 --- a/board/mpl/pati/pati.c +++ b/board/mpl/pati/pati.c @@ -566,7 +566,7 @@ void pci_con_connect(void) irq_install_handler (0x2, (interrupt_handler_t *) pci_dorbell_irq,NULL); memset (&pci_con_dev, 0, sizeof (pci_con_dev)); strcpy (pci_con_dev.name, "pci_con"); - pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; pci_con_dev.putc = pci_con_putc; pci_con_dev.puts = pci_con_puts; pci_con_dev.getc = pci_con_getc; diff --git a/common/cmd_console.c b/common/cmd_console.c index 93dc505..9a356ec 100644 --- a/common/cmd_console.c +++ b/common/cmd_console.c @@ -27,10 +27,9 @@ static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[]) list_for_each(pos, list) { dev = list_entry(pos, struct stdio_dev, list); - printf ("%-8s %08x %c%c%c ", + printf ("%-8s %08x %c%c ", dev->name, dev->flags, - (dev->flags & DEV_FLAGS_SYSTEM) ? 'S' : '.', (dev->flags & DEV_FLAGS_INPUT) ? 'I' : '.', (dev->flags & DEV_FLAGS_OUTPUT) ? 'O' : '.'); diff --git a/common/stdio.c b/common/stdio.c index adbfc89..ab4df20 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -88,7 +88,7 @@ static void drv_system_init (void) memset (&dev, 0, sizeof (dev)); strcpy (dev.name, "serial"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.putc = stdio_serial_putc; dev.puts = stdio_serial_puts; dev.getc = stdio_serial_getc; @@ -99,7 +99,7 @@ static void drv_system_init (void) memset (&dev, 0, sizeof (dev)); strcpy (dev.name, "nulldev"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.putc = nulldev_putc; dev.puts = nulldev_puts; dev.getc = nulldev_input; diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 95912f9..0302e5b 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -503,7 +503,7 @@ static int probe_usb_keyboard(struct usb_device *dev) debug("USB KBD: register.\n"); memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev)); strcpy(usb_kbd_dev.name, DEVNAME); - usb_kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + usb_kbd_dev.flags = DEV_FLAGS_INPUT; usb_kbd_dev.getc = usb_kbd_getc; usb_kbd_dev.tstc = usb_kbd_testc; usb_kbd_dev.priv = (void *)dev; diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index a31aa77..dd150ee 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -258,7 +258,7 @@ int drv_keyboard_init(void) memset(&dev, '\0', sizeof(dev)); strcpy(dev.name, "cros-ec-keyb"); - dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_INPUT; dev.getc = kbd_getc; dev.tstc = kbd_tstc; dev.start = cros_ec_init_keyboard; diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index be0f333..ca3886a 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -274,7 +274,7 @@ int kbd_init (void) return -1; memset (&kbddev, 0, sizeof(kbddev)); strcpy(kbddev.name, DEVNAME); - kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + kbddev.flags = DEV_FLAGS_INPUT; kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index c9c9fac..6b88db4 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -358,7 +358,7 @@ int drv_keyboard_init(void) memset(&dev, '\0', sizeof(dev)); strcpy(dev.name, "tegra-kbc"); - dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_INPUT; dev.getc = kbd_getc; dev.tstc = kbd_tstc; dev.start = init_tegra_keyboard; diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index bf972dc..3500047 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -330,7 +330,7 @@ int drv_nc_init(void) memset(&dev, 0, sizeof(dev)); strcpy(dev.name, "nc"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.start = nc_stdio_start; dev.putc = nc_stdio_putc; dev.puts = nc_stdio_puts; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index aa7ca86..51cdd4d 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2281,7 +2281,7 @@ int drv_video_init(void) memset(&console_dev, 0, sizeof(console_dev)); strcpy(console_dev.name, "vga"); console_dev.ext = DEV_EXT_VIDEO; /* Video extensions */ - console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM; + console_dev.flags = DEV_FLAGS_OUTPUT; console_dev.putc = video_putc; /* 'putc' function */ console_dev.puts = video_puts; /* 'puts' function */ diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 95d6246..d473f16 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -16,7 +16,6 @@ #define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */ #define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */ -#define DEV_FLAGS_SYSTEM 0x80000000 /* Device is a system device */ #define DEV_EXT_VIDEO 0x00000001 /* Video extensions supported */ /* Device information */ -- 1.8.2.1

2 3

[U-Boot] [PATCH V3 00/16] imx: mx6/7: support lcdif
by Peng Fan 05 Nov '15

05 Nov '15

Changes v3: 1. Split patches into small ones. 2. unified to use lcd base addr, but not interface index. 3. Drop if (is_cpu_type(MXC_CPU_MX6UL)) for lcdif_power_down Changes v2: 1. Rebased on Latest U-Boot 2. Add i.MX7 LCDIF support This patch set is to introduce lcdif support for i.MX6/7. Patchset tested on mx6ul_14x14/9x9_evk and mx7dsabresd boards. [patch V2 2/14] not posted in V3, please see: http://lists.denx.de/pipermail/u-boot/2015-October/230812.html Peng Fan (16): mxs: add parameter base_addr for mxs_set_lcdclk sandisk: sfp: correct function name xfi3: correct function name mxs: regs-common.h must be wrapped with !__ASSEMBLY__ imx: include linux/types.h for regs-common.h imx: imx-common: move lcdif structure and macro definition to imx-common imx: lcdif: use one register structure for i.MXes imx: mx6: fix register address imx: mx6: crm_reg: add LCDIF related macros imx: mx6: add clock api for lcdif imx: mx6ul_14x14_evk: support lcdif display video: mxsfb: introduce lcdif_power_down imx: mx6: implement reset_misc imx: imx-common: power down lcdif before boot os imx: mx7: compile misc.c for mx7 imx: mx7dsabresd: support lcdif arch/arm/cpu/arm926ejs/mxs/clock.c | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 245 +++++++++++++++++++++ arch/arm/cpu/armv7/mx6/soc.c | 7 + arch/arm/imx-common/Makefile | 2 +- arch/arm/imx-common/cpu.c | 3 + arch/arm/include/asm/arch-mx6/clock.h | 2 + arch/arm/include/asm/arch-mx6/crm_regs.h | 34 ++- arch/arm/include/asm/arch-mx6/imx-regs.h | 18 +- arch/arm/include/asm/arch-mx7/imx-regs.h | 96 +------- arch/arm/include/asm/arch-mxs/clock.h | 2 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 +- arch/arm/include/asm/imx-common/regs-common.h | 2 + .../asm/{arch-mxs => imx-common}/regs-lcdif.h | 30 ++- arch/arm/include/asm/imx-common/sys_proto.h | 2 + board/creative/xfi3/xfi3.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 63 ++++++ board/freescale/mx7dsabresd/mx7dsabresd.c | 64 ++++++ board/sandisk/sansa_fuze_plus/sfp.c | 2 +- drivers/video/mxsfb.c | 19 +- include/configs/mx6ul_14x14_evk.h | 18 ++ include/configs/mx7dsabresd.h | 17 ++ 21 files changed, 512 insertions(+), 120 deletions(-) rename arch/arm/include/asm/{arch-mxs => imx-common}/regs-lcdif.h (92%) -- 1.8.4

2 17

[U-Boot] [PATCH 1/5] arm: ls1021a: merge SoC specific code in a separate file
by Yuan Yao 05 Nov '15

05 Nov '15

Create a soc.c file to put the code for soc special settings. Signed-off-by: Yuan Yao <yao.yuan(a)freescale.com> --- arch/arm/cpu/armv7/ls102xa/Makefile | 1 + arch/arm/cpu/armv7/ls102xa/soc.c | 66 +++++++++++++++++++++++++ arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h | 12 +++++ board/freescale/ls1021aqds/ls1021aqds.c | 49 +----------------- board/freescale/ls1021atwr/ls1021atwr.c | 42 +--------------- 5 files changed, 83 insertions(+), 87 deletions(-) create mode 100644 arch/arm/cpu/armv7/ls102xa/soc.c create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h diff --git a/arch/arm/cpu/armv7/ls102xa/Makefile b/arch/arm/cpu/armv7/ls102xa/Makefile index 2d55782..24bbfba 100644 --- a/arch/arm/cpu/armv7/ls102xa/Makefile +++ b/arch/arm/cpu/armv7/ls102xa/Makefile @@ -8,6 +8,7 @@ obj-y += cpu.o obj-y += clock.o obj-y += timer.o obj-y += fsl_epu.o +obj-y += soc.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_SYS_HAS_SERDES) += fsl_ls1_serdes.o ls102xa_serdes.o diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c new file mode 100644 index 0000000..0fdd6d4 --- /dev/null +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -0,0 +1,66 @@ +/* + * Copyright 2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/arch/clock.h> +#include <asm/io.h> +#include <asm/arch/immap_ls102xa.h> +#include <asm/arch/ls102xa_soc.h> + +unsigned int get_soc_major_rev(void) +{ + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + unsigned int svr, major; + + svr = in_be32(&gur->svr); + major = SVR_MAJ(svr); + + return major; +} + +int arch_soc_init(void) +{ + struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; + struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; + unsigned int major; + +#ifdef CONFIG_FSL_QSPI + out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); +#endif + +#ifdef CONFIG_FSL_DCU_FB + out_be32(&scfg->pixclkcr, SCFG_PIXCLKCR_PXCKEN); +#endif + + /* Configure Little endian for SAI, ASRC and SPDIF */ + out_be32(&scfg->endiancr, SCFG_ENDIANCR_LE); + + /* + * Enable snoop requests and DVM message requests for + * Slave insterface S4 (A7 core cluster) + */ + out_le32(&cci->slave[4].snoop_ctrl, + CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN); + + major = get_soc_major_rev(); + if (major == SOC_MAJOR_VER_1_0) { + /* + * Set CCI-400 Slave interface S1, S2 Shareable Override + * Register All transactions are treated as non-shareable + */ + out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + + /* Workaround for the issue that DDR could not respond to + * barrier transaction which is generated by executing DSB/ISB + * instruction. Set CCI-400 control override register to + * terminate the barrier transaction. After DDR is initialized, + * allow barrier transaction to DDR again */ + out_le32(&cci->ctrl_ord, CCI400_CTRLORD_TERM_BARRIER); + } + + return 0; +} diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h new file mode 100644 index 0000000..f10cb91 --- /dev/null +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h @@ -0,0 +1,12 @@ +/* + * Copyright 2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __FSL_LS102XA_SOC_H +#define __FSL_LS102XA_SOC_H + +unsigned int get_soc_major_rev(void); +int arch_soc_init(void); +#endif /* __FSL_LS102XA_SOC_H */ diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 655fc64..fd20735 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -12,6 +12,7 @@ #include <asm/arch/clock.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/ls102xa_stream_id.h> +#include <asm/arch/ls102xa_soc.h> #include <asm/arch/ls102xa_devdis.h> #include <hwconfig.h> #include <mmc.h> @@ -225,17 +226,6 @@ unsigned long get_board_ddr_clk(void) return 66666666; } -unsigned int get_soc_major_rev(void) -{ - struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); - unsigned int svr, major; - - svr = in_be32(&gur->svr); - major = SVR_MAJ(svr); - - return major; -} - int select_i2c_ch_pca9547(u8 ch) { int ret; @@ -278,8 +268,6 @@ int board_mmc_init(bd_t *bis) int board_early_init_f(void) { struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; - struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; - unsigned int major; #ifdef CONFIG_TSEC_ENET /* clear BD & FR bits for BE BD's and frame data */ @@ -290,40 +278,7 @@ int board_early_init_f(void) init_early_memctl_regs(); #endif -#ifdef CONFIG_FSL_QSPI - out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); -#endif - -#ifdef CONFIG_FSL_DCU_FB - out_be32(&scfg->pixclkcr, SCFG_PIXCLKCR_PXCKEN); -#endif - - /* Configure Little endian for SAI, ASRC and SPDIF */ - out_be32(&scfg->endiancr, SCFG_ENDIANCR_LE); - - /* - * Enable snoop requests and DVM message requests for - * Slave insterface S4 (A7 core cluster) - */ - out_le32(&cci->slave[4].snoop_ctrl, - CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN); - - major = get_soc_major_rev(); - if (major == SOC_MAJOR_VER_1_0) { - /* - * Set CCI-400 Slave interface S1, S2 Shareable Override - * Register All transactions are treated as non-shareable - */ - out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); - out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); - - /* Workaround for the issue that DDR could not respond to - * barrier transaction which is generated by executing DSB/ISB - * instruction. Set CCI-400 control override register to - * terminate the barrier transaction. After DDR is initialized, - * allow barrier transaction to DDR again */ - out_le32(&cci->ctrl_ord, CCI400_CTRLORD_TERM_BARRIER); - } + arch_soc_init(); #if defined(CONFIG_DEEP_SLEEP) if (is_warm_boot()) diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 228dbf8..14ff575 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -12,6 +12,7 @@ #include <asm/arch/clock.h> #include <asm/arch/fsl_serdes.h> #include <asm/arch/ls102xa_stream_id.h> +#include <asm/arch/ls102xa_soc.h> #include <asm/arch/ls102xa_devdis.h> #include <hwconfig.h> #include <mmc.h> @@ -223,17 +224,6 @@ int checkboard(void) return 0; } -unsigned int get_soc_major_rev(void) -{ - struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); - unsigned int svr, major; - - svr = in_be32(&gur->svr); - major = SVR_MAJ(svr); - - return major; -} - void ddrmc_init(void) { struct ccsr_ddr *ddr = (struct ccsr_ddr *)CONFIG_SYS_FSL_DDR_ADDR; @@ -479,8 +469,6 @@ conflict: int board_early_init_f(void) { struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; - struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; - unsigned int major; #ifdef CONFIG_TSEC_ENET /* clear BD & FR bits for BE BD's and frame data */ @@ -492,33 +480,7 @@ int board_early_init_f(void) init_early_memctl_regs(); #endif -#ifdef CONFIG_FSL_DCU_FB - out_be32(&scfg->pixclkcr, SCFG_PIXCLKCR_PXCKEN); -#endif - -#ifdef CONFIG_FSL_QSPI - out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); -#endif - - /* Configure Little endian for SAI, ASRC and SPDIF */ - out_be32(&scfg->endiancr, SCFG_ENDIANCR_LE); - - /* - * Enable snoop requests and DVM message requests for - * Slave insterface S4 (A7 core cluster) - */ - out_le32(&cci->slave[4].snoop_ctrl, - CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN); - - major = get_soc_major_rev(); - if (major == SOC_MAJOR_VER_1_0) { - /* - * Set CCI-400 Slave interface S1, S2 Shareable Override - * Register All transactions are treated as non-shareable - */ - out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); - out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); - } + arch_soc_init(); #if defined(CONFIG_DEEP_SLEEP) if (is_warm_boot()) -- 2.1.0.27.g96db324

4 8