| Message ID | 20240722105623.74606-1-Maxim.Moskalets@kaspersky.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [v4] board: rockchip: add Radxa ROCK 3 Model C | expand |
Hi, please cherry-pick below too https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/commit/src/arm64/rockchip/rk3566-rock-3c.dts?h=v6.11-rc1-dts&id=dd40945a1d0e28ae6eaf9da04f8e2dcebf8233ea On 7/22/24 19:56, Maxim Moskalets wrote: > Based on rock-3a-rk3568_defconfig. > Tested on v1.31 revision. > > Board Specifications: > - Rockchip RK3566 > - 1/2/4GB LPDDR4 2112MT/s > - eMMC socket > - uSD card slot > - M.2 2230 Connector > - GbE LAN with POE I saw "Waiting for PHY auto negotiation to complete......" message few seconds when trying to ping on u-boot. it doesn't happen on RadxaZERO 3E does it happen on your board? > - 3.5mm jack with mic > - HDMI 2.0, MIPI DSI/CSI > - USB 3.0 Host/OTG, USB 2.0 Host OTG is USB2.0 (upper) port https://radxa.com/products/rock3/3c/#techspec Best regards, -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. > - 40-pin GPIO expansion ports > > Signed-off-by: Maxim Moskalets <maximmosk4@gmail.com> > Suggested-by: Jonas Karlman <jonas@kwiboo.se> > Reviewed-by: Jonas Karlman <jonas@kwiboo.se> > --- > v4: > fixed typo in commit-msg > moved maintainers record to file for rk3568 boards > renamed from ROCK 3 Model C to ROCK3C > v3: > add suggested by Jonas Karlman <jonas@kwiboo.se> in > https://lore.kernel.org/all/bbb81dd1-e318-423d-8258-db7556ce6850@kwiboo.se/ > v2: > rebase to updated upstream dts > --- > arch/arm/dts/rk3566-rock-3c-u-boot.dtsi | 10 +++ > board/rockchip/evb_rk3568/MAINTAINERS | 7 ++ > configs/rock-3c-rk3566_defconfig | 97 +++++++++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > 4 files changed, 115 insertions(+) > create mode 100644 arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > create mode 100644 configs/rock-3c-rk3566_defconfig > > diff --git a/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > new file mode 100644 > index 00000000000..fd7f5367b75 > --- /dev/null > +++ b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > + > +#include "rk356x-u-boot.dtsi" > + > +&sfc { > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + }; > +}; > diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS > index e5b0986ead9..ba4884db8e1 100644 > --- a/board/rockchip/evb_rk3568/MAINTAINERS > +++ b/board/rockchip/evb_rk3568/MAINTAINERS > @@ -69,3 +69,10 @@ S: Maintained > F: configs/rock-3a-rk3568_defconfig > F: arch/arm/dts/rk3568-rock-3a.dts > F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi > + > +ROCK-3C > +M: Jonas Karlman <jonas@kwiboo.se> > +M: Maxim Moskalets <maximmosk4@gmail.com> > +S: Maintained > +F: arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > +F: configs/rock-3c-rk3566_defconfig > diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig > new file mode 100644 > index 00000000000..f44b202c8c3 > --- /dev/null > +++ b/configs/rock-3c-rk3566_defconfig > @@ -0,0 +1,97 @@ > +CONFIG_ARM=y > +CONFIG_SKIP_LOWLEVEL_INIT=y > +CONFIG_COUNTER_FREQUENCY=24000000 > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SF_DEFAULT_SPEED=24000000 > +CONFIG_SF_DEFAULT_MODE=0x2000 > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-rock-3c" > +CONFIG_ROCKCHIP_RK3568=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > +CONFIG_SPL_SERIAL=y > +CONFIG_DEBUG_UART_BASE=0xFE660000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > +CONFIG_SYS_LOAD_ADDR=0xc00800 > +CONFIG_PCI=y > +CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > +CONFIG_FIT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_SPL_FIT_SIGNATURE=y > +CONFIG_SPL_LOAD_FIT=y > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-rock-3c.dtb" > +# CONFIG_DISPLAY_CPUINFO is not set > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_MAX_SIZE=0x40000 > +CONFIG_SPL_PAD_TO=0x7f8000 > +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 > +CONFIG_SPL_ATF=y > +CONFIG_CMD_GPIO=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_I2C=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_PCI=y > +CONFIG_CMD_POWEROFF=y > +CONFIG_CMD_USB=y > +# CONFIG_CMD_SETEXPR is not set > +CONFIG_CMD_PMIC=y > +CONFIG_CMD_REGULATOR=y > +# CONFIG_SPL_DOS_PARTITION is not set > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_LIVE=y > +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SPL_DM_SEQ_ALIAS=y > +CONFIG_SPL_REGMAP=y > +CONFIG_SPL_SYSCON=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > +CONFIG_SPL_CLK=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_LED=y > +CONFIG_LED_GPIO=y > +CONFIG_MISC=y > +CONFIG_SUPPORT_EMMC_RPMB=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=4 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DWC_ETH_QOS=y > +CONFIG_DWC_ETH_QOS_ROCKCHIP=y > +CONFIG_NVME_PCI=y > +CONFIG_PCIE_DW_ROCKCHIP=y > +CONFIG_PHY_ROCKCHIP_INNO_USB2=y > +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y > +CONFIG_SPL_PINCTRL=y > +CONFIG_DM_PMIC=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_SPL_RAM=y > +CONFIG_SCSI=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SFC=y > +CONFIG_SYSRESET=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_GENERIC=y > +CONFIG_USB_DWC3=y > +CONFIG_USB_DWC3_GENERIC=y > +CONFIG_ERRNO_STR=y > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index bedc52e03e2..60357af6caa 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -105,6 +105,7 @@ List of mainline supported Rockchip boards: > - Pine64 SOQuartz on Model A (soquartz-model-a-rk3566) > - Powkiddy X55 (powkiddy-x55-rk3566) > - Radxa CM3 IO Board (radxa-cm3-io-rk3566) > + - Radxa ROCK 3C (rock-3c-rk3566) > > * rk3568 > - Rockchip Evb-RK3568 (evb-rk3568)
Hi, On 7/22/24 19:56, Maxim Moskalets wrote: > Based on rock-3a-rk3568_defconfig. > Tested on v1.31 revision. > > Board Specifications: > - Rockchip RK3566 > - 1/2/4GB LPDDR4 2112MT/s > - eMMC socket > - uSD card slot > - M.2 2230 Connector > - GbE LAN with POE > - 3.5mm jack with mic > - HDMI 2.0, MIPI DSI/CSI > - USB 3.0 Host/OTG, USB 2.0 Host > - 40-pin GPIO expansion ports > > Signed-off-by: Maxim Moskalets <maximmosk4@gmail.com> > Suggested-by: Jonas Karlman <jonas@kwiboo.se> > Reviewed-by: Jonas Karlman <jonas@kwiboo.se> > --- > v4: > fixed typo in commit-msg > moved maintainers record to file for rk3568 boards > renamed from ROCK 3 Model C to ROCK3C > v3: > add suggested by Jonas Karlman <jonas@kwiboo.se> in > https://lore.kernel.org/all/bbb81dd1-e318-423d-8258-db7556ce6850@kwiboo.se/ > v2: > rebase to updated upstream dts > --- > arch/arm/dts/rk3566-rock-3c-u-boot.dtsi | 10 +++ > board/rockchip/evb_rk3568/MAINTAINERS | 7 ++ > configs/rock-3c-rk3566_defconfig | 97 +++++++++++++++++++++++++ > doc/board/rockchip/rockchip.rst | 1 + > 4 files changed, 115 insertions(+) > create mode 100644 arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > create mode 100644 configs/rock-3c-rk3566_defconfig > > diff --git a/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > new file mode 100644 > index 00000000000..fd7f5367b75 > --- /dev/null > +++ b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > @@ -0,0 +1,10 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > + > +#include "rk356x-u-boot.dtsi" > + > +&sfc { > + flash@0 { > + bootph-pre-ram; > + bootph-some-ram; > + }; > +}; > diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS > index e5b0986ead9..ba4884db8e1 100644 > --- a/board/rockchip/evb_rk3568/MAINTAINERS > +++ b/board/rockchip/evb_rk3568/MAINTAINERS > @@ -69,3 +69,10 @@ S: Maintained > F: configs/rock-3a-rk3568_defconfig > F: arch/arm/dts/rk3568-rock-3a.dts > F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi > + > +ROCK-3C > +M: Jonas Karlman <jonas@kwiboo.se> > +M: Maxim Moskalets <maximmosk4@gmail.com> > +S: Maintained > +F: arch/arm/dts/rk3566-rock-3c-u-boot.dtsi > +F: configs/rock-3c-rk3566_defconfig > diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig > new file mode 100644 > index 00000000000..f44b202c8c3 > --- /dev/null > +++ b/configs/rock-3c-rk3566_defconfig > @@ -0,0 +1,97 @@ > +CONFIG_ARM=y > +CONFIG_SKIP_LOWLEVEL_INIT=y > +CONFIG_COUNTER_FREQUENCY=24000000 > +CONFIG_ARCH_ROCKCHIP=y > +CONFIG_SF_DEFAULT_SPEED=24000000 > +CONFIG_SF_DEFAULT_MODE=0x2000 > +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-rock-3c" > +CONFIG_ROCKCHIP_RK3568=y > +CONFIG_ROCKCHIP_SPI_IMAGE=y > +CONFIG_SPL_SERIAL=y > +CONFIG_DEBUG_UART_BASE=0xFE660000 > +CONFIG_DEBUG_UART_CLOCK=24000000 > +CONFIG_SPL_SPI_FLASH_SUPPORT=y > +CONFIG_SPL_SPI=y > +CONFIG_SYS_LOAD_ADDR=0xc00800 > +CONFIG_PCI=y > +CONFIG_DEBUG_UART=y > +CONFIG_AHCI=y > +CONFIG_FIT=y > +CONFIG_FIT_VERBOSE=y > +CONFIG_SPL_FIT_SIGNATURE=y > +CONFIG_SPL_LOAD_FIT=y > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-rock-3c.dtb" > +# CONFIG_DISPLAY_CPUINFO is not set > +CONFIG_DISPLAY_BOARDINFO_LATE=y > +CONFIG_SPL_MAX_SIZE=0x40000 > +CONFIG_SPL_PAD_TO=0x7f8000 > +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > +CONFIG_SPL_SPI_LOAD=y > +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 > +CONFIG_SPL_ATF=y > +CONFIG_CMD_GPIO=y > +CONFIG_CMD_GPT=y > +CONFIG_CMD_I2C=y > +CONFIG_CMD_MMC=y > +CONFIG_CMD_PCI=y > +CONFIG_CMD_POWEROFF=y > +CONFIG_CMD_USB=y > +# CONFIG_CMD_SETEXPR is not set > +CONFIG_CMD_PMIC=y > +CONFIG_CMD_REGULATOR=y > +# CONFIG_SPL_DOS_PARTITION is not set > +CONFIG_SPL_OF_CONTROL=y > +CONFIG_OF_LIVE=y > +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" > +CONFIG_SYS_RELOC_GD_ENV_ADDR=y > +CONFIG_SPL_DM_SEQ_ALIAS=y > +CONFIG_SPL_REGMAP=y > +CONFIG_SPL_SYSCON=y > +CONFIG_SCSI_AHCI=y > +CONFIG_AHCI_PCI=y > +CONFIG_SPL_CLK=y > +CONFIG_ROCKCHIP_GPIO=y > +CONFIG_SYS_I2C_ROCKCHIP=y > +CONFIG_LED=y > +CONFIG_LED_GPIO=y > +CONFIG_MISC=y > +CONFIG_SUPPORT_EMMC_RPMB=y > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_ROCKCHIP=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_SDMA=y > +CONFIG_MMC_SDHCI_ROCKCHIP=y > +CONFIG_SF_DEFAULT_BUS=4 > +CONFIG_SPI_FLASH_SFDP_SUPPORT=y > +CONFIG_SPI_FLASH_GIGADEVICE=y > +CONFIG_SPI_FLASH_MACRONIX=y > +CONFIG_SPI_FLASH_WINBOND=y > +CONFIG_SPI_FLASH_XTX=y > +CONFIG_PHY_REALTEK=y > +CONFIG_DWC_ETH_QOS=y > +CONFIG_DWC_ETH_QOS_ROCKCHIP=y > +CONFIG_NVME_PCI=y > +CONFIG_PCIE_DW_ROCKCHIP=y > +CONFIG_PHY_ROCKCHIP_INNO_USB2=y > +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y > +CONFIG_SPL_PINCTRL=y > +CONFIG_DM_PMIC=y > +CONFIG_PMIC_RK8XX=y > +CONFIG_REGULATOR_RK8XX=y > +CONFIG_SPL_RAM=y > +CONFIG_SCSI=y > +CONFIG_BAUDRATE=1500000 > +CONFIG_DEBUG_UART_SHIFT=2 > +CONFIG_SYS_NS16550_MEM32=y > +CONFIG_ROCKCHIP_SFC=y > +CONFIG_SYSRESET=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_GENERIC=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_GENERIC=y > +CONFIG_USB_DWC3=y > +CONFIG_USB_DWC3_GENERIC=y > +CONFIG_ERRNO_STR=y since USB Type-A OTG port is peripheral mode, you can enable USB gadget functions. could you merge following patch? diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig index f44b202c8c3..707088657fc 100644 --- a/configs/rock-3c-rk3566_defconfig +++ b/configs/rock-3c-rk3566_defconfig @@ -37,6 +37,8 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_POWEROFF=y CONFIG_CMD_USB=y +CONFIG_CMD_ROCKUSB=y +CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y @@ -51,6 +53,7 @@ CONFIG_SPL_SYSCON=y CONFIG_SCSI_AHCI=y CONFIG_AHCI_PCI=y CONFIG_SPL_CLK=y +# CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y @@ -94,4 +97,7 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_ERRNO_STR=y -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd. > diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst > index bedc52e03e2..60357af6caa 100644 > --- a/doc/board/rockchip/rockchip.rst > +++ b/doc/board/rockchip/rockchip.rst > @@ -105,6 +105,7 @@ List of mainline supported Rockchip boards: > - Pine64 SOQuartz on Model A (soquartz-model-a-rk3566) > - Powkiddy X55 (powkiddy-x55-rk3566) > - Radxa CM3 IO Board (radxa-cm3-io-rk3566) > + - Radxa ROCK 3C (rock-3c-rk3566) > > * rk3568 > - Rockchip Evb-RK3568 (evb-rk3568)
sorry, On 8/2/24 10:54, FUKAUMI Naoki wrote: > since USB Type-A OTG port is peripheral mode, you can enable USB gadget > functions. could you merge following patch? it's wrong. "usb_host0_xhci" dr_mode need to be deleted... -- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd.
On 01.08.2024 01:58, FUKAUMI Naoki wrote: > Hi, > > please cherry-pick below too > https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/commit/src/arm64/rockchip/rk3566-rock-3c.dts?h=v6.11-rc1-dts&id=dd40945a1d0e28ae6eaf9da04f8e2dcebf8233ea > > On 7/22/24 19:56, Maxim Moskalets wrote: >> Based on rock-3a-rk3568_defconfig. >> Tested on v1.31 revision. >> >> Board Specifications: >> - Rockchip RK3566 >> - 1/2/4GB LPDDR4 2112MT/s >> - eMMC socket >> - uSD card slot >> - M.2 2230 Connector >> - GbE LAN with POE > > I saw "Waiting for PHY auto negotiation to complete......" message few seconds when trying to ping on u-boot. > it doesn't happen on RadxaZERO 3E > > does it happen on your board? > Yes, I have the same thing happen when I initialize the PHY the first time I use it. I think that's normal. >> - 3.5mm jack with mic >> - HDMI 2.0, MIPI DSI/CSI >> - USB 3.0 Host/OTG, USB 2.0 Host > > OTG is USB2.0 (upper) port > https://radxa.com/products/rock3/3c/#techspec > I can fix it, please see next patch version. Best regards Maxim > Best regards, > > -- > FUKAUMI Naoki > Radxa Computer (Shenzhen) Co., Ltd. > >> - 40-pin GPIO expansion ports >> >> Signed-off-by: Maxim Moskalets <maximmosk4@gmail.com> >> Suggested-by: Jonas Karlman <jonas@kwiboo.se> >> Reviewed-by: Jonas Karlman <jonas@kwiboo.se> >> --- >> v4: >> fixed typo in commit-msg >> moved maintainers record to file for rk3568 boards >> renamed from ROCK 3 Model C to ROCK3C >> v3: >> add suggested by Jonas Karlman <jonas@kwiboo.se> in >> https://lore.kernel.org/all/bbb81dd1-e318-423d-8258-db7556ce6850@kwiboo.se/ >> v2: >> rebase to updated upstream dts >> --- >> arch/arm/dts/rk3566-rock-3c-u-boot.dtsi | 10 +++ >> board/rockchip/evb_rk3568/MAINTAINERS | 7 ++ >> configs/rock-3c-rk3566_defconfig | 97 +++++++++++++++++++++++++ >> doc/board/rockchip/rockchip.rst | 1 + >> 4 files changed, 115 insertions(+) >> create mode 100644 arch/arm/dts/rk3566-rock-3c-u-boot.dtsi >> create mode 100644 configs/rock-3c-rk3566_defconfig >> >> diff --git a/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi >> new file mode 100644 >> index 00000000000..fd7f5367b75 >> --- /dev/null >> +++ b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi >> @@ -0,0 +1,10 @@ >> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) >> + >> +#include "rk356x-u-boot.dtsi" >> + >> +&sfc { >> + flash@0 { >> + bootph-pre-ram; >> + bootph-some-ram; >> + }; >> +}; >> diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS >> index e5b0986ead9..ba4884db8e1 100644 >> --- a/board/rockchip/evb_rk3568/MAINTAINERS >> +++ b/board/rockchip/evb_rk3568/MAINTAINERS >> @@ -69,3 +69,10 @@ S: Maintained >> F: configs/rock-3a-rk3568_defconfig >> F: arch/arm/dts/rk3568-rock-3a.dts >> F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi >> + >> +ROCK-3C >> +M: Jonas Karlman <jonas@kwiboo.se> >> +M: Maxim Moskalets <maximmosk4@gmail.com> >> +S: Maintained >> +F: arch/arm/dts/rk3566-rock-3c-u-boot.dtsi >> +F: configs/rock-3c-rk3566_defconfig >> diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig >> new file mode 100644 >> index 00000000000..f44b202c8c3 >> --- /dev/null >> +++ b/configs/rock-3c-rk3566_defconfig >> @@ -0,0 +1,97 @@ >> +CONFIG_ARM=y >> +CONFIG_SKIP_LOWLEVEL_INIT=y >> +CONFIG_COUNTER_FREQUENCY=24000000 >> +CONFIG_ARCH_ROCKCHIP=y >> +CONFIG_SF_DEFAULT_SPEED=24000000 >> +CONFIG_SF_DEFAULT_MODE=0x2000 >> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-rock-3c" >> +CONFIG_ROCKCHIP_RK3568=y >> +CONFIG_ROCKCHIP_SPI_IMAGE=y >> +CONFIG_SPL_SERIAL=y >> +CONFIG_DEBUG_UART_BASE=0xFE660000 >> +CONFIG_DEBUG_UART_CLOCK=24000000 >> +CONFIG_SPL_SPI_FLASH_SUPPORT=y >> +CONFIG_SPL_SPI=y >> +CONFIG_SYS_LOAD_ADDR=0xc00800 >> +CONFIG_PCI=y >> +CONFIG_DEBUG_UART=y >> +CONFIG_AHCI=y >> +CONFIG_FIT=y >> +CONFIG_FIT_VERBOSE=y >> +CONFIG_SPL_FIT_SIGNATURE=y >> +CONFIG_SPL_LOAD_FIT=y >> +CONFIG_LEGACY_IMAGE_FORMAT=y >> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-rock-3c.dtb" >> +# CONFIG_DISPLAY_CPUINFO is not set >> +CONFIG_DISPLAY_BOARDINFO_LATE=y >> +CONFIG_SPL_MAX_SIZE=0x40000 >> +CONFIG_SPL_PAD_TO=0x7f8000 >> +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set >> +CONFIG_SPL_SPI_LOAD=y >> +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 >> +CONFIG_SPL_ATF=y >> +CONFIG_CMD_GPIO=y >> +CONFIG_CMD_GPT=y >> +CONFIG_CMD_I2C=y >> +CONFIG_CMD_MMC=y >> +CONFIG_CMD_PCI=y >> +CONFIG_CMD_POWEROFF=y >> +CONFIG_CMD_USB=y >> +# CONFIG_CMD_SETEXPR is not set >> +CONFIG_CMD_PMIC=y >> +CONFIG_CMD_REGULATOR=y >> +# CONFIG_SPL_DOS_PARTITION is not set >> +CONFIG_SPL_OF_CONTROL=y >> +CONFIG_OF_LIVE=y >> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" >> +CONFIG_SYS_RELOC_GD_ENV_ADDR=y >> +CONFIG_SPL_DM_SEQ_ALIAS=y >> +CONFIG_SPL_REGMAP=y >> +CONFIG_SPL_SYSCON=y >> +CONFIG_SCSI_AHCI=y >> +CONFIG_AHCI_PCI=y >> +CONFIG_SPL_CLK=y >> +CONFIG_ROCKCHIP_GPIO=y >> +CONFIG_SYS_I2C_ROCKCHIP=y >> +CONFIG_LED=y >> +CONFIG_LED_GPIO=y >> +CONFIG_MISC=y >> +CONFIG_SUPPORT_EMMC_RPMB=y >> +CONFIG_MMC_DW=y >> +CONFIG_MMC_DW_ROCKCHIP=y >> +CONFIG_MMC_SDHCI=y >> +CONFIG_MMC_SDHCI_SDMA=y >> +CONFIG_MMC_SDHCI_ROCKCHIP=y >> +CONFIG_SF_DEFAULT_BUS=4 >> +CONFIG_SPI_FLASH_SFDP_SUPPORT=y >> +CONFIG_SPI_FLASH_GIGADEVICE=y >> +CONFIG_SPI_FLASH_MACRONIX=y >> +CONFIG_SPI_FLASH_WINBOND=y >> +CONFIG_SPI_FLASH_XTX=y >> +CONFIG_PHY_REALTEK=y >> +CONFIG_DWC_ETH_QOS=y >> +CONFIG_DWC_ETH_QOS_ROCKCHIP=y >> +CONFIG_NVME_PCI=y >> +CONFIG_PCIE_DW_ROCKCHIP=y >> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y >> +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y >> +CONFIG_SPL_PINCTRL=y >> +CONFIG_DM_PMIC=y >> +CONFIG_PMIC_RK8XX=y >> +CONFIG_REGULATOR_RK8XX=y >> +CONFIG_SPL_RAM=y >> +CONFIG_SCSI=y >> +CONFIG_BAUDRATE=1500000 >> +CONFIG_DEBUG_UART_SHIFT=2 >> +CONFIG_SYS_NS16550_MEM32=y >> +CONFIG_ROCKCHIP_SFC=y >> +CONFIG_SYSRESET=y >> +CONFIG_USB=y >> +CONFIG_USB_XHCI_HCD=y >> +CONFIG_USB_EHCI_HCD=y >> +CONFIG_USB_EHCI_GENERIC=y >> +CONFIG_USB_OHCI_HCD=y >> +CONFIG_USB_OHCI_GENERIC=y >> +CONFIG_USB_DWC3=y >> +CONFIG_USB_DWC3_GENERIC=y >> +CONFIG_ERRNO_STR=y >> diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst >> index bedc52e03e2..60357af6caa 100644 >> --- a/doc/board/rockchip/rockchip.rst >> +++ b/doc/board/rockchip/rockchip.rst >> @@ -105,6 +105,7 @@ List of mainline supported Rockchip boards: >> - Pine64 SOQuartz on Model A (soquartz-model-a-rk3566) >> - Powkiddy X55 (powkiddy-x55-rk3566) >> - Radxa CM3 IO Board (radxa-cm3-io-rk3566) >> + - Radxa ROCK 3C (rock-3c-rk3566) >> * rk3568 >> - Rockchip Evb-RK3568 (evb-rk3568)
diff --git a/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi new file mode 100644 index 00000000000..fd7f5367b75 --- /dev/null +++ b/arch/arm/dts/rk3566-rock-3c-u-boot.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +#include "rk356x-u-boot.dtsi" + +&sfc { + flash@0 { + bootph-pre-ram; + bootph-some-ram; + }; +}; diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS index e5b0986ead9..ba4884db8e1 100644 --- a/board/rockchip/evb_rk3568/MAINTAINERS +++ b/board/rockchip/evb_rk3568/MAINTAINERS @@ -69,3 +69,10 @@ S: Maintained F: configs/rock-3a-rk3568_defconfig F: arch/arm/dts/rk3568-rock-3a.dts F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi + +ROCK-3C +M: Jonas Karlman <jonas@kwiboo.se> +M: Maxim Moskalets <maximmosk4@gmail.com> +S: Maintained +F: arch/arm/dts/rk3566-rock-3c-u-boot.dtsi +F: configs/rock-3c-rk3566_defconfig diff --git a/configs/rock-3c-rk3566_defconfig b/configs/rock-3c-rk3566_defconfig new file mode 100644 index 00000000000..f44b202c8c3 --- /dev/null +++ b/configs/rock-3c-rk3566_defconfig @@ -0,0 +1,97 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_COUNTER_FREQUENCY=24000000 +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SF_DEFAULT_SPEED=24000000 +CONFIG_SF_DEFAULT_MODE=0x2000 +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3566-rock-3c" +CONFIG_ROCKCHIP_RK3568=y +CONFIG_ROCKCHIP_SPI_IMAGE=y +CONFIG_SPL_SERIAL=y +CONFIG_DEBUG_UART_BASE=0xFE660000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI=y +CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_FIT_SIGNATURE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-rock-3c.dtb" +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_SPL_MAX_SIZE=0x40000 +CONFIG_SPL_PAD_TO=0x7f8000 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000 +CONFIG_SPL_ATF=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_POWEROFF=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +# CONFIG_SPL_DOS_PARTITION is not set +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_SPL_REGMAP=y +CONFIG_SPL_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=4 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_PHY_REALTEK=y +CONFIG_DWC_ETH_QOS=y +CONFIG_DWC_ETH_QOS_ROCKCHIP=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_SPL_PINCTRL=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_SPL_RAM=y +CONFIG_SCSI=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYS_NS16550_MEM32=y +CONFIG_ROCKCHIP_SFC=y +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GENERIC=y +CONFIG_ERRNO_STR=y diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index bedc52e03e2..60357af6caa 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -105,6 +105,7 @@ List of mainline supported Rockchip boards: - Pine64 SOQuartz on Model A (soquartz-model-a-rk3566) - Powkiddy X55 (powkiddy-x55-rk3566) - Radxa CM3 IO Board (radxa-cm3-io-rk3566) + - Radxa ROCK 3C (rock-3c-rk3566) * rk3568 - Rockchip Evb-RK3568 (evb-rk3568)