Skip to content

Commit da3b23f

Browse files
committed
arm64: dts: rockchip: rk1808 fix clk_32k_ioe setting
This patch will move clk_32k_ioe setting from core dtsi to rk1808 evb which has pmic with 32k clock and connect to RK1808 SoC. Fix 'commit 5684cdd("arm64: dts: rockchip: rk1808: assigned-clock-parents for clk_32k_ioe")' Fix 'commit b1680c7("arm64: dts: rockchip: rk1808: add pinctrl for clkin/out_32k")' For board with 32k clock out from pmic and put to RK1808, like evb-v10, the clk32k_ioe/gpio0_c2 pin (aw13) should be pull normal. For board with clk32k_ioe/gpio0_c2 float, the aw13 should be pull down. Change-Id: I4961ecb8802c6cfbe2af4af0cca955cf920f65da Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
1 parent 03aac86 commit da3b23f

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

arch/arm64/boot/dts/rockchip/rk1808-evb-x4.dts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,12 @@
4646

4747
&cru {
4848
assigned-clocks =
49-
<&cru SCLK_32K_IOE>,
5049
<&cru PLL_GPLL>, <&cru PLL_CPLL>,
5150
<&cru PLL_PPLL>, <&cru ARMCLK>,
5251
<&cru MSCLK_PERI>, <&cru LSCLK_PERI>,
5352
<&cru HSCLK_BUS_PRE>, <&cru MSCLK_BUS_PRE>,
5453
<&cru LSCLK_BUS_PRE>, <&cru DCLK_VOPRAW>;
55-
assigned-clock-parents = <&xin32k>;
5654
assigned-clock-rates =
57-
<32768>,
5855
<1188000000>, <1000000000>,
5956
<100000000>, <816000000>,
6057
<200000000>, <100000000>,

arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,17 @@
208208
wireless_wlan: wireless-wlan {
209209
compatible = "wlan-platdata";
210210
rockchip,grf = <&grf>;
211+
/*
212+
* Note:
213+
* Set clk_32k_ioe iomux, clock rate and parent, finally
214+
* intent to set pull normal for clk32k_io/gpio0_c2(aw13)
215+
* A normal state is better for 32k clock signal quality.
216+
*/
211217
pinctrl-names = "default";
212-
pinctrl-0 = <&wifi_wake_host>;
218+
pinctrl-0 = <&wifi_wake_host &clkin_32k>;
219+
assigned-clocks = <&cru SCLK_32K_IOE>;
220+
assigned-clock-rates = <32768>;
221+
assigned-clock-parents = <&xin32k>;
213222
wifi_chip_type = "ap6212";
214223
WIFI,host_wake_irq = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>;
215224
status = "okay";

arch/arm64/boot/dts/rockchip/rk1808.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,6 @@
293293
clock-frequency = <32768>;
294294
clock-output-names = "xin32k";
295295
#clock-cells = <0>;
296-
pinctrl-names = "default";
297-
pinctrl-0 = <&clkin_32k>;
298296
};
299297

300298
pcie0: pcie@fc400000 {
@@ -645,15 +643,12 @@
645643
#reset-cells = <1>;
646644

647645
assigned-clocks =
648-
<&cru SCLK_32K_IOE>,
649646
<&cru PLL_GPLL>, <&cru PLL_CPLL>,
650647
<&cru PLL_PPLL>, <&cru ARMCLK>,
651648
<&cru MSCLK_PERI>, <&cru LSCLK_PERI>,
652649
<&cru HSCLK_BUS_PRE>, <&cru MSCLK_BUS_PRE>,
653650
<&cru LSCLK_BUS_PRE>;
654-
assigned-clock-parents = <&xin32k>;
655651
assigned-clock-rates =
656-
<32768>,
657652
<1188000000>, <1000000000>,
658653
<100000000>, <816000000>,
659654
<200000000>, <100000000>,

0 commit comments

Comments
 (0)