ARM: tegra: Rename HS uart driver name
Pradeep Goudagunta [Tue, 28 May 2013 09:54:34 +0000 (14:54 +0530)]
Tegra will use serial-tegra as HS uart driver.

Bug 1323103

Change-Id: I86c9b46e96cf81896057de59a7afc6e680e6c08e
Signed-off-by: Pradeep Goudagunta <pgoudagunta@nvidia.com>
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/233262
(cherry picked from commit a1fb3b5a3a02626c00f7dd0e295daa55ddaaf2e4)
Reviewed-on: http://git-master/r/246724
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Tested-by: Dan Willemsen <dwillemsen@nvidia.com>

arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/tegra11_clocks.c

index beb5bfb..9cf76e5 100644 (file)
@@ -1203,8 +1203,10 @@ static struct resource tegra_uarte_resources[] = {
        },
 };
 
+#define TEGRA_UART_NAME "serial-tegra"
+
 struct platform_device tegra_uarta_device = {
-       .name   = "tegra_uart",
+       .name   = TEGRA_UART_NAME,
        .id     = 0,
        .num_resources  = ARRAY_SIZE(tegra_uarta_resources),
        .resource       = tegra_uarta_resources,
@@ -1214,7 +1216,7 @@ struct platform_device tegra_uarta_device = {
 };
 
 struct platform_device tegra_uartb_device = {
-       .name   = "tegra_uart",
+       .name   = TEGRA_UART_NAME,
        .id     = 1,
        .num_resources  = ARRAY_SIZE(tegra_uartb_resources),
        .resource       = tegra_uartb_resources,
@@ -1224,7 +1226,7 @@ struct platform_device tegra_uartb_device = {
 };
 
 struct platform_device tegra_uartc_device = {
-       .name   = "tegra_uart",
+       .name   = TEGRA_UART_NAME,
        .id     = 2,
        .num_resources  = ARRAY_SIZE(tegra_uartc_resources),
        .resource       = tegra_uartc_resources,
@@ -1234,7 +1236,7 @@ struct platform_device tegra_uartc_device = {
 };
 
 struct platform_device tegra_uartd_device = {
-       .name   = "tegra_uart",
+       .name   = TEGRA_UART_NAME,
        .id     = 3,
        .num_resources  = ARRAY_SIZE(tegra_uartd_resources),
        .resource       = tegra_uartd_resources,
@@ -1899,6 +1901,7 @@ struct swgid_fixup tegra_swgid_fixup[] = {
        { .name = "nvavp",      .swgids = SWGID(AVPC), },
        { .name = "sdhci-tegra",        .swgids = SWGID(PPCS), },
        { .name = "serial8250", .swgids = SWGID(PPCS), },
+       { .name = "serial-tegra",      .swgids = SWGID(PPCS), },
        { .name = "snd-soc-dummy",      .swgids = SWGID(PPCS), },
        { .name = "spdif-dit",  .swgids = SWGID(PPCS), },
        { .name = "tegra11-se", .swgids = SWGID(PPCS), },
index f40f6a8..5791385 100644 (file)
@@ -6873,10 +6873,10 @@ struct clk tegra_list_clks[] = {
        PERIPH_CLK("i2c5",      "tegra11-i2c.4",        "div-clk",      47,     0x128,  64000000,  mux_pllp_clkm,       MUX | DIV_U16 | PERIPH_ON_APB),
        PERIPH_CLK("mipi-cal",  "mipi-cal",             NULL,   56,     0,      60000000,  mux_clk_m,   0),
        PERIPH_CLK("mipi-cal-fixed", "mipi-cal-fixed",  NULL,   0,      0,      108000000, mux_pllp_out3,       PERIPH_NO_ENB),
-       PERIPH_CLK("uarta",     "tegra_uart.0",         NULL,   6,      0x178,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
-       PERIPH_CLK("uartb",     "tegra_uart.1",         NULL,   7,      0x17c,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
-       PERIPH_CLK("uartc",     "tegra_uart.2",         NULL,   55,     0x1a0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
-       PERIPH_CLK("uartd",     "tegra_uart.3",         NULL,   65,     0x1c0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uarta",     "serial-tegra.0",       NULL,   6,      0x178,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartb",     "serial-tegra.1",       NULL,   7,      0x17c,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartc",     "serial-tegra.2",       NULL,   55,     0x1a0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartd",     "serial-tegra.3",       NULL,   65,     0x1c0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
        PERIPH_CLK("uarte",     "tegra_uart.4",         NULL,   66,     0x1c4,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
        PERIPH_CLK("3d",        "3d",                   NULL,   24,     0x158,  700000000, mux_pllm_pllc2_c_c3_pllp_plla,       MUX | MUX8 | DIV_U71 | DIV_U71_INT | DIV_U71_IDLE | PERIPH_MANUAL_RESET),
        PERIPH_CLK("2d",        "2d",                   NULL,   21,     0x15c,  700000000, mux_pllm_pllc2_c_c3_pllp_plla,       MUX | MUX8 | DIV_U71 | DIV_U71_INT | DIV_U71_IDLE),