| Message ID | b7fdaabc-9a5f-1d19-a660-97e4cb52c200@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [GIT,PULL] Pull request: u-boot-imx u-boot-imx-20200716 | expand |
On Thu, Jul 16, 2020 at 10:01:19PM +0200, Stefano Babic wrote: > Hi Tom, > > please pull from u-boot-imx, thanks ! > > The following changes since commit 497c7598c4e713eb9ad88fd7963e57b21b8b35e1: > > Merge branch 'master' of > https://gitlab.denx.de/u-boot/custodians/u-boot-spi (2020-07-11 17:40:00 > -0400) > > are available in the Git repository at: > > https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git > tags/u-boot-imx-20200716 > > for you to fetch changes up to ab8b4e818cbc3846672c13b12f1d75daccfac519: > > mx6memcal: fix build (2020-07-16 15:11:18 +0200) > Please note there's a bunch of whitespace errors in drivers/ddr/imx/imx8m/ddrphy_utils.c, a single one in arch/arm/mach-imx/imx8m/soc.c and drivers/pinctrl/nxp/pinctrl-imx*.c has some warnings about using __section(..) vs __attribute__((section(..))) but these are all things that can be addressed with this merged. So, applied to u-boot/master, thanks!
Hi Tom, On Fri, Jul 17, 2020 at 11:55 AM Tom Rini <trini@konsulko.com> wrote: > Please note there's a bunch of whitespace errors in > drivers/ddr/imx/imx8m/ddrphy_utils.c, a single one in > arch/arm/mach-imx/imx8m/soc.c and > drivers/pinctrl/nxp/pinctrl-imx*.c has some warnings about using > __section(..) vs __attribute__((section(..))) but these are all things > that can be addressed with this merged. So, applied to u-boot/master, > thanks! I have fixed the first two issues you reported. Thanks
Hi Tom, On Fri, Jul 17, 2020 at 11:55 AM Tom Rini <trini@konsulko.com> wrote: > Please note there's a bunch of whitespace errors in > drivers/ddr/imx/imx8m/ddrphy_utils.c, a single one in > arch/arm/mach-imx/imx8m/soc.c and > drivers/pinctrl/nxp/pinctrl-imx*.c has some warnings about using > __section(..) vs __attribute__((section(..))) but these are all things > that can be addressed with this merged. So, applied to u-boot/master, Could you please share these drivers/pinctrl/nxp/pinctrl-imx*.c warnings? What are the defconfig targets that triggered it?
On Fri, Jul 17, 2020 at 06:05:57PM -0300, Fabio Estevam wrote: > Hi Tom, > > On Fri, Jul 17, 2020 at 11:55 AM Tom Rini <trini@konsulko.com> wrote: > > > Please note there's a bunch of whitespace errors in > > drivers/ddr/imx/imx8m/ddrphy_utils.c, a single one in > > arch/arm/mach-imx/imx8m/soc.c and > > drivers/pinctrl/nxp/pinctrl-imx*.c has some warnings about using > > __section(..) vs __attribute__((section(..))) but these are all things > > that can be addressed with this merged. So, applied to u-boot/master, > > Could you please share these drivers/pinctrl/nxp/pinctrl-imx*.c warnings? Sure: $ ./scripts/checkpatch.pl -q -f drivers/pinctrl/nxp/pinctrl-imx*.c WARNING: __section(.data) is preferred over __attribute__((section(".data"))) #13: FILE: drivers/pinctrl/nxp/pinctrl-imx5.c:13: +static struct imx_pinctrl_soc_info imx5_pinctrl_soc_info __attribute__((section(".data"))); total: 0 errors, 1 warnings, 0 checks, 44 lines checked WARNING: __section(.data) is preferred over __attribute__((section(".data"))) #12: FILE: drivers/pinctrl/nxp/pinctrl-imx7.c:12: +static struct imx_pinctrl_soc_info imx7_pinctrl_soc_info __attribute__((section(".data"))); total: 0 errors, 1 warnings, 0 checks, 41 lines checked WARNING: __section(.data) is preferred over __attribute__((section(".data"))) #11: FILE: drivers/pinctrl/nxp/pinctrl-imx8m.c:11: +static struct imx_pinctrl_soc_info imx8mq_pinctrl_soc_info __attribute__((section(".data"))); total: 0 errors, 1 warnings, 0 checks, 38 lines checked WARNING: Use the livetree API (dev_read_...) #59: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:59: + if (fdtdec_get_int_array(gd->fdt_blob, node, "fsl,pins", WARNING: quoted string split across lines #102: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:102: + dev_dbg(dev, "mux_reg 0x%x, conf_reg 0x%x, " + "input_reg 0x%x, mux_mode 0x%x, " WARNING: quoted string split across lines #103: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:103: + "input_reg 0x%x, mux_mode 0x%x, " + "input_val 0x%x, config_val 0x%x\n", WARNING: quoted string split across lines #172: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:172: + dev_dbg(dev, "select_input: offset 0x%x val " + "0x%x\n", input_reg, input_val); WARNING: quoted string split across lines #187: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:187: + dev_dbg(dev, "write config: offset 0x%x val " + "0x%x\n", conf_reg, config_val); WARNING: Use the livetree API (dev_read_...) #206: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:206: + struct fdtdec_phandle_args arg; WARNING: Use the livetree API (dev_read_...) #230: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:230: + info->mux_mask = fdtdec_get_int(gd->fdt_blob, node, "fsl,mux_mask", 0); WARNING: Use the livetree API (dev_read_...) #235: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:235: + if (fdtdec_get_bool(gd->fdt_blob, node, "fsl,input-sel")) { WARNING: Use the livetree API (dev_read_...) #236: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:236: + ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, WARNING: Use the livetree API (dev_read_...) #244: FILE: drivers/pinctrl/nxp/pinctrl-imx.c:244: + addr = fdtdec_get_addr_size(gd->fdt_blob, arg.node, "reg", total: 0 errors, 10 warnings, 0 checks, 273 lines checked > What are the defconfig targets that triggered it? Not a build-time issue, my scripts do a ./scripts/checkpatch.pl --git origin/master.. -q and I search on ERROR. Since the above WARNINGS were on the same page as the ERRORs I noted them.
Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 497c7598c4e713eb9ad88fd7963e57b21b8b35e1: Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi (2020-07-11 17:40:00 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20200716 for you to fetch changes up to ab8b4e818cbc3846672c13b12f1d75daccfac519: mx6memcal: fix build (2020-07-16 15:11:18 +0200) ---------------------------------------------------------------- i.MX for 2020.10 ---------------- - i.MX DDR driver fix/update for i.MX8M - i.MX pinctrl driver fix. - Use arm_smccc_smc to remove imx sip function - i.MX8M clk update - support booting aarch32 kernel on aarch64 hardware - fused part support for i.MX8MP - imx6: pcm058 to DM Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/708734785 ---------------------------------------------------------------- Fabio Estevam (2): pico-imx6ul: Fix Quick Start Guide URL imx6: Remove unneeded CONFIG_DM_MDIO Heiko Schocher (1): imx6: aristainetos: sync defconfig with 2020.10 Heinrich Schuchardt (1): ARM: mx6: make CAAM usable on the i.MX6 boards Ilko Iliev (1): arm: dts: imx7: Fix error in coresight TPIU graph connection Jacky Bai (2): driver: ddr: imx: skip ddr_ss_gpr config on imx8mn driver: ddr: imx: correct the pwrctl setting of selfref_en on imx8m Jian Li (3): imx8mp: enable rd_port_urgent imx8mp: DDR performance tunning imx8mp: Disables use of MR4 TUF flag (MR4[7]) bit Lukasz Majewski (1): arm: Add extra boot device (UART) to run Ymodem u-boot.img boot on XEA (imx28) Mo, Yuezhang (1): watchdog: imx: Support set timeout by wdt command Niel Fourie (4): dts-bindings: regulator: Add dlg,da9063-regulator arm: dts: imx6q: Add Linux dts files for Phytec Mira arm: imx6q: pcm058: change MAINTAINER arm: imx6q: pcm058: Convert pcm058 to use DM with DTs Oliver Chen (1): drivers: ddr: imx Workaround for i.MX8M DDRPHY rank to rank issue Peng Fan (22): pinctrl: imx7: move soc info to data section pinctrl: imx8m: move soc info to data section pinctrl: imx5: move soc info to data section imx8: misc: use arm_smccc_smc imx8m: soc: use arm_smccc_smc imx: bootaux: use arm_smccc_smc imx8: fuse: use arm_smccc_smc imx: power-domain: use arm_smccc_smc imx: remove imx sip file clk: imx8mm: fix clk set parent clk: imx8mm: Add qspi clock imx8m: configure arm clk sources from PLL imx8m: configure NoC clk imx8m: add sdhc/nand/ecspi clk api imx8m: add eqos clk imx8m: workaround ROM serror imx8m: power down fused cores imx8m: disable nodes before kernel/mfgtool boot for fused part clk: imx8m: drop clk settings imx8m: Refactor the OPTEE memory removal imx8m: implement armv8_el2_to_aarch32 imx8mm_evk: enlarge CONFIG_SYS_BOOTM_LEN Sherry Sun (1): drivers: ddr: imx8mp: Add inline ECC feature support Stefano Babic (1): mx6memcal: fix build Sébastien Szymanski (1): power: pmic_pca9450: fix PCA9450A I2C address Ye Li (9): clk: clk-imx8mn: Update clock tree and support set parent clk: imx8mm/8mn: Add USB clocks clk: imx8mp: Update imx8mp ccf clock driver imx8mp: Add fused parts support imx8mn/imx8mp: override env_get_offset and env_get_location spi: fsl_qspi: Add support for i.MX7ULP spi: fsl_qspi: Support to use full AHB space on i.MX misc: scu_api: Add SCFW API to get the index of boot container set gpio: mxc_gpio: Improve to use ofdata_to_platdata arch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi | 42 +++++++++++++ arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts | 72 ++++++++++++++++++++++ arch/arm/dts/imx6qdl-phytec-mira.dtsi | 390 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx7s.dtsi | 2 +- arch/arm/include/asm/arch-imx/cpu.h | 5 ++ arch/arm/include/asm/arch-imx8/sci/rpc.h | 1 + arch/arm/include/asm/arch-imx8/sci/sci.h | 1 + arch/arm/include/asm/arch-imx8m/ddr.h | 10 +++ arch/arm/include/asm/arch-imx8m/imx-regs.h | 158 +++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/mach-imx/sys_proto.h | 9 ++- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cpu.c | 12 +++- arch/arm/mach-imx/imx8/misc.c | 7 ++- arch/arm/mach-imx/imx8m/clock_imx8mm.c | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- arch/arm/mach-imx/imx8m/lowlevel_init.S | 12 ++++ arch/arm/mach-imx/imx8m/soc.c | 612 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- arch/arm/mach-imx/imx_bootaux.c | 11 +++- arch/arm/mach-imx/mx6/Kconfig | 4 ++ arch/arm/mach-imx/mx6/soc.c | 10 +++ arch/arm/mach-imx/sip.c | 48 --------------- board/beacon/imx8mm/imx8mm_beacon.c | 11 ---- board/freescale/imx8mm_evk/imx8mm_evk.c | 11 ---- board/freescale/imx8mn_evk/imx8mn_evk.c | 7 --- board/freescale/imx8mp_evk/imx8mp_evk.c | 40 ------------ board/freescale/imx8mp_evk/lpddr4_timing.c | 5 +- board/freescale/imx8mp_evk/spl.c | 2 +- board/freescale/imx8mq_evk/imx8mq_evk.c | 11 ---- board/google/imx8mq_phanbell/imx8mq_phanbell.c | 11 ---- board/liebherr/xea/xea.c | 1 + board/phytec/pcm058/MAINTAINERS | 3 +- board/phytec/pcm058/README | 51 ++++++++++++++++ board/phytec/pcm058/pcm058.c | 325 ++++++------------------------------------------------------------------------------------------ board/technexion/pico-imx6ul/README | 4 +- board/technexion/pico-imx8mq/pico-imx8mq.c | 26 ++++---- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 11 ---- configs/apalis_imx6_defconfig | 1 - configs/aristainetos2_defconfig | 3 +- configs/aristainetos2b_defconfig | 3 +- configs/aristainetos2bcsl_defconfig | 3 +- configs/aristainetos2c_defconfig | 3 +- configs/colibri_imx6_defconfig | 1 - configs/dh_imx6_defconfig | 1 - configs/imx28_xea_defconfig | 1 + configs/imx8mp_evk_defconfig | 1 - configs/mx6memcal_defconfig | 4 +- configs/mx6sabreauto_defconfig | 1 - configs/mx6sabresd_defconfig | 1 - configs/pcm058_defconfig | 42 ++++++++++--- drivers/clk/imx/clk-imx8mm.c | 63 +++++++++---------- drivers/clk/imx/clk-imx8mn.c | 108 ++++++++++++++++++++++---------- drivers/clk/imx/clk-imx8mp.c | 52 ++++++++++++++++ drivers/ddr/imx/imx8m/Kconfig | 7 +++ drivers/ddr/imx/imx8m/ddr_init.c | 79 +++++++++++++++++++++++- drivers/ddr/imx/imx8m/ddrphy_train.c | 7 +++ drivers/ddr/imx/imx8m/ddrphy_utils.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/gpio/mxc_gpio.c | 36 +++-------- drivers/misc/imx8/fuse.c | 19 +++--- drivers/misc/imx8/scu_api.c | 25 ++++++++ drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/power/domain/imx8m-power-domain.c | 10 +-- drivers/power/pmic/pmic_pca9450.c | 21 +------ drivers/spi/Kconfig | 8 +++ drivers/spi/fsl_qspi.c | 122 +++++++++++++++++++++++++++++------- drivers/watchdog/imx_watchdog.c | 18 ++++-- include/configs/imx8mm_evk.h | 1 + include/configs/pcm058.h | 69 +++++++++------------ include/dt-bindings/regulator/dlg,da9063-regulator.h | 16 +++++ include/power/pca9450.h | 3 +- 73 files changed, 2697 insertions(+), 718 deletions(-) create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts create mode 100644 arch/arm/dts/imx6qdl-phytec-mira.dtsi create mode 100644 arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi delete mode 100644 arch/arm/mach-imx/sip.c create mode 100644 include/dt-bindings/regulator/dlg,da9063-regulator.h Best regards, Stefano