@@ -903,10 +903,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = {
903
903
[tegra_clk_audio3 ] = { .dt_id = TEGRA124_CLK_AUDIO3 , .present = true },
904
904
[tegra_clk_audio4 ] = { .dt_id = TEGRA124_CLK_AUDIO4 , .present = true },
905
905
[tegra_clk_spdif ] = { .dt_id = TEGRA124_CLK_SPDIF , .present = true },
906
- [tegra_clk_clk_out_1 ] = { .dt_id = TEGRA124_CLK_CLK_OUT_1 , .present = true },
907
- [tegra_clk_clk_out_2 ] = { .dt_id = TEGRA124_CLK_CLK_OUT_2 , .present = true },
908
- [tegra_clk_clk_out_3 ] = { .dt_id = TEGRA124_CLK_CLK_OUT_3 , .present = true },
909
- [tegra_clk_blink ] = { .dt_id = TEGRA124_CLK_BLINK , .present = true },
910
906
[tegra_clk_xusb_host_src ] = { .dt_id = TEGRA124_CLK_XUSB_HOST_SRC , .present = true },
911
907
[tegra_clk_xusb_falcon_src ] = { .dt_id = TEGRA124_CLK_XUSB_FALCON_SRC , .present = true },
912
908
[tegra_clk_xusb_fs_src ] = { .dt_id = TEGRA124_CLK_XUSB_FS_SRC , .present = true },
@@ -932,9 +928,6 @@ static struct tegra_clk tegra124_clks[tegra_clk_max] __initdata = {
932
928
[tegra_clk_audio3_mux ] = { .dt_id = TEGRA124_CLK_AUDIO3_MUX , .present = true },
933
929
[tegra_clk_audio4_mux ] = { .dt_id = TEGRA124_CLK_AUDIO4_MUX , .present = true },
934
930
[tegra_clk_spdif_mux ] = { .dt_id = TEGRA124_CLK_SPDIF_MUX , .present = true },
935
- [tegra_clk_clk_out_1_mux ] = { .dt_id = TEGRA124_CLK_CLK_OUT_1_MUX , .present = true },
936
- [tegra_clk_clk_out_2_mux ] = { .dt_id = TEGRA124_CLK_CLK_OUT_2_MUX , .present = true },
937
- [tegra_clk_clk_out_3_mux ] = { .dt_id = TEGRA124_CLK_CLK_OUT_3_MUX , .present = true },
938
931
[tegra_clk_cec ] = { .dt_id = TEGRA124_CLK_CEC , .present = true },
939
932
};
940
933
@@ -990,10 +983,9 @@ static struct tegra_devclk devclks[] __initdata = {
990
983
{ .con_id = "audio3_2x" , .dt_id = TEGRA124_CLK_AUDIO3_2X },
991
984
{ .con_id = "audio4_2x" , .dt_id = TEGRA124_CLK_AUDIO4_2X },
992
985
{ .con_id = "spdif_2x" , .dt_id = TEGRA124_CLK_SPDIF_2X },
993
- { .con_id = "extern1" , .dev_id = "clk_out_1" , .dt_id = TEGRA124_CLK_EXTERN1 },
994
- { .con_id = "extern2" , .dev_id = "clk_out_2" , .dt_id = TEGRA124_CLK_EXTERN2 },
995
- { .con_id = "extern3" , .dev_id = "clk_out_3" , .dt_id = TEGRA124_CLK_EXTERN3 },
996
- { .con_id = "blink" , .dt_id = TEGRA124_CLK_BLINK },
986
+ { .con_id = "extern1" , .dt_id = TEGRA124_CLK_EXTERN1 },
987
+ { .con_id = "extern2" , .dt_id = TEGRA124_CLK_EXTERN2 },
988
+ { .con_id = "extern3" , .dt_id = TEGRA124_CLK_EXTERN3 },
997
989
{ .con_id = "cclk_g" , .dt_id = TEGRA124_CLK_CCLK_G },
998
990
{ .con_id = "cclk_lp" , .dt_id = TEGRA124_CLK_CCLK_LP },
999
991
{ .con_id = "sclk" , .dt_id = TEGRA124_CLK_SCLK },
@@ -1303,8 +1295,6 @@ static struct tegra_clk_init_table common_init_table[] __initdata = {
1303
1295
{ TEGRA124_CLK_PLL_A , TEGRA124_CLK_CLK_MAX , 564480000 , 1 },
1304
1296
{ TEGRA124_CLK_PLL_A_OUT0 , TEGRA124_CLK_CLK_MAX , 11289600 , 1 },
1305
1297
{ TEGRA124_CLK_EXTERN1 , TEGRA124_CLK_PLL_A_OUT0 , 0 , 1 },
1306
- { TEGRA124_CLK_CLK_OUT_1_MUX , TEGRA124_CLK_EXTERN1 , 0 , 1 },
1307
- { TEGRA124_CLK_CLK_OUT_1 , TEGRA124_CLK_CLK_MAX , 0 , 1 },
1308
1298
{ TEGRA124_CLK_I2S0 , TEGRA124_CLK_PLL_A_OUT0 , 11289600 , 0 },
1309
1299
{ TEGRA124_CLK_I2S1 , TEGRA124_CLK_PLL_A_OUT0 , 11289600 , 0 },
1310
1300
{ TEGRA124_CLK_I2S2 , TEGRA124_CLK_PLL_A_OUT0 , 11289600 , 0 },
@@ -1459,11 +1449,9 @@ static void __init tegra132_clock_apply_init_table(void)
1459
1449
* tegra124_132_clock_init_pre - clock initialization preamble for T124/T132
1460
1450
* @np: struct device_node * of the DT node for the SoC CAR IP block
1461
1451
*
1462
- * Register most of the clocks controlled by the CAR IP block, along
1463
- * with a few clocks controlled by the PMC IP block. Everything in
1464
- * this function should be common to Tegra124 and Tegra132. XXX The
1465
- * PMC clock initialization should probably be moved to PMC-specific
1466
- * driver code. No return value.
1452
+ * Register most of the clocks controlled by the CAR IP block.
1453
+ * Everything in this function should be common to Tegra124 and Tegra132.
1454
+ * No return value.
1467
1455
*/
1468
1456
static void __init tegra124_132_clock_init_pre (struct device_node * np )
1469
1457
{
@@ -1506,7 +1494,6 @@ static void __init tegra124_132_clock_init_pre(struct device_node *np)
1506
1494
tegra_audio_clk_init (clk_base , pmc_base , tegra124_clks ,
1507
1495
tegra124_audio_plls ,
1508
1496
ARRAY_SIZE (tegra124_audio_plls ), 24576000 );
1509
- tegra_pmc_clk_init (pmc_base , tegra124_clks );
1510
1497
1511
1498
/* For Tegra124 & Tegra132, PLLD is the only source for DSIA & DSIB */
1512
1499
plld_base = readl (clk_base + PLLD_BASE );
@@ -1518,11 +1505,11 @@ static void __init tegra124_132_clock_init_pre(struct device_node *np)
1518
1505
* tegra124_132_clock_init_post - clock initialization postamble for T124/T132
1519
1506
* @np: struct device_node * of the DT node for the SoC CAR IP block
1520
1507
*
1521
- * Register most of the along with a few clocks controlled by the PMC
1522
- * IP block. Everything in this function should be common to Tegra124
1508
+ * Register most of the clocks controlled by the CAR IP block.
1509
+ * Everything in this function should be common to Tegra124
1523
1510
* and Tegra132. This function must be called after
1524
- * tegra124_132_clock_init_pre(), otherwise clk_base and pmc_base will
1525
- * not be set. No return value.
1511
+ * tegra124_132_clock_init_pre(), otherwise clk_base will not be set.
1512
+ * No return value.
1526
1513
*/
1527
1514
static void __init tegra124_132_clock_init_post (struct device_node * np )
1528
1515
{
0 commit comments