arm: t124: remove OF_DEV_AUXDATA for serial

Modify the clock table to have the serial device name as <address>.serial
and remove the need of mapping of device name from of_aux_data table.

Bug 200076284

Change-Id: Ib817123dd5c7431d9bd372f1e06ef440ccf50694
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Reviewed-on: http://git-master/r/696392
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 207c4bc6280491a64de9bf47d77e754c452288d3..7f7f94119ac0c1b45000b1393dc8acd90e16d874 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -805,7 +805,6 @@ static struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp.0", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISPB_BASE, "isp.1", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
-       T124_UART_OF_DEV_AUXDATA,
        T124_I2C_OF_DEV_AUXDATA,
        OF_DEV_AUXDATA("nvidia,tegra124-xhci", 0x70090000, "tegra-xhci",
                                &xusb_pdata),

diff --git a/arch/arm/mach-tegra/board-loki.c b/arch/arm/mach-tegra/board-loki.c
index 73a1c9b07fa4232160eac720bb5530977ee019f8..1989b412a931a5c9984714bec199fffe65b9ec09 100644 (file)
--- a/arch/arm/mach-tegra/board-loki.c
+++ b/arch/arm/mach-tegra/board-loki.c
@@ -609,7 +609,6 @@ struct of_dev_auxdata loki_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp.0", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISPB_BASE, "isp.1", NULL),
        OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
-       T124_UART_OF_DEV_AUXDATA,
        T124_I2C_OF_DEV_AUXDATA,
        OF_DEV_AUXDATA("nvidia,tegra124-xhci", 0x70090000, "tegra-xhci",
                                &xusb_pdata),

diff --git a/arch/arm/mach-tegra/tegra-of-dev-auxdata.h b/arch/arm/mach-tegra/tegra-of-dev-auxdata.h
index 926dfa57d78083cb167e388147bb7a9e1ed854a8..bb893f684704df71d53bc69fa79914e753cd2133 100644 (file)
--- a/arch/arm/mach-tegra/tegra-of-dev-auxdata.h
+++ b/arch/arm/mach-tegra/tegra-of-dev-auxdata.h
@@ -65,16 +65,6 @@
         OF_DEV_AUXDATA("nvidia,tegra124-i2c", 0x7000d000, "tegra12-i2c.4", NULL),  \
         OF_DEV_AUXDATA("nvidia,tegra124-i2c", 0x7000d100, "tegra12-i2c.5", NULL)
 
-#define T124_UART_OF_DEV_AUXDATA \
-        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006000, "serial-tegra.0", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006040, "serial-tegra.1", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006200, "serial-tegra.2", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006300, "serial-tegra.3", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra20-uart", 0x70006000, "serial8250.0", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra20-uart", 0x70006040, "serial8250.1", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra20-uart", 0x70006200, "serial8250.2", NULL), \
-        OF_DEV_AUXDATA("nvidia,tegra20-uart", 0x70006300, "serial8250.3", NULL)
-
 #define T124_SDMMC_OF_DEV_AUXDATA \
         OF_DEV_AUXDATA("nvidia,tegra124-sdhci", 0x700b0600, "sdhci-tegra.3", NULL),  \
         OF_DEV_AUXDATA("nvidia,tegra124-sdhci", 0x700b0400, "sdhci-tegra.2", NULL),  \

diff --git a/arch/arm/mach-tegra/vcm30_t124.c b/arch/arm/mach-tegra/vcm30_t124.c
index 58fc17172df71fbcb9bf97c473602010a358c92f..d7d903666993f2371e09afb28c7080654802f2d3 100644 (file)
--- a/arch/arm/mach-tegra/vcm30_t124.c
+++ b/arch/arm/mach-tegra/vcm30_t124.c
@@ -291,7 +291,6 @@ void __init tegra_vcm30_t124_usb_init(void)
  * clk_get and clk_enable to work properly
  */
 static struct of_dev_auxdata tegra_vcm30_t124_auxdata_lookup[] __initdata = {
-       T124_UART_OF_DEV_AUXDATA,
        T124_I2C_OF_DEV_AUXDATA,
        T124_SPI_OF_DEV_AUXDATA,
 

diff --git a/drivers/platform/tegra/tegra12_clocks.c b/drivers/platform/tegra/tegra12_clocks.c
index e914e110c1e991eb86125bc37c4b11a98ed73037..a4ed4129a7b88d6457c69cf29167284eed1dcbeb 100644 (file)
--- a/drivers/platform/tegra/tegra12_clocks.c
+++ b/drivers/platform/tegra/tegra12_clocks.c
@@ -8332,10 +8332,10 @@ struct clk tegra_list_clks[] = {
        PERIPH_CLK("i2c6",      "tegra12-i2c.5",        "div-clk",      166,    0x65c,  58300000,  mux_pllp_clkm,       MUX | DIV_U16 | PERIPH_ON_APB),
        PERIPH_CLK("mipi-cal",  "mipi-cal",             NULL,   56,     0,      60000000,  mux_clk_m,                   PERIPH_ON_APB),
        PERIPH_CLK("mipi-cal-fixed", "mipi-cal-fixed",  NULL,   0,      0,      108000000, mux_pllp_out3,       PERIPH_NO_ENB),
-       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("uarta",     "70006000.serial",              NULL,   6,      0x178,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartb",     "70006040.serial",              NULL,   7,      0x17c,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartc",     "70006200.serial",              NULL,   55,     0x1a0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
+       PERIPH_CLK("uartd",     "70006300.serial",              NULL,   65,     0x1c0,  800000000, mux_pllp_pllc_pllm_clkm,     MUX | DIV_U151 | DIV_U151_UART | PERIPH_ON_APB),
        PERIPH_CLK("vic03",     "vic03",                NULL,   178,    0x678,  900000000, mux_pllm_pllc_pllp_plla_pllc2_c3_clkm,       MUX | DIV_U71),
        PERIPH_CLK_EX("vi",     "vi",                   "vi",   20,     0x148,  700000000, mux_pllm_pllc_pllp_plla_pllc4,       MUX | DIV_U71 | DIV_U71_INT, &tegra_vi_clk_ops),
        PERIPH_CLK("vi_sensor",  NULL,                  "vi_sensor",    164,    0x1a8,  150000000, mux_pllm_pllc_pllp_plla,     MUX | DIV_U71 | PERIPH_NO_RESET),