lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv5 7/8] ARM: tegra: Add board data and 2D clocks
    Date
    Add a driver alias gr2d for Tegra 2D device, and assign a duplicate
    of 2D clock to that driver alias.

    Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
    ---
    arch/arm/mach-tegra/board-dt-tegra20.c | 1 +
    arch/arm/mach-tegra/board-dt-tegra30.c | 1 +
    arch/arm/mach-tegra/tegra20_clocks_data.c | 2 +-
    arch/arm/mach-tegra/tegra30_clocks_data.c | 1 +
    4 files changed, 4 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
    index 171ba3c..9fcc800 100644
    --- a/arch/arm/mach-tegra/board-dt-tegra20.c
    +++ b/arch/arm/mach-tegra/board-dt-tegra20.c
    @@ -96,6 +96,7 @@ static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
    OF_DEV_AUXDATA("nvidia,tegra20-slink", 0x7000D800, "spi_tegra.2", NULL),
    OF_DEV_AUXDATA("nvidia,tegra20-slink", 0x7000DA00, "spi_tegra.3", NULL),
    OF_DEV_AUXDATA("nvidia,tegra20-host1x", 0x50000000, "host1x", NULL),
    + OF_DEV_AUXDATA("nvidia,tegra20-gr2d", 0x54140000, "gr2d", NULL),
    OF_DEV_AUXDATA("nvidia,tegra20-dc", 0x54200000, "tegradc.0", NULL),
    OF_DEV_AUXDATA("nvidia,tegra20-dc", 0x54240000, "tegradc.1", NULL),
    OF_DEV_AUXDATA("nvidia,tegra20-hdmi", 0x54280000, "hdmi", NULL),
    diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
    index cfe5fc0..0b4a1f0 100644
    --- a/arch/arm/mach-tegra/board-dt-tegra30.c
    +++ b/arch/arm/mach-tegra/board-dt-tegra30.c
    @@ -59,6 +59,7 @@ static struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = {
    OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000DC00, "spi_tegra.4", NULL),
    OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000DE00, "spi_tegra.5", NULL),
    OF_DEV_AUXDATA("nvidia,tegra30-host1x", 0x50000000, "host1x", NULL),
    + OF_DEV_AUXDATA("nvidia,tegra30-gr2d", 0x54140000, "gr2d", NULL),
    OF_DEV_AUXDATA("nvidia,tegra30-dc", 0x54200000, "tegradc.0", NULL),
    OF_DEV_AUXDATA("nvidia,tegra30-dc", 0x54240000, "tegradc.1", NULL),
    OF_DEV_AUXDATA("nvidia,tegra30-hdmi", 0x54280000, "hdmi", NULL),
    diff --git a/arch/arm/mach-tegra/tegra20_clocks_data.c b/arch/arm/mach-tegra/tegra20_clocks_data.c
    index a23a073..15d440a 100644
    --- a/arch/arm/mach-tegra/tegra20_clocks_data.c
    +++ b/arch/arm/mach-tegra/tegra20_clocks_data.c
    @@ -1041,7 +1041,7 @@ static struct clk_duplicate tegra_clk_duplicates[] = {
    CLK_DUPLICATE("usbd", "utmip-pad", NULL),
    CLK_DUPLICATE("usbd", "tegra-ehci.0", NULL),
    CLK_DUPLICATE("usbd", "tegra-otg", NULL),
    - CLK_DUPLICATE("2d", "tegra_grhost", "gr2d"),
    + CLK_DUPLICATE("2d", "gr2d", "gr2d"),
    CLK_DUPLICATE("3d", "tegra_grhost", "gr3d"),
    CLK_DUPLICATE("epp", "tegra_grhost", "epp"),
    CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"),
    diff --git a/arch/arm/mach-tegra/tegra30_clocks_data.c b/arch/arm/mach-tegra/tegra30_clocks_data.c
    index 741d264..5c4b7b7 100644
    --- a/arch/arm/mach-tegra/tegra30_clocks_data.c
    +++ b/arch/arm/mach-tegra/tegra30_clocks_data.c
    @@ -1338,6 +1338,7 @@ static struct clk_duplicate tegra_clk_duplicates[] = {
    CLK_DUPLICATE("pll_p", "tegradc.0", "parent"),
    CLK_DUPLICATE("pll_p", "tegradc.1", "parent"),
    CLK_DUPLICATE("pll_d2_out0", "hdmi", "parent"),
    + CLK_DUPLICATE("2d", "gr2d", "gr2d"),
    };

    static struct clk *tegra_ptr_clks[] = {
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-15 13:02    [W:3.590 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site