hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/clk/qcom/gcc-ipq6018.c
....@@ -1654,7 +1654,7 @@
16541654 .name = "sdcc1_apps_clk_src",
16551655 .parent_data = gcc_xo_gpll0_gpll2_gpll0_out_main_div2,
16561656 .num_parents = 4,
1657
- .ops = &clk_rcg2_ops,
1657
+ .ops = &clk_rcg2_floor_ops,
16581658 },
16591659 };
16601660
....@@ -4517,24 +4517,24 @@
45174517 [GCC_PCIE0_AHB_ARES] = { 0x75040, 5 },
45184518 [GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 },
45194519 [GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 },
4520
- [GCC_PPE_FULL_RESET] = { 0x68014, 0 },
4521
- [GCC_UNIPHY0_SOFT_RESET] = { 0x56004, 0 },
4520
+ [GCC_PPE_FULL_RESET] = { .reg = 0x68014, .bitmask = 0xf0000 },
4521
+ [GCC_UNIPHY0_SOFT_RESET] = { .reg = 0x56004, .bitmask = 0x3ff2 },
45224522 [GCC_UNIPHY0_XPCS_RESET] = { 0x56004, 2 },
4523
- [GCC_UNIPHY1_SOFT_RESET] = { 0x56104, 0 },
4523
+ [GCC_UNIPHY1_SOFT_RESET] = { .reg = 0x56104, .bitmask = 0x32 },
45244524 [GCC_UNIPHY1_XPCS_RESET] = { 0x56104, 2 },
4525
- [GCC_EDMA_HW_RESET] = { 0x68014, 0 },
4526
- [GCC_NSSPORT1_RESET] = { 0x68014, 0 },
4527
- [GCC_NSSPORT2_RESET] = { 0x68014, 0 },
4528
- [GCC_NSSPORT3_RESET] = { 0x68014, 0 },
4529
- [GCC_NSSPORT4_RESET] = { 0x68014, 0 },
4530
- [GCC_NSSPORT5_RESET] = { 0x68014, 0 },
4531
- [GCC_UNIPHY0_PORT1_ARES] = { 0x56004, 0 },
4532
- [GCC_UNIPHY0_PORT2_ARES] = { 0x56004, 0 },
4533
- [GCC_UNIPHY0_PORT3_ARES] = { 0x56004, 0 },
4534
- [GCC_UNIPHY0_PORT4_ARES] = { 0x56004, 0 },
4535
- [GCC_UNIPHY0_PORT5_ARES] = { 0x56004, 0 },
4536
- [GCC_UNIPHY0_PORT_4_5_RESET] = { 0x56004, 0 },
4537
- [GCC_UNIPHY0_PORT_4_RESET] = { 0x56004, 0 },
4525
+ [GCC_EDMA_HW_RESET] = { .reg = 0x68014, .bitmask = 0x300000 },
4526
+ [GCC_NSSPORT1_RESET] = { .reg = 0x68014, .bitmask = 0x1000003 },
4527
+ [GCC_NSSPORT2_RESET] = { .reg = 0x68014, .bitmask = 0x200000c },
4528
+ [GCC_NSSPORT3_RESET] = { .reg = 0x68014, .bitmask = 0x4000030 },
4529
+ [GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = 0x8000300 },
4530
+ [GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = 0x10000c00 },
4531
+ [GCC_UNIPHY0_PORT1_ARES] = { .reg = 0x56004, .bitmask = 0x30 },
4532
+ [GCC_UNIPHY0_PORT2_ARES] = { .reg = 0x56004, .bitmask = 0xc0 },
4533
+ [GCC_UNIPHY0_PORT3_ARES] = { .reg = 0x56004, .bitmask = 0x300 },
4534
+ [GCC_UNIPHY0_PORT4_ARES] = { .reg = 0x56004, .bitmask = 0xc00 },
4535
+ [GCC_UNIPHY0_PORT5_ARES] = { .reg = 0x56004, .bitmask = 0x3000 },
4536
+ [GCC_UNIPHY0_PORT_4_5_RESET] = { .reg = 0x56004, .bitmask = 0x3c02 },
4537
+ [GCC_UNIPHY0_PORT_4_RESET] = { .reg = 0x56004, .bitmask = 0xc02 },
45384538 [GCC_LPASS_BCR] = {0x1F000, 0},
45394539 [GCC_UBI32_TBU_BCR] = {0x65000, 0},
45404540 [GCC_LPASS_TBU_BCR] = {0x6C000, 0},