January 2023 - U-Boot

[PATCH] rockchip: Fix the broken Video out for rk3288 boards
by Jagan Teki 06 Jan '23

06 Jan '23

Video out on RK3288 boards has been broken since from few releases due to the adding of reset support on vop but missed enabling DM_RESET on associated boards. This patch fixes those RK3288 boards. Cc: Simon Glass <sjg(a)chromium.org> Cc: Lin Huang <hl(a)rock-chips.com> Cc: Jernej Skrabec <jernej.skrabec(a)gmail.com> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Arnaud Patard (Rtp) <arnaud.patard(a)rtp-net.org> Fixes: <9749d2ea29e1> ("rockchip: video: vop: Add reset support") Reported-by: Manoj Sai <abbaraju.manojsai(a)amarulasolutions.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- configs/evb-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig | 1 + configs/miqi-rk3288_defconfig | 1 + configs/rock-pi-n8-rk3288_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + configs/tinker-s-rk3288_defconfig | 1 + configs/vyasa-rk3288_defconfig | 1 + 7 files changed, 7 insertions(+) diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 7c0b856ca5..2c2c679b29 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -80,6 +80,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 63c53a0248..12ed055acf 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -77,6 +77,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig index 0811e70dce..2cf0efc816 100644 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@ -74,6 +74,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/rock-pi-n8-rk3288_defconfig b/configs/rock-pi-n8-rk3288_defconfig index 4ed98c0a51..757d99b8b5 100644 --- a/configs/rock-pi-n8-rk3288_defconfig +++ b/configs/rock-pi-n8-rk3288_defconfig @@ -73,6 +73,7 @@ CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y # CONFIG_RAM_ROCKCHIP_DEBUG is not set +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 85d94a6ea8..e69ef6875f 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -82,6 +82,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig index 7dfbad8083..eb153dc8d5 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -82,6 +82,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig index cbae60f987..f503cc1604 100644 --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@ -82,6 +82,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y CONFIG_USB=y -- 2.25.1

3 2

[PATCH] imx7d-pico: Fix the name of the u-boot.dtsi file
by Fabio Estevam 06 Jan '23

06 Jan '23

Since commit 2f96d4dd95f8 ("imx7s/d: synchronise device trees with linux") the imx7d-pico board no longer boots. The reason is that prior to the above commit there was an explicit inclusion of arch/arm/dts/imx7d-pico-u-boot.dtsi inside imx7d-pico.dtsi. After the syncing with the Linux upstream dtsi, this u-boot.dtsi inclusion is gone and the board fails to boot. U-Boot uses the imx7d-pico-pi.dtb file, so rename the u-boot.dtsi to imx7d-pico-pi-u-boot.dtsi which gets included automatically by U-Boot standard make logic and makes the board boot again. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Hi Tom and Stefano, Please apply this one for U-Boot 2023.01 to fix a boot regression. Thanks .../arm/dts/{imx7d-pico-u-boot.dtsi => imx7d-pico-pi-u-boot.dtsi} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/dts/{imx7d-pico-u-boot.dtsi => imx7d-pico-pi-u-boot.dtsi} (100%) diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi similarity index 100% rename from arch/arm/dts/imx7d-pico-u-boot.dtsi rename to arch/arm/dts/imx7d-pico-pi-u-boot.dtsi -- 2.25.1

2 2

[PATCH] Revert "Revert "cmd: pxe_utils: Check fdtcontroladdr in label_boot""
by Marek Vasut 06 Jan '23

06 Jan '23

This reverts commit ed6251187afabf811a5fd49a44ebd61c53c7b378. Superseded by "cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage" which is less heavy-handed approach and retains part of the original behavior for non-fitImage. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Neil Armstrong <neil.armstrong(a)linaro.org> Cc: Peter Hoyes <Peter.Hoyes(a)arm.com> Cc: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- PW link for replacement patch: https://patchwork.ozlabs.org/project/uboot/patch/20221214064518.753432-1-ma… --- boot/pxe_utils.c | 8 +++++++- drivers/net/tsec.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 96528aa14c0..8133006875f 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -616,7 +616,10 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) * Scenario 2: If there is an fdt_addr specified, pass it along to * bootm, and adjust argc appropriately. * - * Scenario 3: fdt blob is not available. + * Scenario 3: If there is an fdtcontroladdr specified, pass it along to + * bootm, and adjust argc appropriately. + * + * Scenario 4: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -721,6 +724,9 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (!bootm_argv[3]) + bootm_argv[3] = env_get("fdtcontroladdr"); + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 519ea14b070..d69a9ff4773 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -156,7 +156,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int join) return 0; } -static int tsec_set_promisc(struct udevice *dev, bool enable) +static int __maybe_unused tsec_set_promisc(struct udevice *dev, bool enable) { struct tsec_private *priv = dev_get_priv(dev); struct tsec __iomem *regs = priv->regs; -- 2.35.1

