Merge tag 'v6.8-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Jan 2024 10:01:03 +0000 (11:01 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Jan 2024 10:01:04 +0000 (11:01 +0100)
commitb2363297508a83b9f92ac8dadfbd1fbec2ee22a9
tree47586a5f9501ec6c9c647ae0f63a8984b9e5b125
parent228307ad3f9e937fcdc4ea4c24b52acf40bbfc32
parentbb0b255fb6f14b1620566d7d32c43adaca09c5e5
Merge tag 'v6.8-rockchip-dts32-2' of git://git./linux/kernel/git/mmind/linux-rockchip into soc/dt

RK3036 fix for emmc init issue and stdout-path for the console
on rk3036 kylin.

* tag 'v6.8-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Remove rockchip,default-sample-phase from rk3036.dtsi
  ARM: dts: rockchip: Add stdout-path for rk3036 kylin

Link: https://lore.kernel.org/r/15502825.JCcGWNJJiE@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>