November 2018 - U-Boot

[U-Boot] [PATCH 0/4] sound: Correct sound output on sandbox
by Simon Glass 29 Nov '18

29 Nov '18

At present sandbox sound output is disabled due to a bug. This series fixes that bug, adds a small API adjustment and enables sandbox sound output again. Simon Glass (4): sound: Correct data output in sound_create_square_wave() sound: Add sample rate as a parameter for square wave sound: sandbox: Use the correct frequency sandbox: Enable sound arch/sandbox/cpu/sdl.c | 30 +++++++++--------------------- drivers/sound/sound-i2s.c | 3 ++- drivers/sound/sound.c | 8 +++----- include/sound.h | 4 +++- 4 files changed, 17 insertions(+), 28 deletions(-) -- 2.19.1.1215.g8438c0b245-goog

2 8

[U-Boot] F2FS support
by Gerasimov, Anton 29 Nov '18

29 Nov '18

Greetings, Is anyone aware of any work in progress to support F2FS in U-Boot. Search engines somehow don't give me anything relevant. Thanks! Best regards, Anton Gerasimov

4 7

[U-Boot] [PATCH] arm64: zynqmp: Start usb ethernet gadget automatically
by Michal Simek 29 Nov '18

29 Nov '18

If only usb ethernet gadget is enabled it can start automatically. If more gagdets are enabled usb ethernet gadget can be bind by "bind /amba/usb1@ff9e0000/dwc3@fe300000 usb_ether" (on zcu100) Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 168cf5c14b45..13c404b6ef08 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -543,6 +543,10 @@ int board_late_init(void) char *env_targets; int ret; +#if defined(CONFIG_USB_ETHER) && !defined(CONFIG_USB_GADGET_DOWNLOAD) + usb_ether_init(); +#endif + if (!(gd->flags & GD_FLG_ENV_DEFAULT)) { debug("Saved variables - Skipping\n"); return 0; -- 1.9.1

1 0

[U-Boot] [PATCH v2 0/6] cmd: Simplify support for sub-commands
by Boris Brezillon 29 Nov '18

29 Nov '18

Hello, Here is the 2nd version of the sub-cmd patchset. This version simplifies the sub-cmd declaration syntax and allows per sub-cmd maxargs and repeatable check. I also added a patch showing how simple it is to convert an existing command to this infrastructure. I converting a bunch of other cmds [1] but I keep that for later, as I don't want to scare reviewers with a 20+ patch series. Regards, Boris [1]https://github.com/bbrezillon/u-boot/commits/sub-cmds Changes since v1: - Drop a few params in the subcmd macro def - Get repeatable and maxargs info from the subcmd instead of the main one - Convert the adc command Boris Brezillon (6): common: command: Fix command auto-completion common: command: Expose a generic helper to auto-complete sub commands common: command: Rework the 'cmd is repeatable' logic command: commands: Add macros to declare commands with subcmds cmd: mtd: Use the subcmd infrastructure to declare mtd sub-commands cmd: adc: Use the sub-command infrastructure cmd/adc.c | 31 +-- cmd/dtimg.c | 2 +- cmd/help.c | 2 +- cmd/mmc.c | 4 +- cmd/mtd.c | 476 +++++++++++++++++++++++++++------------------- common/command.c | 68 ++++++- include/command.h | 133 ++++++++++++- 7 files changed, 476 insertions(+), 240 deletions(-) -- 2.17.1

2 15

[U-Boot] [PATCH 1/5] arm64: zynqmp: Enable SPL for mini qspi configuration
by Michal Simek 29 Nov '18

29 Nov '18

Wire up mini_qspi SPL with zcu102 for testing purpose. Normally mini u-boot runs with FSBL/SPL for certain board. Enabling SPL and configuration from zcu102 helps with testing. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynqmp/zynqmp-mini-qspi | 1 + configs/xilinx_zynqmp_mini_qspi_defconfig | 4 ++++ 2 files changed, 5 insertions(+) create mode 120000 board/xilinx/zynqmp/zynqmp-mini-qspi diff --git a/board/xilinx/zynqmp/zynqmp-mini-qspi b/board/xilinx/zynqmp/zynqmp-mini-qspi new file mode 120000 index 000000000000..5a70cd2f5e13 --- /dev/null +++ b/board/xilinx/zynqmp/zynqmp-mini-qspi @@ -0,0 +1 @@ +zynqmp-zcu102-rev1.0 \ No newline at end of file diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index 53766e2e1935..89b81e76658e 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_qspi" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 CONFIG_ENV_SIZE=0x578 +CONFIG_SPL=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y # CONFIG_CMD_ZYNQMP is not set @@ -43,11 +44,14 @@ CONFIG_CMD_SF=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_MISC is not set # CONFIG_PARTITIONS is not set +CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi" # CONFIG_NET is not set +CONFIG_SPL_DM=y # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set +CONFIG_SPL_DM_SEQ_ALIAS=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y -- 1.9.1

