lkml.org 
[lkml]   [2015]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 015/183] ARM: dts: tegra20: fix GR3D, DSI unit and reg base addresses
    Date
    3.16.7-ckt8 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry Osipenko <digetx@gmail.com>

    commit de47699d005996b41cea590c6098078ac12058be upstream.

    Commit 58ecb23f64ee ("ARM: tegra: add missing unit addresses to DT") added
    unit address and changed reg base for GR3D and DSI host1x modules, but these
    addresses belongs to GR2D and TVO modules respectively. Fix it by changing
    modules unit and reg base addresses to proper ones.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Fixes: 58ecb23f64ee (ARM: tegra: add missing unit addresses to DT)
    Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/boot/dts/tegra20.dtsi | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
    index a7ddf70df50b..98eeb3d9105d 100644
    --- a/arch/arm/boot/dts/tegra20.dtsi
    +++ b/arch/arm/boot/dts/tegra20.dtsi
    @@ -76,9 +76,9 @@
    reset-names = "2d";
    };

    - gr3d@54140000 {
    + gr3d@54180000 {
    compatible = "nvidia,tegra20-gr3d";
    - reg = <0x54140000 0x00040000>;
    + reg = <0x54180000 0x00040000>;
    clocks = <&tegra_car TEGRA20_CLK_GR3D>;
    resets = <&tegra_car 24>;
    reset-names = "3d";
    @@ -138,9 +138,9 @@
    status = "disabled";
    };

    - dsi@542c0000 {
    + dsi@54300000 {
    compatible = "nvidia,tegra20-dsi";
    - reg = <0x542c0000 0x00040000>;
    + reg = <0x54300000 0x00040000>;
    clocks = <&tegra_car TEGRA20_CLK_DSI>;
    resets = <&tegra_car 48>;
    reset-names = "dsi";

    \
     
     \ /
      Last update: 2015-03-06 12:41    [W:4.172 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site