Skip to content

Commit 349b5be

Browse files
robimarkoandersson
authored andcommitted
clk: qcom: ipq6018: fix networking resets
Networking resets in IPQ6018 all use bitmask as they require multiple bits to be set and cleared instead of a single bit. So, current networking resets have the same register and bit 0 set which is clearly incorrect. Fixes: d9db07f ("clk: qcom: Add ipq6018 Global Clock Controller support") Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230526190855.2941291-2-robimarko@gmail.com
1 parent f4f0c8a commit 349b5be

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

drivers/clk/qcom/gcc-ipq6018.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4520,24 +4520,24 @@ static const struct qcom_reset_map gcc_ipq6018_resets[] = {
45204520
[GCC_PCIE0_AHB_ARES] = { 0x75040, 5 },
45214521
[GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 },
45224522
[GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 },
4523-
[GCC_PPE_FULL_RESET] = { 0x68014, 0 },
4524-
[GCC_UNIPHY0_SOFT_RESET] = { 0x56004, 0 },
4523+
[GCC_PPE_FULL_RESET] = { .reg = 0x68014, .bitmask = 0xf0000 },
4524+
[GCC_UNIPHY0_SOFT_RESET] = { .reg = 0x56004, .bitmask = 0x3ff2 },
45254525
[GCC_UNIPHY0_XPCS_RESET] = { 0x56004, 2 },
4526-
[GCC_UNIPHY1_SOFT_RESET] = { 0x56104, 0 },
4526+
[GCC_UNIPHY1_SOFT_RESET] = { .reg = 0x56104, .bitmask = 0x32 },
45274527
[GCC_UNIPHY1_XPCS_RESET] = { 0x56104, 2 },
4528-
[GCC_EDMA_HW_RESET] = { 0x68014, 0 },
4529-
[GCC_NSSPORT1_RESET] = { 0x68014, 0 },
4530-
[GCC_NSSPORT2_RESET] = { 0x68014, 0 },
4531-
[GCC_NSSPORT3_RESET] = { 0x68014, 0 },
4532-
[GCC_NSSPORT4_RESET] = { 0x68014, 0 },
4533-
[GCC_NSSPORT5_RESET] = { 0x68014, 0 },
4534-
[GCC_UNIPHY0_PORT1_ARES] = { 0x56004, 0 },
4535-
[GCC_UNIPHY0_PORT2_ARES] = { 0x56004, 0 },
4536-
[GCC_UNIPHY0_PORT3_ARES] = { 0x56004, 0 },
4537-
[GCC_UNIPHY0_PORT4_ARES] = { 0x56004, 0 },
4538-
[GCC_UNIPHY0_PORT5_ARES] = { 0x56004, 0 },
4539-
[GCC_UNIPHY0_PORT_4_5_RESET] = { 0x56004, 0 },
4540-
[GCC_UNIPHY0_PORT_4_RESET] = { 0x56004, 0 },
4528+
[GCC_EDMA_HW_RESET] = { .reg = 0x68014, .bitmask = 0x300000 },
4529+
[GCC_NSSPORT1_RESET] = { .reg = 0x68014, .bitmask = 0x1000003 },
4530+
[GCC_NSSPORT2_RESET] = { .reg = 0x68014, .bitmask = 0x200000c },
4531+
[GCC_NSSPORT3_RESET] = { .reg = 0x68014, .bitmask = 0x4000030 },
4532+
[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = 0x8000300 },
4533+
[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = 0x10000c00 },
4534+
[GCC_UNIPHY0_PORT1_ARES] = { .reg = 0x56004, .bitmask = 0x30 },
4535+
[GCC_UNIPHY0_PORT2_ARES] = { .reg = 0x56004, .bitmask = 0xc0 },
4536+
[GCC_UNIPHY0_PORT3_ARES] = { .reg = 0x56004, .bitmask = 0x300 },
4537+
[GCC_UNIPHY0_PORT4_ARES] = { .reg = 0x56004, .bitmask = 0xc00 },
4538+
[GCC_UNIPHY0_PORT5_ARES] = { .reg = 0x56004, .bitmask = 0x3000 },
4539+
[GCC_UNIPHY0_PORT_4_5_RESET] = { .reg = 0x56004, .bitmask = 0x3c02 },
4540+
[GCC_UNIPHY0_PORT_4_RESET] = { .reg = 0x56004, .bitmask = 0xc02 },
45414541
[GCC_LPASS_BCR] = {0x1F000, 0},
45424542
[GCC_UBI32_TBU_BCR] = {0x65000, 0},
45434543
[GCC_LPASS_TBU_BCR] = {0x6C000, 0},

0 commit comments

Comments
 (0)