1 4

[U-Boot] [PATCH v9 00/11] Add support for DM_USB and DM_USB_DEV for TI's DRA7 EVMs and AM57 EVMs platforms.
by Jean-Jacques Hiblot 29 Nov '18

29 Nov '18

This series applies on top of the series "[PATCH v4 0/10] Improvements for the dwc3_generic driver" The branch is also available on github: https://github.com/jjhiblot/u-boot/tree/dm_usb_dra7_v9 Moving to DM_USB and DM_USB_DEV brings some benefits: - it is required to support DM_ETH and USB network adapters with the same binary. - support for USB3 on AM57x comes almost for free - removal of platform code related to USB Tested on: - dra76 evm - AM572 evm Changes in v9 - rebased on top of latest u-boot/master - use DM_USB_GADGET instead of DM_USB_DEV - remove edison build fix (move to the dwc3 series) Changes in v8: - Fix edison build Changes in v7: - replace remaining if() statements with ut_assert() - Fix build issue "multiple definition of `usb_gadget_handle_interrupts'" - Fixed build issue "multiple definition of `usb_gadget_handle_interrupts'" Changes in v6: - ti-pipe3-phy: take PLL out of IDLE in pipe3_init(). The PLL may have been put into idle by pipe3_exit() - DRA7 configs: enable DM_USB and DM_USB_DEV. Use DWC3_GENERIC in place of DWC3_OF_SIMPLE. disable non DM USB options - AM57 configs: enable DM_USB and DM_USB_DEV. Use DWC3_GENERIC in place of DWC3_OF_SIMPLE. disable non DM USB options - Supports DM USB for peripherals - Removed DTS changes that disabled USB1 on DRA7 because DM_USB_DEV is now supported Changes in v5: - Rebased on latest u-boot - Removed patches that have already been merged Changes in v4: - Fix word missing in commit log - Remove dependency on MISC - Renamed the commit (DM_USB is already enabled, the only missing option is for the USB2 phy driver) - Remove dependency on MISC - Remove omap specific glue layer and use dwc3-of-simple glue layer Changes in v3: - in syscon_regmap_lookup_by_phandle(), use dev_dbg() instead of printf() - added unit test for syscon_regmap_lookup_by_phandle() Changes in v2: - Add USB3 support to ti-pipe3-phy driver - omap-usb2-phy: Implement power_on and power_off callbacks - am57xx boards: when DM_USB is used, turn on the required USB clocks - split dts changes in 2 commits: one for binding the children of ocp2scp@4a080000, and one to disable USB1 on all DRA7 EVMs - Enable DM_USB in am57xx_evm_defconfig. USB3 (super speed) is supported. Jean-Jacques Hiblot (9): syscon: dm: Add a new method to get a regmap from DTS phy: Add a new driver for OMAP's USB2 PHYs dwc3-generic: Add support for the TI DWC3 glue board: ti: dra7xx-evm: turn on USB clocks in late init stage dts: dra7x: make ocp2scp@4a080000 compatible with simple-bus configs: enable DM_USB and DM_USB_DEV for all DRA7 platforms configs: am57xx_evm: Enable DM_USB and DM_USB_DEV board: ti: dra7-evm: remove USB platform code board: ti: am57xx: remove USB platform code Vignesh R (2): phy: ti-pip3-phy: Add support for USB3 PHY board; ti: am57xx: turn on USB clocks arch/arm/dts/omap5-u-boot.dtsi | 4 + arch/sandbox/dts/test.dts | 6 +- board/ti/am57xx/board.c | 106 ++++------------------ board/ti/dra7xx/evm.c | 123 ++++--------------------- configs/am57xx_evm_defconfig | 12 ++- configs/am57xx_hs_evm_defconfig | 12 ++- configs/dra7xx_evm_defconfig | 10 +- configs/dra7xx_hs_evm_defconfig | 10 +- drivers/core/syscon-uclass.c | 23 +++++ drivers/phy/Kconfig | 9 ++ drivers/phy/Makefile | 1 + drivers/phy/omap-usb2-phy.c | 196 ++++++++++++++++++++++++++++++++++++++++ drivers/phy/ti-pipe3-phy.c | 32 +++++-- drivers/usb/dwc3/dwc3-generic.c | 85 +++++++++++++++++ include/syscon.h | 13 +++ test/dm/syscon.c | 29 ++++++ 16 files changed, 456 insertions(+), 215 deletions(-) create mode 100644 drivers/phy/omap-usb2-phy.c -- 2.7.4

