On Fri, 2 Aug 2024, Sergey 'Jin' Bostandzhyan wrote:
Hi,
On Fri, Aug 02, 2024 at 09:46:40AM +0000, Bjoern A. Zeeb wrote:
I noticed, that a DTS for the R2S Plus is not yet available, while the
R2S is already there. The only difference is, that the Plus version has an
eMMC, so we can reuse the R2S definitions and only add an eMMC block, which
I copied from the DTS in the friendlyarm/uboot-rockchip repo.
The original has a
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
please don't lose the OR MIT as other projects outside Linux do use the
same dts files; and the original r2s file also preserved it.
Uhm... I am confused now, I copy-pasted the emmc block from this file:
https://github.com/friendlyarm/uboot-rockchip/blob/nanopi4-v2017.09/arch/arm/dts/rk3328-nanopi-r2.dts#L7
The header does not have the "OR MIT" in there, it's just
"SPDX-License-Identifier: GPL-2.0+" which is what I also copied
over, together with the (c) part.
The source which I was using is described in the commit message:
The eMMC configuration for the DTS has been extracted and copied from
rk3328-nanopi-r2.dts, v2017.09 branch from the friendlyarm/uboot-rockchip
repository.
Maybe you looked at a different branch? Shall I still add the "OR
MIT" or leave it as in the original file which I copied it from?
That explains also why there's no sdmmc_ext/sdio bits...
See here for more:
https://github.com/friendlyarm/kernel-rockchip/blob/nanopi-r2-v6.1.y/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2-rev24.dts
My current believe is that rockchip/rk3328.dtsi needs the additional
sdmmc_ext: mmc@ff5f0000
block and the vendor setting for rk3328-nanopi-r2s-plus.dts
needs like:
aliases {
mmc0 = &sdmmc;
mmc1 = &sdmmcext;
mmc2 = &emmc;
};
and also need
+&emmc {
+&sdmmc {
+&sdmmc_ext {
+&sdmmc0ext_clk {
+&sdmmc0ext_cmd {
+&sdmmc0ext_bus4 {
+&sdio_pwrseq {
but I don't do Linux a lot so I don't know the current state of art for
6.11 for each of the values there (I assume some need tweaking and
cleanup).
/bz
--
Bjoern A. Zeeb r15:7