]> git.dujemihanovic.xyz Git - u-boot.git/commit
ARM: dts: rmobile: Synchronize DTs with Linux 6.1.7
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Thu, 26 Jan 2023 20:01:32 +0000 (21:01 +0100)
committerMarek Vasut <marek.vasut+renesas@gmail.com>
Thu, 2 Feb 2023 00:49:19 +0000 (01:49 +0100)
commit71d2a5e5ef04a598d5b9da24d4d58a2ae3f662f6
treebaddbcc30617aa6f032b0a5f790cf73353e8ace2
parent9696b246e611d5b1ff6642234ac22235e20f313f
ARM: dts: rmobile: Synchronize DTs with Linux 6.1.7

Synchronize R-Car device trees with Linux 6.1.7,
commit 21e996306a6afaae88295858de0ffb8955173a15 .

The following script has been used for the synchronization:

$ for i in $(cd arch/arm/dts/ ; ls -1 r8a* | grep -v 'u-boot.dts' ; sed -n '/#include/ s@.*"\(.*\)"@\1@p' $(ls -1 r8a* | grep -v 'u-boot.dts')) ; do
if [ -e /linux-2.6/arch/arm64/boot/dts/renesas/$i ] ; then
cp /linux-2.6/arch/arm64/boot/dts/renesas/$i arch/arm/dts/ ;
elif [ -e /linux-2.6/arch/arm/boot/dts/$i ] ; then
cp /linux-2.6/arch/arm/boot/dts/$i arch/arm/dts/
else
echo "NOT FOUND: $i"
fi
done
$ git add $( ( cd arch/arm/dts/ ; ls -1 r8a* | grep -v 'u-boot.dts' ; sed -n '/#include/ s@.*"\(.*\)"@\1@p' $(ls -1 r8a* | grep -v 'u-boot.dts')) | tr " " "\n" | sed 's@^@arch/arm/dts/@g' )

Move the include/dt-bindings/{clk,clock}/versaclock.h header used by
the renesas boards to match Linux 6.1.y as well.

Keep arch/arm/dts/r8a774c0-u-boot.dtsi sdhi3 node as it is now used
by the arch/arm/dts/r8a774c0-cat874.dts board.

Pick s@spi-flash@flash@ change in arch/arm/dts/r8a779a0-falcon-u-boot.dts
from "ARM: dts: Synchronize R-Car V3U DTs with Linux 5.18.3" .

Adjust R8A77990 Ebisu CONFIG_SYS_MMC_ENV_DEV from 2 to 0 to reflect
the card enumeration in ebisu.dtsi /aliases DT node .

Adjust R8A7795 and R8A7796 ULCB CONFIG_SYS_MMC_ENV_DEV from 1 to 0 to
reflect the card enumeration in ulcb.dtsi /aliases DT node .

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Tam Nguyen <tam.nguyen.xa@renesas.com> # r8a779a0-falcon-u-boot.dts
Signed-off-by: Hai Pham <hai.pham.ud@renesas.com> # r8a779a0-falcon-u-boot.dts
62 files changed:
arch/arm/dts/beacon-renesom-baseboard.dtsi
arch/arm/dts/beacon-renesom-som.dtsi
arch/arm/dts/cat875.dtsi
arch/arm/dts/condor-common.dtsi [new file with mode: 0644]
arch/arm/dts/draak.dtsi [new file with mode: 0644]
arch/arm/dts/ebisu.dtsi [new file with mode: 0644]
arch/arm/dts/hihope-rev4.dtsi
arch/arm/dts/hihope-rzg2-ex.dtsi
arch/arm/dts/r8a774a1-beacon-rzg2m-kit.dts
arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts
arch/arm/dts/r8a774a1-hihope-rzg2m.dts
arch/arm/dts/r8a774a1.dtsi
arch/arm/dts/r8a774b1-beacon-rzg2n-kit.dts
arch/arm/dts/r8a774b1.dtsi
arch/arm/dts/r8a774c0-cat874.dts
arch/arm/dts/r8a774c0-ek874.dts
arch/arm/dts/r8a774c0-u-boot.dtsi
arch/arm/dts/r8a774c0.dtsi
arch/arm/dts/r8a774e1-beacon-rzg2h-kit.dts
arch/arm/dts/r8a774e1.dtsi
arch/arm/dts/r8a7790-lager.dts
arch/arm/dts/r8a7790-stout.dts
arch/arm/dts/r8a7790.dtsi
arch/arm/dts/r8a7791-koelsch.dts
arch/arm/dts/r8a7791-porter.dts
arch/arm/dts/r8a7791.dtsi
arch/arm/dts/r8a7792-blanche.dts
arch/arm/dts/r8a7792.dtsi
arch/arm/dts/r8a7793-gose.dts
arch/arm/dts/r8a7793.dtsi
arch/arm/dts/r8a7794-alt.dts
arch/arm/dts/r8a7794-silk.dts
arch/arm/dts/r8a7794.dtsi
arch/arm/dts/r8a77950-salvator-x.dts
arch/arm/dts/r8a77950-ulcb.dts
arch/arm/dts/r8a77950.dtsi
arch/arm/dts/r8a77951.dtsi
arch/arm/dts/r8a77960-salvator-x.dts
arch/arm/dts/r8a77960-ulcb.dts
arch/arm/dts/r8a77960.dtsi
arch/arm/dts/r8a77965-salvator-x.dts
arch/arm/dts/r8a77965-ulcb.dts
arch/arm/dts/r8a77965.dtsi
arch/arm/dts/r8a77970-eagle.dts
arch/arm/dts/r8a77970.dtsi
arch/arm/dts/r8a77980-condor.dts
arch/arm/dts/r8a77980.dtsi
arch/arm/dts/r8a77990-ebisu.dts
arch/arm/dts/r8a77990.dtsi
arch/arm/dts/r8a77995-draak.dts
arch/arm/dts/r8a77995.dtsi
arch/arm/dts/r8a779a0-falcon-cpu.dtsi
arch/arm/dts/r8a779a0-falcon-csi-dsi.dtsi [new file with mode: 0644]
arch/arm/dts/r8a779a0-falcon-ethernet.dtsi [new file with mode: 0644]
arch/arm/dts/r8a779a0-falcon-u-boot.dts
arch/arm/dts/r8a779a0-falcon.dts
arch/arm/dts/r8a779a0.dtsi
arch/arm/dts/ulcb.dtsi
configs/r8a77990_ebisu_defconfig
configs/rcar3_ulcb_defconfig
drivers/clk/clk_versaclock.c
include/dt-bindings/clock/versaclock.h [moved from include/dt-bindings/clk/versaclock.h with 100% similarity]