2 18

[U-Boot] [PATCH v5 00/18] Add U-Boot support for MediaTek SoCs - MT7623n & MT7629
by Ryder Lee 29 Nov '18

29 Nov '18

Hello, This is the new round to add U-Boot support for MediaTek SoCs - MT7623n & MT7629, and the most of the drivers are based on mainline Linux, such as clock, timer, mmc, pinctrl, UART, watchdog, power domain and device tree. Ryder Ryder Lee (16): tools: MediaTek: add MTK boot header generation to mkimage arm: dts: MediaTek: add device tree for MT7629 arm: dts: MediaTek: add device tree for MT7623 arm: MediaTek: add basic support for MT7629 boards clk: MediaTek: add clock driver for MT7629 SoC. clk: MediaTek: add clock driver for MT7623 SoC. timer: MediaTek: add timer driver for MediaTek SoCs watchdog: MediaTek: add watchdog driver for MediaTek SoCs pinctrl: MediaTek: add pinctrl driver for MT7629 SoC pinctrl: MediaTek: add pinctrl driver for MT7623 SoC power domain: MediaTek: add power domain driver for MT7629 SoC power domain: MediaTek: add power domain driver for MT7623 SoC serial: MediaTek: add high-speed uart driver for MediaTek SoCs ram: MediaTek: add DDR3 driver for MT7629 SoC doc: README.mediatek: Add a simple README for MediaTek MAINTAINERS: add an entry for MediaTek Weijie Gao (2): arm: MediaTek: add basic support for MT7623 boards mmc: mtk-sd: add SD/MMC host controller driver for MT7623 SoC MAINTAINERS | 20 + Makefile | 20 + arch/arm/Kconfig | 16 + arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 4 + arch/arm/dts/mt7623.dtsi | 255 +++++ arch/arm/dts/mt7623n-bananapi-bpi-r2.dts | 207 ++++ arch/arm/dts/mt7629-rfb-u-boot.dtsi | 24 + arch/arm/dts/mt7629-rfb.dts | 70 ++ arch/arm/dts/mt7629.dtsi | 244 +++++ arch/arm/include/asm/arch-mediatek/gpio.h | 9 + arch/arm/include/asm/arch-mediatek/misc.h | 17 + arch/arm/mach-mediatek/Kconfig | 39 + arch/arm/mach-mediatek/Makefile | 7 + arch/arm/mach-mediatek/cpu.c | 34 + arch/arm/mach-mediatek/init.h | 11 + arch/arm/mach-mediatek/mt7623/Makefile | 4 + arch/arm/mach-mediatek/mt7623/init.c | 54 + arch/arm/mach-mediatek/mt7623/lowlevel_init.S | 22 + arch/arm/mach-mediatek/mt7623/preloader.h | 99 ++ arch/arm/mach-mediatek/mt7629/Makefile | 4 + arch/arm/mach-mediatek/mt7629/init.c | 128 +++ arch/arm/mach-mediatek/mt7629/lowlevel_init.S | 50 + arch/arm/mach-mediatek/spl.c | 43 + board/mediatek/mt7623/Kconfig | 13 + board/mediatek/mt7623/MAINTAINERS | 7 + board/mediatek/mt7623/Makefile | 3 + board/mediatek/mt7623/mt7623_rfb.c | 16 + board/mediatek/mt7629/Kconfig | 17 + board/mediatek/mt7629/MAINTAINERS | 7 + board/mediatek/mt7629/Makefile | 3 + board/mediatek/mt7629/mt7629_rfb.c | 16 + common/image.c | 1 + configs/mt7623n_bpir2_defconfig | 54 + configs/mt7629_rfb_defconfig | 73 ++ doc/README.mediatek | 221 ++++ drivers/clk/Makefile | 1 + drivers/clk/mediatek/Makefile | 7 + drivers/clk/mediatek/clk-mt7623.c | 870 +++++++++++++++ drivers/clk/mediatek/clk-mt7629.c | 709 +++++++++++++ drivers/clk/mediatek/clk-mtk.c | 493 +++++++++ drivers/clk/mediatek/clk-mtk.h | 194 ++++ drivers/mmc/Kconfig | 11 + drivers/mmc/Makefile | 1 + drivers/mmc/mtk-sd.c | 1394 +++++++++++++++++++++++++ drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/mediatek/Kconfig | 15 + drivers/pinctrl/mediatek/Makefile | 7 + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 1284 +++++++++++++++++++++++ drivers/pinctrl/mediatek/pinctrl-mt7629.c | 409 ++++++++ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 553 ++++++++++ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 184 ++++ drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/mtk-power-domain.c | 406 +++++++ drivers/ram/Makefile | 1 + drivers/ram/mediatek/Makefile | 7 + drivers/ram/mediatek/ddr3-mt7629.c | 766 ++++++++++++++ drivers/serial/Kconfig | 20 + drivers/serial/Makefile | 1 + drivers/serial/serial_mtk.c | 268 +++++ drivers/timer/Kconfig | 7 + drivers/timer/Makefile | 1 + drivers/timer/mtk_timer.c | 85 ++ drivers/watchdog/Kconfig | 8 + drivers/watchdog/Makefile | 1 + drivers/watchdog/mtk_wdt.c | 135 +++ include/configs/mt7623.h | 56 + include/configs/mt7629.h | 57 + include/dt-bindings/clock/mt7623-clk.h | 413 ++++++++ include/dt-bindings/clock/mt7629-clk.h | 206 ++++ include/dt-bindings/power/mt7623-power.h | 19 + include/dt-bindings/power/mt7629-power.h | 13 + include/image.h | 1 + scripts/Makefile.spl | 11 + tools/Makefile | 1 + tools/mtk_image.c | 749 +++++++++++++ tools/mtk_image.h | 199 ++++ 79 files changed, 11386 insertions(+) create mode 100644 arch/arm/dts/mt7623.dtsi create mode 100644 arch/arm/dts/mt7623n-bananapi-bpi-r2.dts create mode 100644 arch/arm/dts/mt7629-rfb-u-boot.dtsi create mode 100644 arch/arm/dts/mt7629-rfb.dts create mode 100644 arch/arm/dts/mt7629.dtsi create mode 100644 arch/arm/include/asm/arch-mediatek/gpio.h create mode 100644 arch/arm/include/asm/arch-mediatek/misc.h create mode 100644 arch/arm/mach-mediatek/Kconfig create mode 100644 arch/arm/mach-mediatek/Makefile create mode 100644 arch/arm/mach-mediatek/cpu.c create mode 100644 arch/arm/mach-mediatek/init.h create mode 100644 arch/arm/mach-mediatek/mt7623/Makefile create mode 100644 arch/arm/mach-mediatek/mt7623/init.c create mode 100644 arch/arm/mach-mediatek/mt7623/lowlevel_init.S create mode 100644 arch/arm/mach-mediatek/mt7623/preloader.h create mode 100644 arch/arm/mach-mediatek/mt7629/Makefile create mode 100644 arch/arm/mach-mediatek/mt7629/init.c create mode 100644 arch/arm/mach-mediatek/mt7629/lowlevel_init.S create mode 100644 arch/arm/mach-mediatek/spl.c create mode 100644 board/mediatek/mt7623/Kconfig create mode 100644 board/mediatek/mt7623/MAINTAINERS create mode 100644 board/mediatek/mt7623/Makefile create mode 100644 board/mediatek/mt7623/mt7623_rfb.c create mode 100644 board/mediatek/mt7629/Kconfig create mode 100644 board/mediatek/mt7629/MAINTAINERS create mode 100644 board/mediatek/mt7629/Makefile create mode 100644 board/mediatek/mt7629/mt7629_rfb.c create mode 100644 configs/mt7623n_bpir2_defconfig create mode 100644 configs/mt7629_rfb_defconfig create mode 100644 doc/README.mediatek create mode 100644 drivers/clk/mediatek/Makefile create mode 100644 drivers/clk/mediatek/clk-mt7623.c create mode 100644 drivers/clk/mediatek/clk-mt7629.c create mode 100644 drivers/clk/mediatek/clk-mtk.c create mode 100644 drivers/clk/mediatek/clk-mtk.h create mode 100644 drivers/mmc/mtk-sd.c create mode 100644 drivers/pinctrl/mediatek/Kconfig create mode 100644 drivers/pinctrl/mediatek/Makefile create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7629.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.c create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-common.h create mode 100644 drivers/power/domain/mtk-power-domain.c create mode 100644 drivers/ram/mediatek/Makefile create mode 100644 drivers/ram/mediatek/ddr3-mt7629.c create mode 100644 drivers/serial/serial_mtk.c create mode 100644 drivers/timer/mtk_timer.c create mode 100644 drivers/watchdog/mtk_wdt.c create mode 100644 include/configs/mt7623.h create mode 100644 include/configs/mt7629.h create mode 100644 include/dt-bindings/clock/mt7623-clk.h create mode 100644 include/dt-bindings/clock/mt7629-clk.h create mode 100644 include/dt-bindings/power/mt7623-power.h create mode 100644 include/dt-bindings/power/mt7629-power.h create mode 100644 tools/mtk_image.c create mode 100644 tools/mtk_image.h -- 1.9.1

