iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RK3036 fix for emmc init issue and stdout-path for the console

Browse Source 
on rk3036 kylin.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAmWTQHcQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgZrMCACkmW+4rdy+TpM2A2tmC3vbQqZg8/vxX3+C
 +5tC1MyF2FMeqiFgPZwyLx6fffkKXby55XavwmUo5Mh6Z+RT8CEFR0eRa4M4XGtP
 ZuNtkUnkZ24xu/y+lzrE7A3R/iK1SLBV4fpAjTM+A1IPFHNi2DgSydgLVEgs8Coc
 i8pneQ0ttxnpZEUsiIimf0vHEh7yp2QVZPNaHx4yXYXK3msONZPTtgbe67Nf4D7c
 2XA24R7LyrWVxiVvDT31Z/B/Kwz47G+QHp0kzgDD3scz5g9iDLk/cmMNJu3oDrcf
 RtR3lH9P6dxQY7wJgxn2cl13sH33GoXkyaqKEg0QzM6rStjPWwfn
 =g0r9
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWT3uAACgkQYKtH/8kJ
 Uidunw/+JQ10sKA6fLjJDoJNSmW7rIc/q3oCh3qASUd/uVfskDpfakuOThhArzD8
 sTueOp39KgSw2jdcHNs4ms/Jou9fLe3EBK1bbIY134QuvZQ1BRe+IvGMA+PiceOn
 EetsFcIh9ybp6TbpcLgUTGDx1J0k7kOZIqoQCjPXaMbTtpx2ZETnOaS8Yzl4wsXm
 4mrW6lH/sj2SIjf70Wp1UhvAH3YNp9+UEb+LPmaCSFEMPfLdNKJ9Pd0vCSBhtD27
 +ODJZA6fDw8lcaB29BtS6GxyWZTbgY9KydFtx1EQAWTMFCAONCe/GlO8FuMJkhGG
 iFfkv9EqM+EM3OOcodNQGRL/TJARjZr3hO2cYTjGR35ppsCLwI8P0ZiTfiDUR4lH
 kcC+ys5XGD/QqqEbvaCy+/eNB8hAJhsCF+dnwvuU4vfibSoWQdvNTmdqY8ZDsg5a
 xVtYSXnWP8GBW93OuzFu4g9MwOzznzfvZ+W8DKmsfKzMYS3FFGA53Ca/7gMIkJMN
 UgGThGmuiyMPNhTg3b7le2pyWJ75XxqzyUKg+2hsE3vFASRzcYlohklRPXBHfGe9
 nI275aTF6JgsfInWTXvxAyW5YVd3NqwqdQqRRTKVnfLmyqgHw7PUxaQ5spraZfPa
 J1DakA2X7v7LwvegmovO45wYK0SmECTE6zXJwl9tNwD/pEaEcoQ=
 =bRwH
 -----END PGP SIGNATURE-----

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@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-01-02 11:01:03 +01:00
commit b236329750
2 changed files with 4 additions and 1 deletions
Show Stats 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 @@
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";