diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-01-02 11:01:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-01-02 11:01:04 +0100 |
| commit | b2363297508a83b9f92ac8dadfbd1fbec2ee22a9 (patch) | |
| tree | 47586a5f9501ec6c9c647ae0f63a8984b9e5b125 /arch/arm/boot | |
| parent | 228307ad3f9e937fcdc4ea4c24b52acf40bbfc32 (diff) | |
| parent | bb0b255fb6f14b1620566d7d32c43adaca09c5e5 (diff) | |
| download | lwn-b2363297508a83b9f92ac8dadfbd1fbec2ee22a9.tar.gz lwn-b2363297508a83b9f92ac8dadfbd1fbec2ee22a9.zip | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts index 4a8d27ace6bf..e32c73d32f0a 100644 --- a/arch/arm/boot/dts/rockchip/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rockchip/rk3036-kylin.dts @@ -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>; diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 2b00109bea6a..04af224005f8 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -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"; |