6 50

[U-Boot] [PATCH] Makefile: fix build error on mt7629_rfb using buildman
by Weijie Gao 29 Nov '18

29 Nov '18

This patch fixes the build error for mt7629 boards when using buildman. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index a5d0c1b..8962b53 100644 --- a/Makefile +++ b/Makefile @@ -1368,6 +1368,8 @@ u-boot.elf: u-boot.bin # Otherwise the header will be added to the u-boot.bin directly. ifeq ($(CONFIG_SPL),y) +spl/u-boot-spl-mtk.bin: spl/u-boot-spl + u-boot-mtk.bin: u-boot.dtb u-boot.img spl/u-boot-spl-mtk.bin FORCE $(call if_changed,binman) else -- 1.9.1

2 1

[U-Boot] [PATCH] arm64: zynqmp: Disable autoboot feature for mini
by Michal Simek 29 Nov '18

29 Nov '18

There is no reason to have autoboot enabled because it should never start anything automatically. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_mini_emmc0_defconfig | 2 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 2 +- configs/xilinx_zynqmp_mini_nand_defconfig | 2 +- configs/xilinx_zynqmp_mini_qspi_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 71c320cc3e23..8ec4af7bc3c8 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y -CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set @@ -15,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="ZynqMP> " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index 3298341d190d..30d4fd306f34 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y -CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set @@ -15,6 +14,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="ZynqMP> " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 74ba0c97f399..46ed80916ca9 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -7,7 +7,6 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_NR_DRAM_BANKS=1 CONFIG_FIT=y -CONFIG_BOOTDELAY=-1 CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set @@ -16,6 +15,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set CONFIG_SYS_PROMPT="ZynqMP> " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index db129b6ce7dd..53766e2e1935 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -8,13 +8,13 @@ CONFIG_ZYNQMP_NO_DDR=y # CONFIG_CMD_ZYNQMP is not set CONFIG_NR_DRAM_BANKS=1 # CONFIG_IMAGE_FORMAT_LEGACY is not set -CONFIG_BOOTDELAY=-1 # CONFIG_BOARD_LATE_INIT is not set # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set CONFIG_SYS_PROMPT="ZynqMP> " +# CONFIG_AUTOBOOT is not set # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set -- 1.9.1

