Commit b2363297 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v6.8-rockchip-dts32-2' of...

Merge tag 'v6.8-rockchip-dts32-2' of git://git.kernel.org/pub/scm/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@diegoSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 228307ad bb0b255f
......@@ -8,6 +8,10 @@ / {
model = "Rockchip RK3036 KylinBoard";
compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
chosen {
stdout-path = "serial2:115200n8";
};
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x20000000>;
......
......@@ -285,7 +285,6 @@ emmc: mmc@1021c000 {
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
rockchip,default-sample-phase = <158>;
disable-wp;
dmas = <&pdma 12>;
dma-names = "rx-tx";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment