October 2023 - U-Boot

[PULL] u-boot-sh/next_pinctrl_sync
by Marek Vasut 02 Oct '23

02 Oct '23

The following changes since commit 90c81f407dd4a7747385b10f9b8f732202c45cde: Merge tag 'dm-next-23sep23' of https://source.denx.de/u-boot/custodians/u-boot-dm into next (2023-09-24 12:43:00 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sh.git next_pinctrl_sync for you to fetch changes up to 30c210b9bee474d3ca5803f866ed07a6bac56fd4: ARM: renesas: Align env eMMC device number with Linux 6.5.3 DT changes on R-Car Gen3 Salvator-X (2023-10-01 00:08:29 +0200) ---------------------------------------------------------------- Marek Vasut (60): ARM: dts: renesas: Add compatible properties to KSZ9031 Ethernet PHYs on Salvator-X boards ARM: renesas: Enable DM_ETH_PHY on 64-bit R-Car boards pinctrl: renesas: Rename R8A7795 H3 PFC tables file name to R8A77951 pinctrl: renesas: Rename RZ/A1 R7S72100 PFC tables to RZ/A1 pinctrl: renesas: Drop R8A77950 H3 ES1.x PFC table entry pinctrl: renesas: Add support for 1.8V/2.5V I/O voltage levels pinctrl: renesas: Synchronize R8A7790 H2 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A7791 M2-W and R8A7793 M2-N PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A7792 V2H PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A7794 E2 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77951 H3 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77960 M3-W and R8A77961 M3-W+ PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77965 M3-N PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77970 V3M PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77980 V3H PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77990 E3 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A77995 D3 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A779A0 V3U PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A779F0 S4 PFC tables with Linux 6.5.3 pinctrl: renesas: Synchronize R8A779G0 V4H PFC tables with Linux 6.5.3 linux/compat.h: Define empty __initconst and __initdata clk: renesas: Synchronize R8A77951 H3 DT headers with Linux 6.5.3 clk: renesas: Synchronize R8A779F0 S4 DT headers with Linux 6.5.3 clk: renesas: Synchronize R8A7790 H2 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A7791 M2-W and R8A7793 M2-N clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A7792 V2H clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A7794 E2 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77951 H3 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77960 M3-W and R8A77961 M3-W+ clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77965 M3-N clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77970 V3M clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77980 V3H clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77990 E3 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A77995 D3 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A779A0 V3U clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A779F0 S4 clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A779G0 V4H clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A774A1 RZ/G2M clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A774B1 RZ/G2N clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A774C0 RZ/G2E clock tables with Linux 6.5.3 clk: renesas: Synchronize R8A774E1 RZ/G2H clock tables with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A7790 H2 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A7791 M2-W and R8A7793 M2-N DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A7794 E2 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77951 H3 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77960 M3-W and R8A77961 M3-W+ DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77965 M3-N DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77970 V3M DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77980 V3H DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77990 E3 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A77995 D3 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A779A0 E3 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A779F0 S4 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize R-Car R8A779G0 V4H DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize RZ R7S72100 RZ/A1 DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize RZ R8A774A1 RZ/G2M DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize RZ R8A774B1 RZ/G2N DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize RZ R8A774C0 RZ/G2E DTs with Linux 6.5.3 ARM: dts: renesas: Synchronize RZ R8A774E1 RZ/G2H DTs with Linux 6.5.3 ARM: renesas: Align env eMMC device number with Linux 6.5.3 DT changes on R-Car Gen3 Salvator-X arch/arm/dts/beacon-renesom-baseboard.dtsi | 45 +- arch/arm/dts/beacon-renesom-som.dtsi | 2 +- arch/arm/dts/condor-common.dtsi | 1 + arch/arm/dts/hihope-common.dtsi | 21 +- arch/arm/dts/r7s72100-gr-peach.dts | 3 + arch/arm/dts/r7s72100.dtsi | 56 +- arch/arm/dts/r8a774a1-beacon-rzg2m-kit.dts | 21 - arch/arm/dts/r8a774a1-u-boot.dtsi | 1 - arch/arm/dts/r8a774a1.dtsi | 14 +- arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts | 29 +- arch/arm/dts/r8a774b1-u-boot.dtsi | 1 - arch/arm/dts/r8a774b1.dtsi | 14 +- arch/arm/dts/r8a774c0.dtsi | 11 +- arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts | 29 +- arch/arm/dts/r8a774e1-u-boot.dtsi | 1 - arch/arm/dts/r8a774e1.dtsi | 14 +- arch/arm/dts/r8a7790.dtsi | 85 +- arch/arm/dts/r8a7791.dtsi | 4 +- arch/arm/dts/r8a7793.dtsi | 4 +- arch/arm/dts/r8a7794.dtsi | 2 +- arch/arm/dts/r8a77951.dtsi | 15 +- arch/arm/dts/r8a77960.dtsi | 16 +- arch/arm/dts/r8a77965.dtsi | 16 +- arch/arm/dts/r8a77970-eagle.dts | 12 + arch/arm/dts/r8a77980-condor.dts | 8 + arch/arm/dts/r8a77980-v3hsk.dts | 1 + arch/arm/dts/r8a77980.dtsi | 5 +- arch/arm/dts/r8a77990.dtsi | 11 +- arch/arm/dts/r8a77995.dtsi | 2 +- arch/arm/dts/r8a779a0-falcon-csi-dsi.dtsi | 5 + arch/arm/dts/r8a779a0-falcon.dts | 11 +- arch/arm/dts/r8a779a0.dtsi | 110 +- arch/arm/dts/r8a779f0.dtsi | 25 +- arch/arm/dts/r8a779g0-white-hawk-csi-dsi.dtsi | 172 +++ arch/arm/dts/r8a779g0-white-hawk.dts | 44 + arch/arm/dts/r8a779g0.dtsi | 1006 +++++++++++++++++- arch/arm/dts/salvator-common.dtsi | 255 ++++- arch/arm/dts/salvator-xs.dtsi | 56 + arch/arm/dts/ulcb-audio-graph-card.dtsi | 85 ++ arch/arm/dts/ulcb-audio-graph-card2.dtsi | 26 + arch/arm/dts/ulcb.dtsi | 74 +- configs/r8a77970_eagle_defconfig | 1 + configs/r8a77970_v3msk_defconfig | 1 + configs/r8a77980_condor_defconfig | 1 + configs/r8a77980_v3hsk_defconfig | 1 + configs/r8a77990_ebisu_defconfig | 1 + configs/r8a77995_draak_defconfig | 1 + configs/r8a779a0_falcon_defconfig | 1 + configs/r8a779g0_whitehawk_defconfig | 1 + configs/rcar3_salvator-x_defconfig | 2 +- configs/rcar3_ulcb_defconfig | 1 + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a774b1-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a774c0-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a774e1-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a7790-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a7791-cpg-mssr.c | 11 +- drivers/clk/renesas/r8a7792-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a7794-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a7795-cpg-mssr.c | 16 +- drivers/clk/renesas/r8a7796-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a77965-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a77970-cpg-mssr.c | 18 +- drivers/clk/renesas/r8a77980-cpg-mssr.c | 24 +- drivers/clk/renesas/r8a77990-cpg-mssr.c | 6 +- drivers/clk/renesas/r8a77995-cpg-mssr.c | 8 +- drivers/clk/renesas/r8a779a0-cpg-mssr.c | 9 +- drivers/clk/renesas/r8a779f0-cpg-mssr.c | 4 +- drivers/clk/renesas/r8a779g0-cpg-mssr.c | 28 +- drivers/pinctrl/renesas/Kconfig | 2 +- drivers/pinctrl/renesas/Makefile | 6 +- drivers/pinctrl/renesas/pfc-r8a7790.c | 4 +- drivers/pinctrl/renesas/pfc-r8a7791.c | 6 +- drivers/pinctrl/renesas/pfc-r8a7792.c | 2 +- drivers/pinctrl/renesas/pfc-r8a7794.c | 50 +- .../renesas/{pfc-r8a7795.c => pfc-r8a77951.c} | 12 +- drivers/pinctrl/renesas/pfc-r8a7796.c | 12 +- drivers/pinctrl/renesas/pfc-r8a77965.c | 12 +- drivers/pinctrl/renesas/pfc-r8a77970.c | 40 +- drivers/pinctrl/renesas/pfc-r8a77980.c | 55 +- drivers/pinctrl/renesas/pfc-r8a77990.c | 41 +- drivers/pinctrl/renesas/pfc-r8a77995.c | 46 +- drivers/pinctrl/renesas/pfc-r8a779a0.c | 8 +- drivers/pinctrl/renesas/pfc-r8a779f0.c | 10 +- drivers/pinctrl/renesas/pfc-r8a779g0.c | 1095 +++++++++++--------- drivers/pinctrl/renesas/pfc.c | 9 +- .../renesas/{pfc-r7s72100.c => pinctrl-rza1.c} | 0 drivers/pinctrl/renesas/sh_pfc.h | 17 +- include/dt-bindings/clock/r8a779f0-cpg-mssr.h | 2 +- include/dt-bindings/power/r8a7795-sysc.h | 1 - include/dt-bindings/power/r8a779f0-sysc.h | 2 +- include/linux/compat.h | 2 + 92 files changed, 2914 insertions(+), 1022 deletions(-) create mode 100644 arch/arm/dts/ulcb-audio-graph-card.dtsi create mode 100644 arch/arm/dts/ulcb-audio-graph-card2.dtsi rename drivers/pinctrl/renesas/{pfc-r8a7795.c => pfc-r8a77951.c} (99%) rename drivers/pinctrl/renesas/{pfc-r7s72100.c => pinctrl-rza1.c} (100%)