1 0

[U-Boot] [PATCH] armv8: emc2305: add support for fan controller
by Meenakshi Aggarwal 29 Nov '18

29 Nov '18

Add support for fan controller emc2305. Enable support of FAN controller for LX2160A RDB board. Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 22 +++++++++ board/freescale/common/Makefile | 2 + board/freescale/common/emc2305.c | 75 +++++++++++++++++++++++++++++++ board/freescale/common/emc2305.h | 20 +++++++++ board/freescale/lx2160a/lx2160a.c | 9 ++++ 5 files changed, 128 insertions(+) create mode 100644 board/freescale/common/emc2305.c create mode 100644 board/freescale/common/emc2305.h diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 5dba2af..d746e78 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -346,6 +346,28 @@ config MAX_CPUS cores, count the reserved ports. This will allocate enough memory in spin table to properly handle all cores. +config EMC2305 + bool "Fan controller" + help + Enable the EMC2305 fan controller for configuration of fan + speed. + +config I2C_MUX_CH_EMC2305 + hex "I2C channel where EMC2305 is connected" + default 0x9 if ARCH_LX2160A + +config I2C_EMC2305_ADDR + hex "I2C channel where EMC2305 is connected" + default 0x4D if ARCH_LX2160A + +config I2C_EMC2305_CMD + hex "EMC2305 made I2C compliant" + default 0x40 if ARCH_LX2160A + +config I2C_EMC2305_PWM + hex "Speed settings for Fan controller" + default 0x80 if ARCH_LX2160A + config SECURE_BOOT bool "Secure Boot" help diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index e3c5eae..a9d61a8 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -64,6 +64,8 @@ obj-$(CONFIG_POWER_MC34VR500) += mc34vr500.o obj-$(CONFIG_LS102XA_STREAM_ID) += ls102xa_stream_id.o +obj-$(CONFIG_EMC2305) += emc2305.o + # deal with common files for P-series corenet based devices obj-$(CONFIG_TARGET_P2041RDB) += p_corenet/ obj-$(CONFIG_TARGET_P3041DS) += p_corenet/ diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c new file mode 100644 index 0000000..46f43e0 --- /dev/null +++ b/board/freescale/common/emc2305.c @@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2018 NXP. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <command.h> +#include <i2c.h> +#include <asm/io.h> +#ifdef CONFIG_FSL_LSCH2 +#include <asm/arch/immap_lsch2.h> +#elif defined(CONFIG_FSL_LSCH3) +#include <asm/arch/immap_lsch3.h> +#else +#include <asm/immap_85xx.h> +#endif +#include "emc2305.h" + +DECLARE_GLOBAL_DATA_PTR; + +void configure_emc2305(void) +{ + u8 data; + + data = CONFIG_I2C_EMC2305_CMD; + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_CONF, 1, &data, 1) != 0){ + printf("Error: failed to configure I2C fan @%x\n", + CONFIG_I2C_EMC2305_ADDR); + } +} + +void set_fan_speed(void) +{ + u8 data; + + data = CONFIG_I2C_EMC2305_PWM; + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_FAN1, 1, &data, 1) != 0){ + printf("Error: failed to change fan speed @%x\n", + I2C_EMC2305_FAN1); + } + + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_FAN2, 1, &data, 1) != 0){ + printf("Error: failed to change fan speed @%x\n", + I2C_EMC2305_FAN2); + } + + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_FAN3, 1, &data, 1) != 0){ + printf("Error: failed to change fan speed @%x\n", + I2C_EMC2305_FAN3); + } + + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_FAN4, 1, &data, 1) != 0){ + printf("Error: failed to change fan speed @%x\n", + I2C_EMC2305_FAN4); + } + + if (i2c_write(CONFIG_I2C_EMC2305_ADDR, + I2C_EMC2305_FAN5, 1, &data, 1) != 0){ + printf("Error: failed to change fan speed @%x\n", + I2C_EMC2305_FAN5); + } +} + +void emc2305_init(void) +{ + configure_emc2305(); + set_fan_speed(); +} diff --git a/board/freescale/common/emc2305.h b/board/freescale/common/emc2305.h new file mode 100644 index 0000000..ebbe20f --- /dev/null +++ b/board/freescale/common/emc2305.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __EMC2305_H_ +#define __EMC2305_H_ + +#define I2C_EMC2305_CONF 0x20 +#define I2C_EMC2305_FAN1 0x30 +#define I2C_EMC2305_FAN2 0x40 +#define I2C_EMC2305_FAN3 0x50 +#define I2C_EMC2305_FAN4 0x60 +#define I2C_EMC2305_FAN5 0x70 + +void emc2305_init(void); + +#endif /* __EMC2305_H_ */ diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 530f658..a4c54a2 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -26,6 +26,10 @@ #include "../common/vid.h" #include <fsl_immap.h> +#ifdef CONFIG_EMC2305 +#include "../common/emc2305.h" +#endif + #ifdef CONFIG_TARGET_LX2160AQDS #define CFG_MUX_I2C_SDHC(reg, value) ((reg & 0x3f) | value) #define SET_CFG_MUX1_SDHC1_SDHC(reg) (reg & 0x3f) @@ -93,6 +97,11 @@ int board_early_init_f(void) /* get required clock for UART IP */ uart_get_clock(); +#ifdef CONFIG_EMC2305 + select_i2c_ch_pca9547(CONFIG_I2C_MUX_CH_EMC2305); + emc2305_init(); + select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); +#endif fsl_lsch3_early_init_f(); return 0; } -- 1.9.1

1 0