From 59de53c291143407946109f2dc19c3f28ab7356a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 11 Oct 2022 21:16:36 +0200 Subject: [PATCH] drop empty 5.10 series entries --- ...ng-legacy-clkctrl-names-for-om.patch-21893 | 83 +++++++++---------- queue-5.10/series | 2 - 2 files changed, 37 insertions(+), 48 deletions(-) diff --git a/queue-5.10/revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-21893 b/queue-5.10/revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-21893 index eb0b73955e9..359c0cd316f 100644 --- a/queue-5.10/revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-21893 +++ b/queue-5.10/revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-21893 @@ -11,16 +11,14 @@ Reported as causing boot failures. Signed-off-by: Sasha Levin --- - drivers/clk/ti/clk-44xx.c | 210 +++++++++++++++++++------------------- - drivers/clk/ti/clk-54xx.c | 160 ++++++++++++++--------------- - drivers/clk/ti/clkctrl.c | 4 + + drivers/clk/ti/clk-44xx.c | 210 +++++++++++++++++++++++----------------------- + drivers/clk/ti/clk-54xx.c | 160 +++++++++++++++++------------------ + drivers/clk/ti/clkctrl.c | 4 3 files changed, 189 insertions(+), 185 deletions(-) -diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c -index cbf9922d93d4..a38c92153979 100644 --- a/drivers/clk/ti/clk-44xx.c +++ b/drivers/clk/ti/clk-44xx.c -@@ -56,7 +56,7 @@ static const struct omap_clkctrl_bit_data omap4_aess_bit_data[] __initconst = { +@@ -56,7 +56,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_func_dmic_abe_gfclk_parents[] __initconst = { @@ -29,7 +27,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -76,7 +76,7 @@ static const struct omap_clkctrl_bit_data omap4_dmic_bit_data[] __initconst = { +@@ -76,7 +76,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_func_mcasp_abe_gfclk_parents[] __initconst = { @@ -38,7 +36,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -89,7 +89,7 @@ static const struct omap_clkctrl_bit_data omap4_mcasp_bit_data[] __initconst = { +@@ -89,7 +89,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_func_mcbsp1_gfclk_parents[] __initconst = { @@ -47,7 +45,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -102,7 +102,7 @@ static const struct omap_clkctrl_bit_data omap4_mcbsp1_bit_data[] __initconst = +@@ -102,7 +102,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_func_mcbsp2_gfclk_parents[] __initconst = { @@ -56,7 +54,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -115,7 +115,7 @@ static const struct omap_clkctrl_bit_data omap4_mcbsp2_bit_data[] __initconst = +@@ -115,7 +115,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_func_mcbsp3_gfclk_parents[] __initconst = { @@ -65,7 +63,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -183,18 +183,18 @@ static const struct omap_clkctrl_bit_data omap4_timer8_bit_data[] __initconst = +@@ -183,18 +183,18 @@ static const struct omap_clkctrl_bit_dat static const struct omap_clkctrl_reg_data omap4_abe_clkctrl_regs[] __initconst = { { OMAP4_L4_ABE_CLKCTRL, NULL, 0, "ocp_abe_iclk" }, @@ -95,7 +93,7 @@ index cbf9922d93d4..a38c92153979 100644 { OMAP4_WD_TIMER3_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, { 0 }, }; -@@ -287,7 +287,7 @@ static const struct omap_clkctrl_bit_data omap4_fdif_bit_data[] __initconst = { +@@ -287,7 +287,7 @@ static const struct omap_clkctrl_bit_dat static const struct omap_clkctrl_reg_data omap4_iss_clkctrl_regs[] __initconst = { { OMAP4_ISS_CLKCTRL, omap4_iss_bit_data, CLKF_SW_SUP, "ducati_clk_mux_ck" }, @@ -104,7 +102,7 @@ index cbf9922d93d4..a38c92153979 100644 { 0 }, }; -@@ -320,7 +320,7 @@ static const struct omap_clkctrl_bit_data omap4_dss_core_bit_data[] __initconst +@@ -320,7 +320,7 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap4_l3_dss_clkctrl_regs[] __initconst = { @@ -113,7 +111,7 @@ index cbf9922d93d4..a38c92153979 100644 { 0 }, }; -@@ -336,7 +336,7 @@ static const struct omap_clkctrl_bit_data omap4_gpu_bit_data[] __initconst = { +@@ -336,7 +336,7 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap4_l3_gfx_clkctrl_regs[] __initconst = { @@ -122,7 +120,7 @@ index cbf9922d93d4..a38c92153979 100644 { 0 }, }; -@@ -372,12 +372,12 @@ static const struct omap_clkctrl_bit_data omap4_hsi_bit_data[] __initconst = { +@@ -372,12 +372,12 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_usb_host_hs_utmi_p1_clk_parents[] __initconst = { @@ -137,7 +135,7 @@ index cbf9922d93d4..a38c92153979 100644 NULL, }; -@@ -418,7 +418,7 @@ static const struct omap_clkctrl_bit_data omap4_usb_host_hs_bit_data[] __initcon +@@ -418,7 +418,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_usb_otg_hs_xclk_parents[] __initconst = { @@ -146,7 +144,7 @@ index cbf9922d93d4..a38c92153979 100644 NULL, }; -@@ -452,14 +452,14 @@ static const struct omap_clkctrl_bit_data omap4_ocp2scp_usb_phy_bit_data[] __ini +@@ -452,14 +452,14 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap4_l3_init_clkctrl_regs[] __initconst = { @@ -165,7 +163,7 @@ index cbf9922d93d4..a38c92153979 100644 { 0 }, }; -@@ -530,7 +530,7 @@ static const struct omap_clkctrl_bit_data omap4_gpio6_bit_data[] __initconst = { +@@ -530,7 +530,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap4_per_mcbsp4_gfclk_parents[] __initconst = { @@ -174,7 +172,7 @@ index cbf9922d93d4..a38c92153979 100644 "pad_clks_ck", NULL, }; -@@ -570,12 +570,12 @@ static const struct omap_clkctrl_bit_data omap4_slimbus2_bit_data[] __initconst +@@ -570,12 +570,12 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap4_l4_per_clkctrl_regs[] __initconst = { @@ -193,7 +191,7 @@ index cbf9922d93d4..a38c92153979 100644 { OMAP4_ELM_CLKCTRL, NULL, 0, "l4_div_ck" }, { OMAP4_GPIO2_CLKCTRL, omap4_gpio2_bit_data, CLKF_HW_SUP, "l4_div_ck" }, { OMAP4_GPIO3_CLKCTRL, omap4_gpio3_bit_data, CLKF_HW_SUP, "l4_div_ck" }, -@@ -588,14 +588,14 @@ static const struct omap_clkctrl_reg_data omap4_l4_per_clkctrl_regs[] __initcons +@@ -588,14 +588,14 @@ static const struct omap_clkctrl_reg_dat { OMAP4_I2C3_CLKCTRL, NULL, CLKF_SW_SUP, "func_96m_fclk" }, { OMAP4_I2C4_CLKCTRL, NULL, CLKF_SW_SUP, "func_96m_fclk" }, { OMAP4_L4_PER_CLKCTRL, NULL, 0, "l4_div_ck" }, @@ -210,7 +208,7 @@ index cbf9922d93d4..a38c92153979 100644 { OMAP4_UART1_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, { OMAP4_UART2_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, { OMAP4_UART3_CLKCTRL, NULL, CLKF_SW_SUP, "func_48m_fclk" }, -@@ -630,7 +630,7 @@ static const struct omap_clkctrl_reg_data omap4_l4_wkup_clkctrl_regs[] __initcon +@@ -630,7 +630,7 @@ static const struct omap_clkctrl_reg_dat { OMAP4_L4_WKUP_CLKCTRL, NULL, 0, "l4_wkup_clk_mux_ck" }, { OMAP4_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, { OMAP4_GPIO1_CLKCTRL, omap4_gpio1_bit_data, CLKF_HW_SUP, "l4_wkup_clk_mux_ck" }, @@ -219,7 +217,7 @@ index cbf9922d93d4..a38c92153979 100644 { OMAP4_COUNTER_32K_CLKCTRL, NULL, 0, "sys_32k_ck" }, { OMAP4_KBD_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, { 0 }, -@@ -644,7 +644,7 @@ static const char * const omap4_pmd_stm_clock_mux_ck_parents[] __initconst = { +@@ -644,7 +644,7 @@ static const char * const omap4_pmd_stm_ }; static const char * const omap4_trace_clk_div_div_ck_parents[] __initconst = { @@ -228,7 +226,7 @@ index cbf9922d93d4..a38c92153979 100644 NULL, }; -@@ -662,7 +662,7 @@ static const struct omap_clkctrl_div_data omap4_trace_clk_div_div_ck_data __init +@@ -662,7 +662,7 @@ static const struct omap_clkctrl_div_dat }; static const char * const omap4_stm_clk_div_ck_parents[] __initconst = { @@ -237,7 +235,7 @@ index cbf9922d93d4..a38c92153979 100644 NULL, }; -@@ -716,73 +716,73 @@ static struct ti_dt_clk omap44xx_clks[] = { +@@ -716,73 +716,73 @@ static struct ti_dt_clk omap44xx_clks[] * hwmod support. Once hwmod is removed, these can be removed * also. */ @@ -378,11 +376,9 @@ index cbf9922d93d4..a38c92153979 100644 { .node_name = NULL }, }; -diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c -index 04a5408085ac..8694bc9f5fc7 100644 --- a/drivers/clk/ti/clk-54xx.c +++ b/drivers/clk/ti/clk-54xx.c -@@ -50,7 +50,7 @@ static const struct omap_clkctrl_bit_data omap5_aess_bit_data[] __initconst = { +@@ -50,7 +50,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap5_dmic_gfclk_parents[] __initconst = { @@ -391,7 +387,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -70,7 +70,7 @@ static const struct omap_clkctrl_bit_data omap5_dmic_bit_data[] __initconst = { +@@ -70,7 +70,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap5_mcbsp1_gfclk_parents[] __initconst = { @@ -400,7 +396,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -83,7 +83,7 @@ static const struct omap_clkctrl_bit_data omap5_mcbsp1_bit_data[] __initconst = +@@ -83,7 +83,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap5_mcbsp2_gfclk_parents[] __initconst = { @@ -409,7 +405,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -96,7 +96,7 @@ static const struct omap_clkctrl_bit_data omap5_mcbsp2_bit_data[] __initconst = +@@ -96,7 +96,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap5_mcbsp3_gfclk_parents[] __initconst = { @@ -418,7 +414,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 "pad_clks_ck", "slimbus_clk", NULL, -@@ -136,16 +136,16 @@ static const struct omap_clkctrl_bit_data omap5_timer8_bit_data[] __initconst = +@@ -136,16 +136,16 @@ static const struct omap_clkctrl_bit_dat static const struct omap_clkctrl_reg_data omap5_abe_clkctrl_regs[] __initconst = { { OMAP5_L4_ABE_CLKCTRL, NULL, 0, "abe_iclk" }, @@ -444,7 +440,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { 0 }, }; -@@ -266,12 +266,12 @@ static const struct omap_clkctrl_bit_data omap5_gpio8_bit_data[] __initconst = { +@@ -266,12 +266,12 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap5_l4per_clkctrl_regs[] __initconst = { @@ -463,7 +459,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { OMAP5_GPIO2_CLKCTRL, omap5_gpio2_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, { OMAP5_GPIO3_CLKCTRL, omap5_gpio3_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, { OMAP5_GPIO4_CLKCTRL, omap5_gpio4_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, -@@ -343,7 +343,7 @@ static const struct omap_clkctrl_bit_data omap5_dss_core_bit_data[] __initconst +@@ -343,7 +343,7 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap5_dss_clkctrl_regs[] __initconst = { @@ -472,7 +468,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { 0 }, }; -@@ -376,7 +376,7 @@ static const struct omap_clkctrl_bit_data omap5_gpu_core_bit_data[] __initconst +@@ -376,7 +376,7 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap5_gpu_clkctrl_regs[] __initconst = { @@ -481,7 +477,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { 0 }, }; -@@ -387,7 +387,7 @@ static const char * const omap5_mmc1_fclk_mux_parents[] __initconst = { +@@ -387,7 +387,7 @@ static const char * const omap5_mmc1_fcl }; static const char * const omap5_mmc1_fclk_parents[] __initconst = { @@ -490,7 +486,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 NULL, }; -@@ -403,7 +403,7 @@ static const struct omap_clkctrl_bit_data omap5_mmc1_bit_data[] __initconst = { +@@ -403,7 +403,7 @@ static const struct omap_clkctrl_bit_dat }; static const char * const omap5_mmc2_fclk_parents[] __initconst = { @@ -499,7 +495,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 NULL, }; -@@ -428,12 +428,12 @@ static const char * const omap5_usb_host_hs_hsic480m_p3_clk_parents[] __initcons +@@ -428,12 +428,12 @@ static const char * const omap5_usb_host }; static const char * const omap5_usb_host_hs_utmi_p1_clk_parents[] __initconst = { @@ -514,7 +510,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 NULL, }; -@@ -492,8 +492,8 @@ static const struct omap_clkctrl_bit_data omap5_usb_otg_ss_bit_data[] __initcons +@@ -492,8 +492,8 @@ static const struct omap_clkctrl_bit_dat }; static const struct omap_clkctrl_reg_data omap5_l3init_clkctrl_regs[] __initconst = { @@ -525,7 +521,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { OMAP5_USB_HOST_HS_CLKCTRL, omap5_usb_host_hs_bit_data, CLKF_SW_SUP, "l3init_60m_fclk" }, { OMAP5_USB_TLL_HS_CLKCTRL, omap5_usb_tll_hs_bit_data, CLKF_HW_SUP, "l4_root_clk_div" }, { OMAP5_SATA_CLKCTRL, omap5_sata_bit_data, CLKF_SW_SUP, "func_48m_fclk" }, -@@ -517,7 +517,7 @@ static const struct omap_clkctrl_reg_data omap5_wkupaon_clkctrl_regs[] __initcon +@@ -517,7 +517,7 @@ static const struct omap_clkctrl_reg_dat { OMAP5_L4_WKUP_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" }, { OMAP5_WD_TIMER2_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, { OMAP5_GPIO1_CLKCTRL, omap5_gpio1_bit_data, CLKF_HW_SUP, "wkupaon_iclk_mux" }, @@ -534,7 +530,7 @@ index 04a5408085ac..8694bc9f5fc7 100644 { OMAP5_COUNTER_32K_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" }, { OMAP5_KBD_CLKCTRL, NULL, CLKF_SW_SUP, "sys_32k_ck" }, { 0 }, -@@ -547,58 +547,58 @@ const struct omap_clkctrl_data omap5_clkctrl_data[] __initconst = { +@@ -547,58 +547,58 @@ const struct omap_clkctrl_data omap5_clk static struct ti_dt_clk omap54xx_clks[] = { DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"), DT_CLK(NULL, "sys_clkin_ck", "sys_clkin"), @@ -645,11 +641,9 @@ index 04a5408085ac..8694bc9f5fc7 100644 { .node_name = NULL }, }; -diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c -index 08a85c559f79..864c484bde1b 100644 --- a/drivers/clk/ti/clkctrl.c +++ b/drivers/clk/ti/clkctrl.c -@@ -511,6 +511,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) +@@ -511,6 +511,10 @@ static void __init _ti_omap4_clkctrl_set char *c; u16 soc_mask = 0; @@ -660,6 +654,3 @@ index 08a85c559f79..864c484bde1b 100644 addrp = of_get_address(node, 0, NULL, NULL); addr = (u32)of_translate_address(node, addrp); --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 14821d85188..48a64a6aa2c 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -26,6 +26,4 @@ mmc-core-terminate-infinite-loop-in-sd-uhs-voltage-s.patch usb-mon-make-mmapped-memory-read-only.patch usb-serial-ftdi_sio-fix-300-bps-rate-for-sio.patch rpmsg-qcom-glink-replace-strncpy-with-strscpy_pad.patch -revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch -revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-4282 revert-clk-ti-stop-using-legacy-clkctrl-names-for-om.patch-21893 -- 2.47.3