3 2

[PATCH v2] cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage
by Marek Vasut 06 Jan '23

06 Jan '23

Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT. Fixes: d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Peter Hoyes <Peter.Hoyes(a)arm.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- V1: Map the kernel buffer before testing image type V2: Update code comment to reflect the change --- boot/pxe_utils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 8133006875f..099aa2f4bc7 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -617,7 +617,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) * bootm, and adjust argc appropriately. * * Scenario 3: If there is an fdtcontroladdr specified, pass it along to - * bootm, and adjust argc appropriately. + * bootm, and adjust argc appropriately, unless the image type is fitImage. * * Scenario 4: fdt blob is not available. */ @@ -724,7 +724,10 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); - if (!bootm_argv[3]) + kernel_addr_r = genimg_get_kernel_addr(kernel_addr); + buf = map_sysmem(kernel_addr_r, 0); + + if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT) bootm_argv[3] = env_get("fdtcontroladdr"); if (bootm_argv[3]) { @@ -733,8 +736,6 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) bootm_argc = 4; } - kernel_addr_r = genimg_get_kernel_addr(kernel_addr); - buf = map_sysmem(kernel_addr_r, 0); /* Try bootm for legacy and FIT format image */ if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID && IS_ENABLED(CONFIG_CMD_BOOTM)) -- 2.35.1

6 6

[PATCH] i2c: uniphier-f: correct error recovery
by Dai Okamura 06 Jan '23

06 Jan '23

