| Message ID | 825e8369-0474-d8a8-63e7-5034d6ca53bf@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,GIT,PULL] Pull request: u-boot-imx u -boot-imx-20190719 | expand |
On Sat, Jul 27, 2019 at 02:21:48PM +0200, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > > The following changes since commit 0de815356474912ef5bef9a69f0327a5a93bb2c2: > > Merge branch '2019-07-17-master-imports' (2019-07-18 11:31:37 -0400) > > are available in the Git repository at: > > https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git > tags/u-boot-imx-20190719 > > for you to fetch changes up to 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b: > > ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C (2019-07-19 20:32:24 > +0200) > Applied to u-boot/master, thanks!
On 7/27/2019 5:21 AM, Stefano Babic wrote: > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 5 + > arch/arm/dts/imx6dl-dhcom-pdk2.dts | 14 + > arch/arm/dts/imx6q-dhcom-pdk2.dts | 141 +--------- > arch/arm/dts/imx6q-display5-u-boot.dtsi | 44 +++ > arch/arm/dts/imx6q-display5.dts | 352 > +++++++++++++++++++++++ Any comment on this patchset dated June 28 ? http://patchwork.ozlabs.org/patch/1123788/ which is just a rebase of this one dated May 8th http://patchwork.ozlabs.org/patch/1097252/ Should I rebase this to master branch ? Thanks Troy
Hi Troy, On 29/07/19 02:59, Troy Kisky wrote: > On 7/27/2019 5:21 AM, Stefano Babic wrote: >> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 5 + >> arch/arm/dts/imx6dl-dhcom-pdk2.dts | 14 + >> arch/arm/dts/imx6q-dhcom-pdk2.dts | 141 +--------- >> arch/arm/dts/imx6q-display5-u-boot.dtsi | 44 +++ >> arch/arm/dts/imx6q-display5.dts | 352 >> +++++++++++++++++++++++ > > Any comment on this patchset dated June 28 ? > http://patchwork.ozlabs.org/patch/1123788/ > No, there is nothing wrong - just when I merge this set with some other patches, I had conflicts that I quickly solved, but I got travis' errors. https://travis-ci.org/sbabic/u-boot-imx/jobs/561080530 Mainly because something wrong in DTS' Makefile, it is a small thing. As I had to merge a lot of other pathces, I have just put yours aside and I wanted to check what was wrong by rebasing, but I got no time for it. > which is just a rebase of this one dated May 8th > > http://patchwork.ozlabs.org/patch/1097252/ > > > Should I rebase this to master branch ? If you do it, you make me a pleasure - thanks ! I will then apply them directly on top of -master. Thanks again, Stefano
Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 0de815356474912ef5bef9a69f0327a5a93bb2c2: Merge branch '2019-07-17-master-imports' (2019-07-18 11:31:37 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20190719 for you to fetch changes up to 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b: ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C (2019-07-19 20:32:24 +0200) ---------------------------------------------------------------- u-boot-imx-20190719 - CCF for i.MX6 - nandbcb command to write SPL into NAND - Switch to DM (i.MX28) - Boards: Toradex, engicam, DH - Fixes for i.MX8 - Fixes for i.MX7ULP Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504 ---------------------------------------------------------------- Adam Ford (3): spl: imx6: Let spl_boot_device return USDHC1 or USDHC2 ARM: imx6q_logic: Enable SPL_DM with SPL_OF_CONTROL ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init Anatolij Gustschin (3): arm: imx8: factor out uart init code arm: imx8: don't duplicate build_info() arm: dts: imx: fsl-imx8dx.dtsi: add gpio aliases to fix gpio command Breno Matheus Lima (1): mx6sxsabresd: imximage.cfg: Handle the CONFIG_SECURE_BOOT case Bryan O'Donoghue (10): optee: Make TZDRAM config options contingent on CONFIG_OPTEE warp7: configs: bl33: Tidy up OPTEE defines MAINTAINERS: Update lib/optee with my details warp7_bl33: configs: Enable FIT as the boot.scr format warp7: include: configs: Specify image name of bootscript in FIT warp7: include: configs: Differentiate bootscript address from loadaddr warp7_bl33: configs: Enable CONFIG_OF_LIBFDT warp7_bl33: configs: Enable CONFIG_OF_LIBFDT_OVERLAY warp7: include: configs: Specify an fdtovaddr warp7: Specify a default CONFIG_OPTEE_LOAD_ADDR if non provided Heiko Schocher (2): pwm: imx: add Kconfig support pwm: imx: add DM_PWM support Igor Opaniuk (5): colibri_imx7_emmc: enable CONFIG_ARMV7_BOOT_SEC_DEFAULT colibri/apalis imx: drop DFU support colibri_imx7: introduce androidboot wrapper apalis_imx6: configs: remove legacy usbboot command colibri_imx6: configs: remove legacy usbboot command Joris Offouga (1): pico-imx7d: Enable DM_USB Ludwig Zenz (6): ARM: dts: dh-imx6: Refactor DT with som and board level defs for use with imx6 duallite ARM: dts: imx: dh-imx6: Add DHCOM iMX6 Duallite PDK2 device tree ARM: imx6: DHCOM i.MX6 PDK: config SPL to load U-Boot fitImage with mulitple DTs ARM: imx6: DHCOM i.MX6 PDK: enable pad pull ups of SS lines of spi used for boot ARCH: imx: Call sata_remove() not on imx6 duallite/solo boards ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C Lukasz Majewski (42): clk: doc: Add documentation entry for Common Clock Framework [CCF] (i.MX) dm: Fix documentation entry as there is no UCLASS_CLOCK uclass clk: Remove clock ID check in .get_rate() of clk_fixed_* clk: Extend struct clk to provide information regarding clock rate clk: Extend struct clk to provide clock type agnostic flags clk: Provide struct clk for fixed rate clock (clk_fixed_rate.c) clk: Introduce clk-provider.h to store Common Clock Framework's internals dm: clk: Define clk_get_parent() for clk operations dm: clk: Define clk_get_parent_rate() for clk operations dm: clk: Define clk_get_by_id() for clk operations clk: Port Linux common clock framework [CCF] for imx6q to U-boot (tag: v5.1.12) dm: clk: Extend clk_get_parent_rate() to support CLK_GET_RATE_NOCACHE flag dts: sandbox: Add 'osc' clock for Common Clock Framework [CCF] testing clk: sandbox: Adjust clk-divider to emulate reading its value from HW clk: sandbox: Adjust clk-mux.c to emulate reading divider value from HW clk: sandbox: Add sandbox test code for Common Clock Framework [CCF] defconfig: sandbox: Enable SANDBOX_CLK_CCF to reuse generic CCF code clk: Add MAINTAINERS entry for clocks (./drivers/clk/) ARM: dts: imx: Copy imx28 device tree related files from Linux kernel (v5.1.11) net: fec: Enable support for i.MX28 DM_ETH in the fec_mxc.c driver ARM: dts: imx: Provide 'gpio-ranges' for mxs_gpio driver gpio: mxs: Add support for DM/DTS in the mxs_gpio.c driver (DM_GPIO) pinctrl: mxs: Add support for i.MX2[38] mxs pinctrl driver spi: mxs: Add support DM/DTS for i.MX28 mxs SPI driver (DM_SPI conversion) ARM: imx: cosmetic: Remove not needed comment from the mccmon6.h file ARM: imx: config: Disable support for USB on MCCMON6 ARM: imx: Disable 1Gbps support on MCCMON6's KSZ9031 PHY Kconfig: Make CMD_SPL_NAND_OFS only available when proper memory is used Kconfig: cosmetic: Update description of CMD_SPL_NAND_OFS Kconfig: Add CMD_SPL_NOR_OFS config for falcon boot argument offset doc: Update parallel NOR flash related information in README.falcon cosmetic: display5: Remove not needed comments cosmetic: Update comment in cmd/eeprom.c ARM: display5: Fix CS check after moving some SPI related CONFIGs to Kconfig gpio: Add missing parenthesis to the GPIO_TO_PORT define ARM: display5: Increase the pre-relocation malloc pool size to 4KiB DTS: imx: Add display5 board (imx6q based) device tree description (v5.1) DTS: Add imx6q-display5-u-boot.dtsi file with u-boot specific properties ARM: display5: Remove U_BOOT_DEVICE definition of serial_mxc IMX: serial: dm: Set DM_FLAG_PRE_RELOC in the IMX uart driver config: imx53: Disable support for EFI on HSC|DDC boards serial: mxc: Add compatibles to NXP's serial driver (for imx21 and imx53) Marcel Ziswiler (5): colibri-imx6ull: fix vidargs toradex: configblock: generic wi-fi/bt handling toradex: configblock: fix colibri imx8x target toradex: configblock: fix apalis imx8 target toradex: configblock: avoid line continuations Marek Vasut (4): watchdog: Split WDT from SPL_WDT watchdog: imx: Add DM support ARM: imx: m53menlo: Convert WDT support to DM ARM: imx: dh-imx6: Enable DM regulator Matti Vaittinen (1): regulator: bd718x7: support ROHM BD71837 and BD71847 PMICs Peng Fan (3): misc: imx8: add sc_misc_get_temp thermal: add i.MX8 thermal driver imx: imx8dx/qxp: enable thermal Shyam Saini (5): i.MX6: nand: add nandbcb command for imx doc: imx: Add documentation for nandbcb command configs: icore: Fix U-Boot proper loading from nand configs: icorem6: Enable Nand bcb command board: engicam: Remove bogus check for mmc for imx6ul isiot Stefan Agner (1): toradex: configblock: initialize MMC before switching partition Sébastien Szymanski (1): opos6uldev: remove board_ehci_hcd_init function Ye Li (6): mx7ulp: Fix APLL num and denom setting issue mx7ulp_evk: Update LPDDR3 script mx7ulp_evk: Change APLL and its PFD0 frequencies mx7ulp: Select the SCG1 APLL PFD as a system clock source mx7ulp_evk: Update DDR freq to 352.8Mhz for ULP B0 imx6dq: Fix chip version issue for rev1.3 MAINTAINERS | 12 + README | 4 - arch/arm/dts/Makefile | 5 +- arch/arm/dts/fsl-imx8dx.dtsi | 64 +++++ arch/arm/dts/imx28-pinfunc.h | 506 +++++++++++++++++++++++++++++++++ arch/arm/dts/imx28-u-boot.dtsi | 28 ++ arch/arm/dts/imx28.dtsi | 1330 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 5 + arch/arm/dts/imx6dl-dhcom-pdk2.dts | 14 + arch/arm/dts/imx6q-dhcom-pdk2.dts | 141 +--------- arch/arm/dts/imx6q-display5-u-boot.dtsi | 44 +++ arch/arm/dts/imx6q-display5.dts | 352 +++++++++++++++++++++++ arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 142 ++++++++++ arch/arm/dts/{imx6q-dhcom-som.dtsi => imx6qdl-dhcom.dtsi} | 3 +- arch/arm/dts/imx7d-pico.dtsi | 2 + arch/arm/dts/mxs-pinfunc.h | 31 +++ arch/arm/include/asm/arch-imx8/sci/sci.h | 2 + arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h | 1 + arch/arm/include/asm/arch-imx8/sys_proto.h | 3 + arch/arm/include/asm/mach-imx/imx-nandbcb.h | 111 ++++++++ arch/arm/mach-imx/Kconfig | 11 + arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 369 ++++++++++++++++++++++++ arch/arm/mach-imx/cpu.c | 6 +- arch/arm/mach-imx/imx8/Makefile | 2 +- arch/arm/mach-imx/imx8/misc.c | 39 +++ arch/arm/mach-imx/mx6/soc.c | 5 + arch/arm/mach-imx/spl.c | 8 +- arch/sandbox/dts/test.dts | 10 + board/armadeus/opos6uldev/board.c | 21 -- board/dhelectronics/dh_imx6/dh_imx6.c | 147 ++-------- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 9 +- board/engicam/common/board.c | 2 - board/freescale/imx8qm_mek/imx8qm_mek.c | 29 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 29 +- board/freescale/mx6sxsabresd/imximage.cfg | 7 + board/freescale/mx7ulp_evk/imximage.cfg | 17 +- board/freescale/mx7ulp_evk/plugin.S | 23 +- board/liebherr/display5/common.c | 2 +- board/liebherr/display5/display5.c | 9 - board/logicpd/imx6/imx6logic.c | 12 +- board/technexion/pico-imx7d/pico-imx7d.c | 13 - board/toradex/apalis-imx8/apalis-imx8.c | 30 +- board/toradex/colibri-imx8x/colibri-imx8x.c | 29 +- board/toradex/common/tdx-cfg-block.c | 66 +++-- cmd/Kconfig | 12 +- cmd/eeprom.c | 2 +- common/board_r.c | 2 +- common/spl/Kconfig | 1 + common/spl/spl.c | 2 +- configs/apalis_imx6_defconfig | 2 - configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/colibri-imx6ull_defconfig | 1 - configs/colibri_imx6_defconfig | 2 - configs/colibri_imx7_emmc_defconfig | 5 +- configs/dh_imx6_defconfig | 10 +- configs/display5_defconfig | 3 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ge_bx50v3_defconfig | 1 + configs/imx6q_logic_defconfig | 6 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_nand_defconfig | 1 + configs/imx8qxp_mek_defconfig | 2 + configs/kp_imx53_defconfig | 2 + configs/m53menlo_defconfig | 2 + configs/mccmon6_nor_defconfig | 2 - configs/mccmon6_sd_defconfig | 2 - configs/mx53ppd_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 1 + configs/pico-imx7d_bl33_defconfig | 1 + configs/pico-imx7d_defconfig | 1 + configs/pico-pi-imx7d_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/vining_2000_defconfig | 1 + configs/warp7_bl33_defconfig | 9 +- doc/README.falcon | 2 + doc/imx/clk/ccf.txt | 101 +++++++ doc/imx/common/imx6.txt | 74 +++++ drivers/clk/Kconfig | 22 ++ drivers/clk/Makefile | 3 + drivers/clk/clk-divider.c | 155 +++++++++++ drivers/clk/clk-fixed-factor.c | 80 ++++++ drivers/clk/clk-mux.c | 172 ++++++++++++ drivers/clk/clk-uclass.c | 60 ++++ drivers/clk/clk.c | 57 ++++ drivers/clk/clk_fixed_factor.c | 3 - drivers/clk/clk_fixed_rate.c | 8 +- drivers/clk/clk_sandbox_ccf.c | 185 ++++++++++++ drivers/clk/imx/Kconfig | 16 ++ drivers/clk/imx/Makefile | 2 + drivers/clk/imx/clk-gate2.c | 103 +++++++ drivers/clk/imx/clk-imx6q.c | 179 ++++++++++++ drivers/clk/imx/clk-pfd.c | 90 ++++++ drivers/clk/imx/clk-pllv3.c | 82 ++++++ drivers/clk/imx/clk.h | 69 +++++ drivers/gpio/mxc_gpio.c | 2 +- drivers/gpio/mxs_gpio.c | 148 ++++++++++ drivers/misc/imx8/scu_api.c | 28 ++ drivers/mtd/nand/raw/mxs_nand.c | 2 +- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 +- drivers/mtd/nand/raw/mxs_nand_spl.c | 2 +- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 1 + drivers/pinctrl/nxp/Kconfig | 10 + drivers/pinctrl/nxp/Makefile | 1 + drivers/pinctrl/nxp/pinctrl-mxs.c | 190 +++++++++++++ drivers/pinctrl/nxp/pinctrl-mxs.h | 61 ++++ drivers/power/pmic/bd71837.c | 32 ++- drivers/power/regulator/Kconfig | 17 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/bd71837.c | 468 +++++++++++++++++++++++++++++++ drivers/pwm/Kconfig | 5 + drivers/pwm/pwm-imx.c | 110 +++++++- drivers/serial/serial_mxc.c | 4 +- drivers/spi/mxs_spi.c | 400 ++++++++++++++++++++------ drivers/thermal/Kconfig | 9 + drivers/thermal/Makefile | 1 + drivers/thermal/imx_scu_thermal.c | 203 ++++++++++++++ drivers/watchdog/Kconfig | 9 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/imx_watchdog.c | 119 ++++++-- include/asm-generic/global_data.h | 2 +- include/clk.h | 37 ++- include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 22 -- include/configs/aristainetos-common.h | 1 - include/configs/aristainetos2.h | 3 - include/configs/aristainetos2b.h | 3 - include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx6.h | 20 -- include/configs/colibri_imx7.h | 44 ++- include/configs/dh_imx6.h | 8 - include/configs/display5.h | 5 - include/configs/ge_bx50v3.h | 1 - include/configs/m53menlo.h | 5 + include/configs/mccmon6.h | 8 +- include/configs/mx53ppd.h | 1 - include/configs/vining_2000.h | 1 - include/configs/warp7.h | 20 +- include/linux/clk-provider.h | 132 +++++++++ {drivers/mtd/nand/raw => include}/mxs_nand.h | 0 include/power/bd71837.h | 147 ++++++---- include/sandbox-clk.h | 76 +++++ include/wdt.h | 2 +- lib/optee/Kconfig | 2 + scripts/config_whitelist.txt | 1 - test/dm/Makefile | 2 +- test/dm/clk_ccf.c | 62 +++++ 152 files changed, 6915 insertions(+), 764 deletions(-) create mode 100644 arch/arm/dts/imx28-pinfunc.h create mode 100644 arch/arm/dts/imx28-u-boot.dtsi create mode 100644 arch/arm/dts/imx28.dtsi create mode 100644 arch/arm/dts/imx6dl-dhcom-pdk2.dts create mode 100644 arch/arm/dts/imx6q-display5-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi rename arch/arm/dts/{imx6q-dhcom-som.dtsi => imx6qdl-dhcom.dtsi} (99%) create mode 100644 arch/arm/dts/mxs-pinfunc.h create mode 100644 arch/arm/include/asm/mach-imx/imx-nandbcb.h create mode 100644 arch/arm/mach-imx/cmd_nandbcb.c create mode 100644 arch/arm/mach-imx/imx8/misc.c create mode 100644 doc/imx/clk/ccf.txt create mode 100644 drivers/clk/clk-divider.c create mode 100644 drivers/clk/clk-fixed-factor.c create mode 100644 drivers/clk/clk-mux.c create mode 100644 drivers/clk/clk.c create mode 100644 drivers/clk/clk_sandbox_ccf.c create mode 100644 drivers/clk/imx/clk-gate2.c create mode 100644 drivers/clk/imx/clk-imx6q.c create mode 100644 drivers/clk/imx/clk-pfd.c create mode 100644 drivers/clk/imx/clk-pllv3.c create mode 100644 drivers/clk/imx/clk.h create mode 100644 drivers/pinctrl/nxp/pinctrl-mxs.c create mode 100644 drivers/pinctrl/nxp/pinctrl-mxs.h create mode 100644 drivers/power/regulator/bd71837.c create mode 100644 drivers/thermal/imx_scu_thermal.c create mode 100644 include/linux/clk-provider.h rename {drivers/mtd/nand/raw => include}/mxs_nand.h (100%) create mode 100644 include/sandbox-clk.h create mode 100644 test/dm/clk_ccf.c