summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-k3/am62x/clk-data.c10
-rw-r--r--arch/arm/mach-k3/am62x/dev-data.c55
2 files changed, 35 insertions, 30 deletions
diff --git a/arch/arm/mach-k3/am62x/clk-data.c b/arch/arm/mach-k3/am62x/clk-data.c
index 4f9a090c87..47ea973197 100644
--- a/arch/arm/mach-k3/am62x/clk-data.c
+++ b/arch/arm/mach-k3/am62x/clk-data.c
@@ -246,6 +246,7 @@ static const struct dev_clk soc_dev_clk_data[] = {
DEV_CLK(16, 10, "gluelogic_rcosc_clkout"),
DEV_CLK(16, 11, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
DEV_CLK(16, 12, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
+ DEV_CLK(54, 0, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
DEV_CLK(57, 5, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
DEV_CLK(57, 6, "main_emmcsd0_refclk_sel_out0"),
DEV_CLK(57, 7, "postdiv4_16ff_main_0_hsdivout5_clk"),
@@ -275,6 +276,10 @@ static const struct dev_clk soc_dev_clk_data[] = {
DEV_CLK(75, 8, "hsdiv4_16fft_main_0_hsdivout1_clk"),
DEV_CLK(75, 9, "postdiv1_16fft_main_1_hsdivout5_clk"),
DEV_CLK(77, 0, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
+ DEV_CLK(80, 0, "main_gpmc_fclk_sel_out0"),
+ DEV_CLK(80, 1, "hsdiv4_16fft_main_0_hsdivout3_clk"),
+ DEV_CLK(80, 2, "postdiv4_16ff_main_2_hsdivout7_clk"),
+ DEV_CLK(80, 5, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
DEV_CLK(95, 0, "gluelogic_rcosc_clkout"),
DEV_CLK(95, 1, "gluelogic_hfosc0_clkout"),
DEV_CLK(95, 2, "wkup_clksel_out0"),
@@ -301,9 +306,6 @@ static const struct dev_clk soc_dev_clk_data[] = {
DEV_CLK(157, 22, "hsdiv4_16fft_main_2_hsdivout1_clk"),
DEV_CLK(157, 24, "sam62_pll_ctrl_wrap_main_0_chip_div1_clk_clk"),
DEV_CLK(157, 25, "board_0_ddr0_ck0_out"),
- DEV_CLK(157, 37, "main_gpmc_fclk_sel_out0"),
- DEV_CLK(157, 38, "hsdiv4_16fft_main_0_hsdivout3_clk"),
- DEV_CLK(157, 39, "postdiv4_16ff_main_2_hsdivout7_clk"),
DEV_CLK(157, 40, "mshsi2c_main_0_porscl"),
DEV_CLK(157, 77, "sam62_pll_ctrl_wrap_mcu_0_sysclkout_clk"),
DEV_CLK(157, 82, "cpsw_3guss_main_0_mdio_mdclk_o"),
@@ -350,5 +352,5 @@ const struct ti_k3_clk_platdata am62x_clk_platdata = {
.clk_list = clk_list,
.clk_list_cnt = 86,
.soc_dev_clk_data = soc_dev_clk_data,
- .soc_dev_clk_data_cnt = 134,
+ .soc_dev_clk_data_cnt = 136,
};
diff --git a/arch/arm/mach-k3/am62x/dev-data.c b/arch/arm/mach-k3/am62x/dev-data.c
index 8c430e04db..f413313533 100644
--- a/arch/arm/mach-k3/am62x/dev-data.c
+++ b/arch/arm/mach-k3/am62x/dev-data.c
@@ -25,21 +25,22 @@ static struct ti_pd soc_pd_list[] = {
static struct ti_lpsc soc_lpsc_list[] = {
[0] = PSC_LPSC(0, &soc_psc_list[1], &soc_pd_list[0], NULL),
- [1] = PSC_LPSC(9, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
+ [1] = PSC_LPSC(9, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
[2] = PSC_LPSC(10, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[1]),
[3] = PSC_LPSC(11, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[2]),
- [4] = PSC_LPSC(12, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[8]),
- [5] = PSC_LPSC(13, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[9]),
- [6] = PSC_LPSC(20, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [7] = PSC_LPSC(21, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [8] = PSC_LPSC(23, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [9] = PSC_LPSC(24, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [10] = PSC_LPSC(28, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [11] = PSC_LPSC(34, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[11]),
- [12] = PSC_LPSC(41, &soc_psc_list[1], &soc_pd_list[1], &soc_lpsc_list[11]),
- [13] = PSC_LPSC(42, &soc_psc_list[1], &soc_pd_list[2], &soc_lpsc_list[11]),
- [14] = PSC_LPSC(45, &soc_psc_list[1], &soc_pd_list[3], &soc_lpsc_list[13]),
- [15] = PSC_LPSC(46, &soc_psc_list[1], &soc_pd_list[4], &soc_lpsc_list[13]),
+ [4] = PSC_LPSC(12, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[9]),
+ [5] = PSC_LPSC(13, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[10]),
+ [6] = PSC_LPSC(15, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [7] = PSC_LPSC(20, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [8] = PSC_LPSC(21, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [9] = PSC_LPSC(23, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [10] = PSC_LPSC(24, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [11] = PSC_LPSC(28, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [12] = PSC_LPSC(34, &soc_psc_list[1], &soc_pd_list[0], &soc_lpsc_list[12]),
+ [13] = PSC_LPSC(41, &soc_psc_list[1], &soc_pd_list[1], &soc_lpsc_list[12]),
+ [14] = PSC_LPSC(42, &soc_psc_list[1], &soc_pd_list[2], &soc_lpsc_list[12]),
+ [15] = PSC_LPSC(45, &soc_psc_list[1], &soc_pd_list[3], &soc_lpsc_list[14]),
+ [16] = PSC_LPSC(46, &soc_psc_list[1], &soc_pd_list[4], &soc_lpsc_list[14]),
};
static struct ti_dev soc_dev_list[] = {
@@ -53,17 +54,19 @@ static struct ti_dev soc_dev_list[] = {
PSC_DEV(55, &soc_lpsc_list[3]),
PSC_DEV(178, &soc_lpsc_list[4]),
PSC_DEV(179, &soc_lpsc_list[5]),
- PSC_DEV(57, &soc_lpsc_list[6]),
- PSC_DEV(58, &soc_lpsc_list[7]),
- PSC_DEV(161, &soc_lpsc_list[8]),
- PSC_DEV(162, &soc_lpsc_list[9]),
- PSC_DEV(75, &soc_lpsc_list[10]),
- PSC_DEV(102, &soc_lpsc_list[11]),
- PSC_DEV(146, &soc_lpsc_list[11]),
- PSC_DEV(13, &soc_lpsc_list[12]),
- PSC_DEV(166, &soc_lpsc_list[13]),
- PSC_DEV(135, &soc_lpsc_list[14]),
- PSC_DEV(136, &soc_lpsc_list[15]),
+ PSC_DEV(54, &soc_lpsc_list[6]),
+ PSC_DEV(80, &soc_lpsc_list[6]),
+ PSC_DEV(57, &soc_lpsc_list[7]),
+ PSC_DEV(58, &soc_lpsc_list[8]),
+ PSC_DEV(161, &soc_lpsc_list[9]),
+ PSC_DEV(162, &soc_lpsc_list[10]),
+ PSC_DEV(75, &soc_lpsc_list[11]),
+ PSC_DEV(102, &soc_lpsc_list[12]),
+ PSC_DEV(146, &soc_lpsc_list[12]),
+ PSC_DEV(13, &soc_lpsc_list[13]),
+ PSC_DEV(166, &soc_lpsc_list[14]),
+ PSC_DEV(135, &soc_lpsc_list[15]),
+ PSC_DEV(136, &soc_lpsc_list[16]),
};
const struct ti_k3_pd_platdata am62x_pd_platdata = {
@@ -73,6 +76,6 @@ const struct ti_k3_pd_platdata am62x_pd_platdata = {
.devs = soc_dev_list,
.num_psc = 2,
.num_pd = 5,
- .num_lpsc = 16,
- .num_devs = 21,
+ .num_lpsc = 17,
+ .num_devs = 23,
};