The uniphier i2c block can recognize some handshake errors. But driver handles all error detections as no error if no timeout. So this makes unrecoverable state. This replaces the return values with the right ones to tell the i2c framework the errors: - EDEADLK for arbitration lost error - ENODATA for no answer error Signed-off-by: Dai Okamura <okamura.dai(a)socionext.com> --- drivers/i2c/i2c-uniphier-f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c index 9d6f1688cb..3dcd382469 100644 --- a/drivers/i2c/i2c-uniphier-f.c +++ b/drivers/i2c/i2c-uniphier-f.c @@ -130,12 +130,12 @@ static int wait_for_irq(struct uniphier_fi2c_priv *priv, u32 flags, if (irq & I2C_INT_AL) { dev_dbg(priv->dev, "error: arbitration lost\n"); *stop = false; - return ret; + return -EDEADLK; } if (irq & I2C_INT_NA) { dev_dbg(priv->dev, "error: no answer\n"); - return ret; + return -ENODATA; } return 0; -- 2.35.1

4 4

Please pull u-boot-dm/next
by Simon Glass 06 Jan '23

06 Jan '23

Hi Tom, This is for the -next branch https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/14617 The following changes since commit a95410696d21d38b629c61a09c100197c5fc533a: Merge branch '2023-01-02-platform-updates' into next (2023-01-02 18:07:41 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-next-5jan23 for you to fetch changes up to 8c042fb7f9f475367804b26a892fd522ad8fcfcc: patman: add '--get-maintainer-script' argument (2023-01-05 19:21:57 -0700) ---------------------------------------------------------------- patman enhancements and fixes ---------------------------------------------------------------- Maxim Cournoyer (18): patman: remove extraneous imports patman: fix installation of README.rst data file patman: locate README.rst via importlib patman: cosmetic: Fix PEP 8 warnings for the gitutil module. patman: locate test data files via __file__ and pathlib patman: invoke the checkpatch.pl script with '--u-boot' and '--strict' patman: rename main script to __main__.py patman: add pytest configuration file patman: hide the 'test' command unless test data is available patman: document how to run test suite via pytest patman: document default 'send' command patman: fix pep8 warnings in settings module patman: replace deprecated SafeConfigParser with ConfigParser patman: import gitutil module where it is needed patman: set the default config_fname argument value to None patman: fail early in Setup when provided config file does not exist patman: additionally honor a local .patman config file patman: add '--get-maintainer-script' argument Sean Anderson (1): patman: Switch to setuptools Yuepeng Xing (1): test:dm:fix typo test/dm/blk.c | 2 +- test/dm/button.c | 4 +- test/dm/gpio.c | 4 +- test/dm/host.c | 2 +- test/dm/remoteproc.c | 2 +- test/dm/scmi.c | 2 +- test/dm/spmi.c | 2 +- test/dm/test-fdt.c | 2 +- tools/patman/__init__.py | 2 +- tools/patman/{main.py => __main__.py} | 33 ++++++++++------- tools/patman/checkpatch.py | 2 +- tools/patman/control.py | 12 +++--- tools/patman/func_test.py | 55 +++++++++++++++++++++++++-- tools/patman/get_maintainer.py | 57 +++++++++++++++++----------- tools/patman/gitutil.py | 107 +++++++++++++++++++++++++++++++++-------------------- tools/patman/patman | 2 +- tools/patman/patman.rst | 38 +++++++++++++++++-- tools/patman/pytest.ini | 2 + tools/patman/series.py | 9 +++-- tools/patman/settings.py | 101 ++++++++++++++++++++++++++++++++------------------ tools/patman/setup.py | 4 +- tools/patman/test_settings.py | 67 +++++++++++++++++++++++++++++++++ 22 files changed, 368 insertions(+), 143 deletions(-) rename tools/patman/{main.py => __main__.py} (88%) create mode 100644 tools/patman/pytest.ini create mode 100644 tools/patman/test_settings.py Regards, Simon

2 1

[PATCH 0/4] Fix sparse warnings
by Ashok Reddy Soma 06 Jan '23

06 Jan '23

Run and fix sparse warnings in below files -drivers/mmc/zynq_sdhci.c -board/xilinx/common/board.h -drivers/gpio/zynqmp_gpio_modepin.c -board/xilinx/versal/board.c Algapally Santosh Sagar (4): xilinx: common: Add missing prototype for board_get_usable_ram_top gpio: zynqmp: Remove unused variable ret xilinx: versal: Add missing prototype drivers: mmc: Change datatype to fix a warning board/xilinx/common/board.h | 4 ++++ board/xilinx/versal/board.c | 1 + drivers/gpio/zynqmp_gpio_modepin.c | 3 +-- drivers/mmc/zynq_sdhci.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) -- 2.17.1

2 9

Pull request: u-boot-rockchip/for-next
by Kever Yang 06 Jan '23

06 Jan '23

Hi Tom, Please pull the updates for rockchip platform for next: - Add support for rv1126 soc and rv1126 neu2 io board; - Add support for rk3399 pine64 pinephone pro board; - dts sync from linux for rk3399; Travis: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/14601 Thanks, - Kever The following changes since commit a95410696d21d38b629c61a09c100197c5fc533a: Merge branch '2023-01-02-platform-updates' into next (2023-01-02 18:07:41 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git for-next for you to fetch changes up to 7c2c42aa4b623dae0dd59064ff2b147eb01dbb75: rockchip: Add initial support for the PINE64 Pinephone Pro (2023-01-04 17:00:48 +0800) ---------------------------------------------------------------- Christopher Obbard (1): configs: roc-pc-rk3399: Enable rockchip efuse support Jagan Teki (25): ram: Mark ram-uclass depend on TPL_DM or SPL_DM ram: rockchip: Add common ddr type configs ram: rockchip: Compute ddr capacity based on grf split ram: rockchip: Update ddr pctl regs for px30 ram: rockchip: Add rv1126 ddr3 support ram: rockchip: Add rv1126 ddr loader params ram: rockchip: Add rv1126 ddr driver support ram: rockchip: rv1126: Control ddr init prints via DEBUG ram: rockchip: Add rv1126 lpddr4 support pinctrl: rockchip: Add pinctrl route types pinctrl: rockchip: Add rv1126 support arch: rockchip: Add cru header for rv1126 dt-bindings: clk: Add dt-binding header for RV1126 clk: rockchip: Add rv1126 clk support dt-bindings: power: Add power-domain header for rv1126 arm: rockchip: Add grf header for rv1126 ARM: dts: rockchip: Add Rockchip RV1126 pinctrl ARM: dts: rockchip: Add Rockchip RV1126 SoC arm: rockchip: Add RV1126 arch core support arm: rockchip: rv1126: Set dram area unsecure for SPL rockchip: mkimage: Add rv1126 support ARM: dts: rockchip: rv1126: Add Edgeble Neural Compute Module 2(Neu2) ARM: dts: rockchip: rv1126: Add Edgeble Neural Compute Module 2(Neu2) IO ARM: dts: rockchip: Add rv1126-u-boot.dtsi board: rockchip: Add Edgeble Neu2 IO Board John Keeping (2): rc4: mark key as const rockchip: mkimage: make RC4 key const Peter Robinson (3): arm64: dts: rk3399: sync rk3399.dtsi from 6.1-rc1 arm64: dts: rk3399: Add upstream Pinephone Pro dts rockchip: Add initial support for the PINE64 Pinephone Pro Quentin Schulz (3): rockchip: px30: make watchdog and tsadc trigger a first global reset rockchip: clk: add watchdog clock to px30_clk_enable rockchip: puma-rk3399: sync DTS with Linux kernel next-20221114 arch/arm/dts/Makefile | 4 + arch/arm/dts/rk3399-opp.dtsi | 6 +- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 31 + arch/arm/dts/rk3399-pinephone-pro.dts | 474 +++ arch/arm/dts/rk3399-puma-haikou.dts | 5 +- arch/arm/dts/rk3399-puma.dtsi | 32 +- arch/arm/dts/rk3399-u-boot.dtsi | 36 +- arch/arm/dts/rk3399.dtsi | 200 +- arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi | 10 + arch/arm/dts/rv1126-edgeble-neu2-io.dts | 42 + arch/arm/dts/rv1126-edgeble-neu2.dtsi | 338 ++ arch/arm/dts/rv1126-pinctrl.dtsi | 211 ++ arch/arm/dts/rv1126-u-boot.dtsi | 62 + arch/arm/dts/rv1126.dtsi | 438 +++ arch/arm/include/asm/arch-rockchip/cru_rv1126.h | 459 +++ .../include/asm/arch-rockchip/dram_spec_timing.h | 452 +++ arch/arm/include/asm/arch-rockchip/grf_rv1126.h | 251 ++ arch/arm/include/asm/arch-rockchip/sdram_common.h | 214 +- arch/arm/include/asm/arch-rockchip/sdram_msch.h | 12 + .../include/asm/arch-rockchip/sdram_pctl_px30.h | 100 +- .../include/asm/arch-rockchip/sdram_phy_rv1126.h | 93 + arch/arm/include/asm/arch-rockchip/sdram_rv1126.h | 420 +++ arch/arm/include/asm/arch-rv1126/boot0.h | 11 + arch/arm/include/asm/arch-rv1126/gpio.h | 11 + arch/arm/mach-rockchip/Kconfig | 46 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/px30/px30.c | 4 + arch/arm/mach-rockchip/rk3399/Kconfig | 8 + arch/arm/mach-rockchip/rv1126/Kconfig | 59 + arch/arm/mach-rockchip/rv1126/Makefile | 13 + arch/arm/mach-rockchip/rv1126/clk_rv1126.c | 33 + arch/arm/mach-rockchip/rv1126/rv1126.c | 75 + arch/arm/mach-rockchip/rv1126/syscon_rv1126.c | 47 + board/edgeble/neural-compute-module-2/Kconfig | 16 + board/edgeble/neural-compute-module-2/MAINTAINERS | 6 + board/edgeble/neural-compute-module-2/Makefile | 7 + board/edgeble/neural-compute-module-2/neu2.c | 4 + board/engicam/px30_core/Kconfig | 2 +- board/pine64/pinephone-pro-rk3399/Kconfig | 15 + board/pine64/pinephone-pro-rk3399/MAINTAINERS | 8 + board/pine64/pinephone-pro-rk3399/Makefile | 1 + .../pinephone-pro-rk3399/pinephone-pro-rk3399.c | 76 + common/spl/Kconfig.tpl | 2 +- configs/khadas-edge-captain-rk3399_defconfig | 2 +- configs/khadas-edge-rk3399_defconfig | 2 +- configs/khadas-edge-v-rk3399_defconfig | 2 +- configs/leez-rk3399_defconfig | 2 +- configs/nanopi-r4s-rk3399_defconfig | 2 +- configs/neu2-io-rv1126_defconfig | 57 + configs/pinebook-pro-rk3399_defconfig | 2 +- configs/pinephone-pro-rk3399_defconfig | 104 + configs/roc-pc-mezzanine-rk3399_defconfig | 4 +- configs/roc-pc-rk3399_defconfig | 4 +- configs/rock-pi-4-rk3399_defconfig | 2 +- configs/rock-pi-4c-rk3399_defconfig | 2 +- configs/rockpro64-rk3399_defconfig | 2 +- doc/board/rockchip/rockchip.rst | 3 + drivers/clk/rockchip/Makefile | 1 + drivers/clk/rockchip/clk_px30.c | 3 + drivers/clk/rockchip/clk_rk3399.c | 2 +- drivers/clk/rockchip/clk_rv1126.c | 1889 +++++++++++ drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl-px30.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk3128.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk322x.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk3308.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rk3399.c | 11 +- drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 45 +- drivers/pinctrl/rockchip/pinctrl-rockchip.h | 58 +- drivers/pinctrl/rockchip/pinctrl-rv1126.c | 416 +++ drivers/ram/Makefile | 2 +- drivers/ram/rockchip/Kconfig | 32 +- drivers/ram/rockchip/Makefile | 1 + .../ram/rockchip/sdram-rv1126-ddr3-detect-1056.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-328.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-396.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-528.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-664.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-784.inc | 72 + .../ram/rockchip/sdram-rv1126-ddr3-detect-924.inc | 72 + .../ram/rockchip/sdram-rv1126-loader_params.inc | 197 ++ .../rockchip/sdram-rv1126-lpddr4-detect-1056.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-328.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-396.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-528.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-664.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-784.inc | 78 + .../rockchip/sdram-rv1126-lpddr4-detect-924.inc | 78 + drivers/ram/rockchip/sdram_common.c | 6 +- drivers/ram/rockchip/sdram_pctl_px30.c | 6 +- drivers/ram/rockchip/sdram_px30.c | 8 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 9 +- drivers/ram/rockchip/sdram_rv1126.c | 3543 ++++++++++++++++++++ include/configs/neural-compute-module-2.h | 21 + include/configs/pinephone-pro-rk3399.h | 19 + include/configs/rv1126_common.h | 40 + include/dt-bindings/clock/rk3399-cru.h | 24 +- include/dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++ include/dt-bindings/power/rk3399-power.h | 1 + include/dt-bindings/power/rockchip,rv1126-power.h | 35 + include/rc4.h | 2 +- lib/rc4.c | 2 +- tools/rkcommon.c | 3 +- 106 files changed, 12456 insertions(+), 196 deletions(-) create mode 100644 arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-pinephone-pro.dts create mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi create mode 100644 arch/arm/dts/rv1126-edgeble-neu2-io.dts create mode 100644 arch/arm/dts/rv1126-edgeble-neu2.dtsi create mode 100644 arch/arm/dts/rv1126-pinctrl.dtsi create mode 100644 arch/arm/dts/rv1126-u-boot.dtsi create mode 100644 arch/arm/dts/rv1126.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rv1126.h create mode 100644 arch/arm/include/asm/arch-rockchip/dram_spec_timing.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rv1126.h create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rv1126.h create mode 100644 arch/arm/include/asm/arch-rv1126/boot0.h create mode 100644 arch/arm/include/asm/arch-rv1126/gpio.h create mode 100644 arch/arm/mach-rockchip/rv1126/Kconfig create mode 100644 arch/arm/mach-rockchip/rv1126/Makefile create mode 100644 arch/arm/mach-rockchip/rv1126/clk_rv1126.c create mode 100644 arch/arm/mach-rockchip/rv1126/rv1126.c create mode 100644 arch/arm/mach-rockchip/rv1126/syscon_rv1126.c create mode 100644 board/edgeble/neural-compute-module-2/Kconfig create mode 100644 board/edgeble/neural-compute-module-2/MAINTAINERS create mode 100644 board/edgeble/neural-compute-module-2/Makefile create mode 100644 board/edgeble/neural-compute-module-2/neu2.c create mode 100644 board/pine64/pinephone-pro-rk3399/Kconfig create mode 100644 board/pine64/pinephone-pro-rk3399/MAINTAINERS create mode 100644 board/pine64/pinephone-pro-rk3399/Makefile create mode 100644 board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c create mode 100644 configs/neu2-io-rv1126_defconfig create mode 100644 configs/pinephone-pro-rk3399_defconfig create mode 100644 drivers/clk/rockchip/clk_rv1126.c create mode 100644 drivers/pinctrl/rockchip/pinctrl-rv1126.c create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-1056.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-328.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-396.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-528.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-664.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-784.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-ddr3-detect-924.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-loader_params.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-1056.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-328.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-396.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-528.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-664.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-784.inc create mode 100644 drivers/ram/rockchip/sdram-rv1126-lpddr4-detect-924.inc create mode 100644 drivers/ram/rockchip/sdram_rv1126.c create mode 100644 include/configs/neural-compute-module-2.h create mode 100644 include/configs/pinephone-pro-rk3399.h create mode 100644 include/configs/rv1126_common.h create mode 100644 include/dt-bindings/clock/rockchip,rv1126-cru.h create mode 100644 include/dt-bindings/power/rockchip,rv1126-power.h

4 6

[PATCH 00/17] Support android boot image v3/v4
by Safae Ouajih 06 Jan '23

06 Jan '23

Hello everyone, * This is based on Roman Stratiienko's work to support boot image header version 3 and 4. * This supports the new boot image headers v3, v4 and bootconfig feature. https://source.android.com/docs/core/architecture/bootloader/boot-image-hea… https://source.android.com/docs/core/architecture/bootloader/implementing-b… - Tested on Amlogic Khadas vim3l, a reference board for Android Open Source Project https://www.khadas.com/vim3l And on AM625 Texas Instruments board with 5.10 linux kernel Main changes : - New partition : vendor boot, with a specific vendor ramdisk - DTB is stored in the vendor boot partition - The generic ramdisk is placed after the vendor ramdisk - Bootconfig feature support Here is a link to see the related android boot flow changes on KHADAS vim3l as an example: https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot/-/commits/souajih/B… Safae Ouajih (17): android: boot: rename andr_img_hdr -> andr_boot_img_hdr_v0_v1_v2 android: boot: support vendor boot image in abootimg android: boot: replace android_image_check_header android: boot: add boot image header v3 and v4 structures android: boot: add documentation for boot image header v3/v4 structure android: boot: kcomp: support andr_image_data android: boot: move to andr_image_data structure android: boot: content print is not supported for v3,v4 header version android: boot: boot image header v3,v4 do not support recovery DTBO android: boot: add vendor boot image to prepare for v3,v4 support android: boot: update android_image_get_data to support v3,v4 android: boot: ramdisk: support vendor ramdisk android: boot: support extra command line drivers: fastboot: zImage flashing is not supported for v3,v4 android: boot: support boot image header version 3 and 4 lib: support libxbc android: boot: support bootconfig boot/bootm.c | 29 ++- boot/image-android.c | 367 ++++++++++++++++++++++++++++++-------- boot/image-board.c | 15 +- boot/image-fdt.c | 5 +- cmd/abootimg.c | 66 ++++--- drivers/fastboot/fb_mmc.c | 19 +- include/android_image.h | 220 ++++++++++++++++++++++- include/image.h | 37 ++-- include/xbc.h | 1 + lib/Kconfig | 12 ++ lib/Makefile | 1 + lib/libxbc/Makefile | 1 + lib/libxbc/libxbc.c | 112 ++++++++++++ lib/libxbc/libxbc.h | 54 ++++++ 14 files changed, 806 insertions(+), 133 deletions(-) create mode 100644 include/xbc.h create mode 100644 lib/libxbc/Makefile create mode 100644 lib/libxbc/libxbc.c create mode 100644 lib/libxbc/libxbc.h -- 2.25.1

6 27

[PATCH] mtd: spi-nor: Keep CFR5V[6] as 1 in Octal DTR enable
by tkuw584924＠gmail.com 06 Jan '23

06 Jan '23

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> CFR5V[6] is reserved bit and must always be 1. Fixes: ea9a22f7e79c ("mtd: spi-nor-core: Add support for Cypress Semper flash") Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> --- include/linux/mtd/spi-nor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 30f15452aa68..181eb6710d7e 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -194,7 +194,7 @@ #define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4) /* Page size. */ #define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3) /* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006 -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x43 #define SPINOR_OP_CYPRESS_RD_FAST 0xee /* Supported SPI protocols */ -- 2.25.1

2 1