mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-12 16:15:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v6.8-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2024-01-02 11:01:03 +01:00
parent 228307ad3f bb0b255fb6
commit b236329750
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rockchip/rk3036-kylin.dts
View File

@@ -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>;

1
arch/arm/boot/dts/rockchip/rk3036.dtsi
View File

@@ -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";