this commit reverts commit ca2dc35e555e7043de585f4e46123d8fbd2b5a21
from mainline kernel because rk3288 requires clock gating to
assert irq on usb device plug in and thus proceed with
reset-on-wake quirk
* rockchip64: add `BOOT_SCENARIO=binman` for mainline u-boot
- drop special handling for 3308's `legacy` branch
- rpardini: note how SPI/mtd is not yet supported for this scenario
Co-authored-by: Ricardo Pardini <ricardo@pardini.net> (squash/splits, shellfmt)
* `rock-s0`/`rockpi-s`: use `BOOT_SCENARIO=binman`; move blobs to armbian/rkbin
- Move rk3308 boot blobs to armbian/rkbin
- delete obsolete ones
- Alter rock-s0 and rockpi-s to use the new "binman" BOOT_SCENARIO
Co-authored-by: Ricardo Pardini <ricardo@pardini.net> (shellfmt; small fixes; squashes)
- original from 6.11, re-done on top of Viacheslav's 6.12 fix which missed it
- otherwise
```
drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
178 | .remove = meson_gx_socinfo_sm_remove,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
```
Source: https://lore.kernel.org/all/20241016-b4-rk3588-bridge-upstream-v10-0-87ef92a6d14e@collabora.com/^
-----------------------------
**Quote from source:**
Subject: [PATCH v10 0/3] Add initial support for the Rockchip RK3588 HDMI TX Controller
Date: Wed, 16 Oct 2024 23:06:50 +0300
The Rockchip RK3588 SoC family integrates the Synopsys DesignWare HDMI
2.1 Quad-Pixel (QP) TX controller, which is a new IP block, quite
different from those used in the previous generations of Rockchip SoCs.
The controller supports the following features, among others:
* Fixed Rate Link (FRL)
* Display Stream Compression (DSC)
* 4K@120Hz and 8K@60Hz video modes
* Variable Refresh Rate (VRR) including Quick Media Switching (QMS)
* Fast Vactive (FVA)
* SCDC I2C DDC access
* Multi-stream audio
* Enhanced Audio Return Channel (EARC)
This is the last component that needs to be supported in order to enable
the HDMI output functionality on the RK3588 based SBCs, such as the
RADXA Rock 5B. The other components are the Video Output Processor
(VOP2) and the Samsung IP based HDMI/eDP TX Combo PHY, for which basic
support has been already made available via [1] and [2], respectively.
Please note this is a reworked version of the original series, which
relied on a commonized dw-hdmi approach. Since the general consensus
was to handle it as an entirely new IP, I dropped all patches related to
the old dw-hdmi and Rockchip glue code - a few of them might still make
sense as general improvements and will be submitted separately.
It's worth mentioning the HDMI output support is currently limited to
RGB output up to 4K@60Hz, without audio, CEC or any of the HDMI 2.1
specific features. Moreover, the VOP2 driver is not able to properly
handle all display modes supported by the connected screens, e.g. it
doesn't cope with non-integer refresh rates.
A possible workaround consists of enabling the display controller to
make use of the clock provided by the HDMI PHY PLL. This is still work
in progress and will be submitted later, as well as the required DTS
updates.
To facilitate testing and experimentation, all HDMI output related
patches, including those part of this series, are available at [3].
So far I could only verify this on the RADXA Rock 5B board.
Thanks,
Cristian
[1]: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588")
[2]: 553be2830c5f ("phy: rockchip: Add Samsung HDMI/eDP Combo PHY driver")
[3]: https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/commits/rk3588-hdmi-bridge-v6.12-rc2
[4]: https://lore.kernel.org/lkml/20240801-dw-hdmi-qp-tx-v1-0-148f542de5fd@collabora.com/
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
- 0001-general-add-overlay-support
- 0024-RK3588-Add-Crypto-Support (asm/unaligned.h moved to linux/unaligned.h)
- 0025-RK3588-Add-HW-RNG-Support (rename driver file to avoid conflict with new 6.12 driver)
Also add temporary compatibility patch for existing installations,
since existing installations will look for the old dts file.
To make migration smoother, add a pointer to the new file by
including the new dts in the old one.
For migration:
Please edit your `/boot/armbianEnv.txt` as soon as possible to
use BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"!
This workaround will be removed in kernel version 6.14!
- remove patches (already mainlined)
- while at it, rename BOARD_MAINTAINER to the actual GitHub profile
Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
* Board: NanoPC T6 & LTS - Bump uboot from 2024.07 to 2024.10 mainline
- Replaced edge patch with v7 that enable power-supply on USB3.0 and add fan control through pwm.
* Revert BOOTCONFIG to the original state that not exist on vendor kernel and aligned edge BOOTCONFIG
* Rewrited patch with rewrite-kernel-patches flag
* Adjusted nanopct6 configuration
Co-authored-by: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
* Revert patch, added on the same patch a new patch for usb3 and fan stuff
---------
Signed-off-by: SuperKali <hello@superkali.me>
Co-authored-by: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
- Bump U-Boot from v2024.10-rc3 to v2024.10
- Move U-Boot patch dir to default one (`$BOOTBRANCH/board_$BOARD`) which gets applied automatically by the patcher for the specific $BOARD
- Little fixes: Use `declare -g` and a code style similar to NanoPi R6 series
Removed gpio-keys node (NOTE: add to the M4 Berry DTS)
Add vcc1v8 and vcc3v3 regulators
Fixup MMC nodes
Add bluetooth node (NOTE: BT is still iffy in Armbian)
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
Removed gpio-keys node (NOTE: add to the M4 Berry DTS)
Add vcc1v8 and vcc3v3 regulators
Fixup MMC nodes
Add bluetooth node (NOTE: BT is still iffy in Armbian)
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
Re-extract the kernel patches as a series.
Re-extract the u-boot patches as "git format-patch" command.
Unified patch extraction makes it easier to work with patches.
Added a DTSI just in case a M4 Berry should be added at a
later date.
Removed usb1_vbus-supply = <®_usb_vbus>; from the &usbphy
node. In my testing this resolves the onboard WiFi over USB
issue that has been troubling the REV1.
Added REV2 related nodes: SDIO, Regulators, Etc ...
An SDIO / Bluetooth overlay will be added at a later date to
support the REV2.
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
- in main `rockchip64` family, for current/edge (6.6 / 6.11)
- using mainline u-boot's generic rk3568 for current/edge
- vendor kernel is added via a copypasta hook to piggyback on `rk35xx`
- requires armbian/linux-rockchip PR https://github.com/armbian/linux-rockchip/pull/245
- vendor u-boot:
- is required to bringup npu for vendor kernel (otherwise panics)
- .dts done based on vendor kernel DT + looking at armsom-sige3
- defconfig ripped off from armsom-sige3
- Marcin Juszkiewicz's series https://lore.kernel.org/all/20240829-friendlyelec-nanopc-t6-lts-v6-0-edff247e8c02@linaro.org/ has landed upstream
- see db1dcbe5f7
- thus we have 2 separate DTs, one for non-LTS, one for LTS; thus also 2 different Armbian boards (see separate commit)
- drop my own patch that added SPI NOR to the T6, as that is now included in the base DT
- this patch shall be dropped when `6.12-rc1` is released
There are three revs: AM-GZ80x, AM-GZ80x-US and SC-GZ80x
Add a DSTI in case one should drop out of the sky and we
need a DTS for it. This also removes its dependency on
meson-axg-jethome-jethub-j1xx.dtsi.
Can now power down via power button on the back of the
unit and power back on via reset button on the side.
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
Add the A83T processor to the sunxi_mmc_can_calibrate
logic function for proper configuration.
Return the default settings of DRAM_CLK.
This code has been tested for bootloader v2024.01 and later.