2 1

[PATCH] input: avoid NULL dereference
by Heinrich Schuchardt 02 Oct '23

02 Oct '23

Before using the result of env_get("stdin") we must check if it is NULL. Use attribute __maybe unused instead of dummy assignment. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/input/input.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index a4341e8c7c..2330b21f71 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -666,19 +666,22 @@ int input_init(struct input_config *config, int leds) int input_stdio_register(struct stdio_dev *dev) { - int error; + __maybe_unused int error; error = stdio_register(dev); #if !defined(CONFIG_SPL_BUILD) || CONFIG_IS_ENABLED(ENV_SUPPORT) - /* check if this is the standard input device */ - if (!error && strcmp(env_get("stdin"), dev->name) == 0) { - /* reassign the console */ - if (OVERWRITE_CONSOLE || - console_assign(stdin, dev->name)) - return -1; + if (!error) { + const char *cstdin; + + /* check if this is the standard input device */ + cstdin = env_get("stdin"); + if (cstdin && !strcmp(cstdin, dev->name)) { + /* reassign the console */ + if (OVERWRITE_CONSOLE || + console_assign(stdin, dev->name)) + return -1; + } } -#else - error = error; #endif return 0; -- 2.40.1

2 1

Help with certain u-boot one-time job
by Mr Academia Euforia 02 Oct '23

02 Oct '23

Hi there, I am working on certain project, part of which is small Uboot piece. I'm currently lacking man power, and I am looking for help with certain Uboot-related patching job. Of course paid help. If there's anyone interested, please email me, and I'll explain. Best regards,

1 0

[ANN] U-Boot v2023.10 released
by Tom Rini 02 Oct '23

02 Oct '23

Hey all, It's release day and here's v2023.10. Once again I want to thank everyone that's contributed to this release, not just in terms of code, but documentation, testing and otherwise ensuring things go as smoothly as they can. In terms of a changelog, git log --merges v2023.10-rc4..v2023.10 contains what I've pulled since the last RC or: git log --merges v2023.07..v2023.01 for changes since the last full release. As always, more details in pull requests (or the tags referenced by them) will result in more details here. The merge window is formally open again, and I'll be merging in next shortly. v2024.01 is scheduled for January 8th, 2024 and the merge window will close and -rc1 will be released on the 23rd of October, and then the next window will open with -rc2, two weeks later. Thanks all! -- Tom

1 1

[PATCH] MAINTAINERS: ufs: Change Bhupesh's email address
by Bhupesh Sharma 02 Oct '23

02 Oct '23

Set my current personal email in the MAINTAINERS file. Signed-off-by: Bhupesh Sharma <bhupesh.linux(a)gmail.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 536df4a896..b1f5ae0591 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1597,7 +1597,7 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-ubi.git F: drivers/mtd/ubi/ UFS -M: Bhupesh Sharma <bhupesh.sharma(a)linaro.org> +M: Bhupesh Sharma <bhupesh.linux(a)gmail.com> M: Neha Malcom Francis <n-francis(a)ti.com> S: Maintained F: drivers/ufs/ -- 2.38.1

4 3

[PATCH 00/14] arm64: xilinx: Sync with Linux kernel
by Michal Simek 02 Oct '23

02 Oct '23

Hi, this series is syncing DTs with Linux kernel. A lot of patches are simply taken from the Linux kernel and taken to U-Boot. But there are also some new one which are trying to fix violations. There is still some work to happen to be 100% in sync but we are getting closer and closer. Thanks, Michal Laurent Pinchart (2): arm64: dts: zynqmp: zcu106a: Describe DisplayPort connector arm64: dts: zynqmp: Add ports for the DisplayPort subsystem Michal Simek (11): arm64: zynqmp: Describe interrupts by using macros arm64: xilinx: Remove address/size-cells from flash node arm64: xilinx: Use lower case for partition address arm64: zynqmp: Describe bus-width for SD card on KV260 arm64: zynqmp: Fix Siva's email address format arm64: xilinx: Put ethernet phys to mdio node arm64: xilinx: Remove address/size-cells from gem nodes arm64: zynqmp: Convert kv260-revA overlay to ASCII text arm64: zynqmp: Sync licenses with Linux kernel ARM: zynq: Describe nand device in DT arm64: zynqmp: Aligned QSPI configuration with latest spec Tanmay Shah (1): arm64: dts: xilinx: zynqmp: Add RPU subsystem device node arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/bitmain-antminer-s9.dts | 3 + arch/arm/dts/versal-mini-emmc0.dts | 2 +- arch/arm/dts/versal-mini-emmc1.dts | 2 +- arch/arm/dts/versal-mini-ospi.dtsi | 2 +- arch/arm/dts/versal-mini-qspi.dtsi | 2 +- arch/arm/dts/versal-mini.dts | 2 +- arch/arm/dts/zynq-zc770-xm011.dts | 3 + arch/arm/dts/zynqmp-clk-ccf.dtsi | 3 +- arch/arm/dts/zynqmp-dlc21-revA.dts | 10 +- arch/arm/dts/zynqmp-g-a2197-00-revA.dts | 10 +- arch/arm/dts/zynqmp-m-a2197-01-revA.dts | 10 +- arch/arm/dts/zynqmp-m-a2197-02-revA.dts | 10 +- arch/arm/dts/zynqmp-m-a2197-03-revA.dts | 10 +- arch/arm/dts/zynqmp-mini-emmc0.dts | 2 +- arch/arm/dts/zynqmp-mini-emmc1.dts | 2 +- arch/arm/dts/zynqmp-mini-nand.dts | 2 +- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-p-a2197-00-revA.dts | 10 +- arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 11 +- arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 5 +- arch/arm/dts/zynqmp-sm-k26-revA.dts | 6 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 4 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 15 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 19 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 8 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 26 ++- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 10 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 7 +- arch/arm/dts/zynqmp-zcu102-revB.dts | 3 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 3 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 5 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 27 ++- arch/arm/dts/zynqmp-zcu111-revA.dts | 7 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 4 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 4 +- arch/arm/dts/zynqmp.dtsi | 249 +++++++++++++++-------- arch/arm/mach-versal/mp.c | 2 +- drivers/fpga/zynqmppl.c | 2 +- 43 files changed, 345 insertions(+), 169 deletions(-) -- 2.36.1

1 15

[PATCH] arm64: zynqmp: Remove resetin/out from K24 psu_init
by Michal Simek 02 Oct '23

02 Oct '23

The code is not called that's why remove it. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- .../zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 123 ------------------ 1 file changed, 123 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c index 45102302dc2c..166e61431ba5 100644 --- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c @@ -602,129 +602,6 @@ static unsigned long psu_peripherals_init_data(void) return 1; } -static unsigned long psu_serdes_init_data(void) -{ - psu_mask_write(0xFD410000, 0x0000001FU, 0x00000009U); - psu_mask_write(0xFD410004, 0x0000001FU, 0x00000009U); - psu_mask_write(0xFD410008, 0x0000001FU, 0x00000008U); - psu_mask_write(0xFD402860, 0x00000080U, 0x00000080U); - psu_mask_write(0xFD402864, 0x00000081U, 0x00000001U); - psu_mask_write(0xFD402868, 0x00000082U, 0x00000002U); - psu_mask_write(0xFD40A094, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD40A368, 0x000000FFU, 0x00000038U); - psu_mask_write(0xFD40A36C, 0x00000007U, 0x00000003U); - psu_mask_write(0xFD402368, 0x000000FFU, 0x00000058U); - psu_mask_write(0xFD40236C, 0x00000007U, 0x00000003U); - psu_mask_write(0xFD406368, 0x000000FFU, 0x00000058U); - psu_mask_write(0xFD40636C, 0x00000007U, 0x00000003U); - psu_mask_write(0xFD402370, 0x000000FFU, 0x0000007CU); - psu_mask_write(0xFD402374, 0x000000FFU, 0x00000033U); - psu_mask_write(0xFD402378, 0x000000FFU, 0x00000002U); - psu_mask_write(0xFD40237C, 0x00000033U, 0x00000030U); - psu_mask_write(0xFD406370, 0x000000FFU, 0x0000007CU); - psu_mask_write(0xFD406374, 0x000000FFU, 0x00000033U); - psu_mask_write(0xFD406378, 0x000000FFU, 0x00000002U); - psu_mask_write(0xFD40637C, 0x00000033U, 0x00000030U); - psu_mask_write(0xFD40A370, 0x000000FFU, 0x000000F4U); - psu_mask_write(0xFD40A374, 0x000000FFU, 0x00000031U); - psu_mask_write(0xFD40A378, 0x000000FFU, 0x00000002U); - psu_mask_write(0xFD40A37C, 0x00000033U, 0x00000030U); - psu_mask_write(0xFD40906C, 0x00000003U, 0x00000003U); - psu_mask_write(0xFD4080F4, 0x00000003U, 0x00000003U); - psu_mask_write(0xFD4090CC, 0x00000020U, 0x00000020U); - psu_mask_write(0xFD401074, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD405074, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD409074, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD40D074, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD401994, 0x00000007U, 0x00000007U); - psu_mask_write(0xFD405994, 0x00000007U, 0x00000007U); - psu_mask_write(0xFD40989C, 0x00000080U, 0x00000080U); - psu_mask_write(0xFD4098F8, 0x000000FFU, 0x0000001AU); - psu_mask_write(0xFD4098FC, 0x000000FFU, 0x0000001AU); - psu_mask_write(0xFD409990, 0x000000FFU, 0x00000010U); - psu_mask_write(0xFD409924, 0x000000FFU, 0x000000FEU); - psu_mask_write(0xFD409928, 0x000000FFU, 0x00000000U); - psu_mask_write(0xFD409900, 0x000000FFU, 0x0000001AU); - psu_mask_write(0xFD40992C, 0x000000FFU, 0x00000000U); - psu_mask_write(0xFD409980, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFD409914, 0x000000FFU, 0x000000F7U); - psu_mask_write(0xFD409918, 0x00000001U, 0x00000001U); - psu_mask_write(0xFD409940, 0x000000FFU, 0x000000F7U); - psu_mask_write(0xFD409944, 0x00000001U, 0x00000001U); - psu_mask_write(0xFD409994, 0x00000007U, 0x00000007U); - psu_mask_write(0xFD40D994, 0x00000007U, 0x00000007U); - psu_mask_write(0xFD40107C, 0x0000000FU, 0x00000001U); - psu_mask_write(0xFD40507C, 0x0000000FU, 0x00000001U); - psu_mask_write(0xFD40907C, 0x0000000FU, 0x00000001U); - psu_mask_write(0xFD40D07C, 0x0000000FU, 0x00000001U); - psu_mask_write(0xFD4019A4, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFD401038, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD40102C, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD4059A4, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFD405038, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD40502C, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD4099A4, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFD409038, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD40902C, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD40D9A4, 0x000000FFU, 0x000000FFU); - psu_mask_write(0xFD40D038, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD40D02C, 0x00000040U, 0x00000040U); - psu_mask_write(0xFD4019AC, 0x00000003U, 0x00000000U); - psu_mask_write(0xFD4059AC, 0x00000003U, 0x00000000U); - psu_mask_write(0xFD4099AC, 0x00000003U, 0x00000000U); - psu_mask_write(0xFD40D9AC, 0x00000003U, 0x00000000U); - psu_mask_write(0xFD401978, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD405978, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD409978, 0x00000010U, 0x00000010U); - psu_mask_write(0xFD40D978, 0x00000010U, 0x00000010U); - - serdes_illcalib(0, 0, 3, 0, 4, 0, 4, 0); - psu_mask_write(0xFD410010, 0x00000077U, 0x00000044U); - psu_mask_write(0xFD410014, 0x00000007U, 0x00000003U); - psu_mask_write(0xFD400CB4, 0x00000037U, 0x00000037U); - psu_mask_write(0xFD404CB4, 0x00000037U, 0x00000037U); - psu_mask_write(0xFD4001D8, 0x00000001U, 0x00000001U); - psu_mask_write(0xFD4041D8, 0x00000001U, 0x00000001U); - psu_mask_write(0xFD404CC0, 0x0000001FU, 0x00000000U); - psu_mask_write(0xFD400CC0, 0x0000001FU, 0x00000000U); - psu_mask_write(0xFD404048, 0x000000FFU, 0x00000000U); - psu_mask_write(0xFD400048, 0x000000FFU, 0x00000000U); - - return 1; -} - -static unsigned long psu_resetout_init_data(void) -{ - psu_mask_write(0xFF5E023C, 0x00000400U, 0x00000000U); - psu_mask_write(0xFF9D0080, 0x00000001U, 0x00000001U); - psu_mask_write(0xFF9D007C, 0x00000001U, 0x00000000U); - psu_mask_write(0xFF5E023C, 0x00000140U, 0x00000000U); - psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000000U); - psu_mask_write(0xFD1A0100, 0x00010000U, 0x00000000U); - psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000000U); - psu_mask_write(0xFD4A0238, 0x0000000FU, 0x00000000U); - psu_mask_write(0xFE20C200, 0x00023FFFU, 0x00022457U); - psu_mask_write(0xFE20C630, 0x003FFF00U, 0x00000000U); - psu_mask_write(0xFE20C11C, 0x00000600U, 0x00000600U); - psu_mask_write(0xFE20C12C, 0x00004000U, 0x00004000U); - psu_mask_write(0xFD480064, 0x00000200U, 0x00000200U); - mask_poll(0xFD4063E4, 0x00000010U); - mask_poll(0xFD40A3E4, 0x00000010U); - - return 1; -} - -static unsigned long psu_resetin_init_data(void) -{ - psu_mask_write(0xFF5E023C, 0x00000540U, 0x00000540U); - psu_mask_write(0xFF5E0230, 0x00000008U, 0x00000008U); - psu_mask_write(0xFD4A0238, 0x0000000FU, 0x0000000AU); - psu_mask_write(0xFD4A0200, 0x00000002U, 0x00000002U); - psu_mask_write(0xFD1A0100, 0x00010000U, 0x00010000U); - - return 1; -} - static unsigned long psu_afi_config(void) { psu_mask_write(0xFD1A0100, 0x00001F80U, 0x00000000U); -- 2.36.1

1 1

[PATCH] arm64: zynqmp: Rename dt overlay file names from dts to dtso
by Michal Simek 02 Oct '23

02 Oct '23

Use dtso suffix instead of dts. Build option was introduced by commit a0f9a77912b2 ("kbuild: Allow DTB overlays to built from .dtso named source files"). Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- .../dts/{zynqmp-sck-kr-g-revA.dts => zynqmp-sck-kr-g-revA.dtso} | 0 .../dts/{zynqmp-sck-kr-g-revB.dts => zynqmp-sck-kr-g-revB.dtso} | 0 .../dts/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 .../dts/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename arch/arm/dts/{zynqmp-sck-kr-g-revA.dts => zynqmp-sck-kr-g-revA.dtso} (100%) rename arch/arm/dts/{zynqmp-sck-kr-g-revB.dts => zynqmp-sck-kr-g-revB.dtso} (100%) rename arch/arm/dts/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) rename arch/arm/dts/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dts b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso similarity index 100% rename from arch/arm/dts/zynqmp-sck-kr-g-revA.dts rename to arch/arm/dts/zynqmp-sck-kr-g-revA.dtso diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dts b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso similarity index 100% rename from arch/arm/dts/zynqmp-sck-kr-g-revB.dts rename to arch/arm/dts/zynqmp-sck-kr-g-revB.dtso diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso similarity index 100% rename from arch/arm/dts/zynqmp-sck-kv-g-revA.dts rename to arch/arm/dts/zynqmp-sck-kv-g-revA.dtso diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso similarity index 100% rename from arch/arm/dts/zynqmp-sck-kv-g-revB.dts rename to arch/arm/dts/zynqmp-sck-kv-g-revB.dtso -- 2.36.1

1 1

[PATCH] arm64: zynqmp: Describe assigned-clocks for uarts
by Michal Simek 02 Oct '23

02 Oct '23

Describe assigned-clocks for both uarts. SOM is using this functionality. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-clk-ccf.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/dts/zynqmp-clk-ccf.dtsi b/arch/arm/dts/zynqmp-clk-ccf.dtsi index 1ae8ea2e43f7..9c0aa073dd94 100644 --- a/arch/arm/dts/zynqmp-clk-ccf.dtsi +++ b/arch/arm/dts/zynqmp-clk-ccf.dtsi @@ -253,10 +253,12 @@ &uart0 { clocks = <&zynqmp_clk UART0_REF>, <&zynqmp_clk LPD_LSBUS>; + assigned-clocks = <&zynqmp_clk UART0_REF>; }; &uart1 { clocks = <&zynqmp_clk UART1_REF>, <&zynqmp_clk LPD_LSBUS>; + assigned-clocks = <&zynqmp_clk UART1_REF>; }; &usb0 { -- 2.36.1

1 1

[PATCH] pinctrl: zynqmp: Display the tristate configuration for all pins
by Venkatesh Yadav Abbarapu 02 Oct '23

02 Oct '23

Read the tristate config for all the pins and display it. ZynqMP> pinmux status MIO1 MIO1: slew:fast bias:enabled pull:up input:cmos drive:12mA volt:1.8 tri_state:enabled Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- drivers/pinctrl/pinctrl-zynqmp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c index 02626a7561..d98834b1aa 100644 --- a/drivers/pinctrl/pinctrl-zynqmp.c +++ b/drivers/pinctrl/pinctrl-zynqmp.c @@ -533,6 +533,8 @@ static int zynqmp_pinctrl_get_pin_muxing(struct udevice *dev, &pinmux.drive_strength); zynqmp_pm_pinctrl_get_config(selector, PM_PINCTRL_CONFIG_VOLTAGE_STATUS, &pinmux.volt_sts); + zynqmp_pm_pinctrl_get_config(selector, PM_PINCTRL_CONFIG_TRI_STATE, + &pinmux.tri_state); switch (pinmux.drive_strength) { case PM_PINCTRL_DRIVE_STRENGTH_2MA: @@ -553,13 +555,15 @@ static int zynqmp_pinctrl_get_pin_muxing(struct udevice *dev, return -EINVAL; } - snprintf(buf, size, "slew:%s\tbias:%s\tpull:%s\tinput:%s\tdrive:%dmA\tvolt:%s", + snprintf(buf, size, + "slew:%s\tbias:%s\tpull:%s\tinput:%s\tdrive:%dmA\tvolt:%s\ttri_state:%s", pinmux.slew ? "slow" : "fast", pinmux.bias ? "enabled" : "disabled", pinmux.pull_ctrl ? "up" : "down", pinmux.input_type ? "schmitt" : "cmos", pinmux.drive_strength, - pinmux.volt_sts ? "1.8" : "3.3"); + pinmux.volt_sts ? "1.8" : "3.3", + pinmux.tri_state ? "enabled" : "disabled"); return 0; } -- 2.17.1

2 2