From patchwork Sun Jul 21 21:28:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 260548 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D92A62C00D2 for ; Mon, 22 Jul 2013 07:26:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751227Ab3GUV0i (ORCPT ); Sun, 21 Jul 2013 17:26:38 -0400 Received: from ns.lynxeye.de ([87.118.118.114]:47342 "EHLO lynxeye.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751355Ab3GUV0i (ORCPT ); Sun, 21 Jul 2013 17:26:38 -0400 Received: by lynxeye.de (Postfix, from userid 501) id 3CC3C26C2001; Sun, 21 Jul 2013 23:26:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on lynxeye.de X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.1 Received: from tellur.localdomain (p548303D4.dip0.t-ipconnect.de [84.131.3.212]) by lynxeye.de (Postfix) with ESMTPA id A78B226C2004; Sun, 21 Jul 2013 23:26:35 +0200 (CEST) From: Lucas Stach To: linux-tegra@vger.kernel.org Cc: Stephen Warren Subject: [PATCH 4/4] ARM: tegra: correct Colibri T20 regulator settings Date: Sun, 21 Jul 2013 23:28:52 +0200 Message-Id: <1374442132-24040-5-git-send-email-dev@lynxeye.de> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1374442132-24040-1-git-send-email-dev@lynxeye.de> References: <1374442132-24040-1-git-send-email-dev@lynxeye.de> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Core and CPU voltage settings were a bit on the safe side. The actually used chips on the Colibri allow for lower voltages and work just fine this way. SM2 is not a the parent of LDO regs, but actually the DDR regulator. The Colibri uses a different version of the TPS with other voltage mapping tables for SM2, currently we cheat by setting a fake 3,2V which results in 1,8V physical. Signed-off-by: Lucas Stach --- The issue with the used version of the PMIC having a different voltage mapping for SM2 should be resolved properly. As this needs some bigger adjustments at the regulator driver this quick fix is just aimed at stopping slight overvolting of the ram with 3.11 kernels. A proper fix should land in time for 3.12. --- arch/arm/boot/dts/tegra20-colibri-512.dtsi | 33 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi index 92551ba..9b56dcb 100644 --- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi +++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi @@ -226,14 +226,14 @@ gpio-controller; sys-supply = <&vdd_5v0_reg>; - vin-sm0-supply = <&sys_reg>; - vin-sm1-supply = <&sys_reg>; - vin-sm2-supply = <&sys_reg>; - vinldo01-supply = <&sm2_reg>; - vinldo23-supply = <&sm2_reg>; - vinldo4-supply = <&sm2_reg>; - vinldo678-supply = <&sm2_reg>; - vinldo9-supply = <&sm2_reg>; + vin-sm0-supply = <&vdd_5v0_reg>; + vin-sm1-supply = <&vdd_5v0_reg>; + vin-sm2-supply = <&vdd_5v0_reg>; + vinldo01-supply = <&vdd_5v0_reg>; + vinldo23-supply = <&vdd_5v0_reg>; + vinldo4-supply = <&vdd_5v0_reg>; + vinldo678-supply = <&vdd_5v0_reg>; + vinldo9-supply = <&vdd_5v0_reg>; regulators { #address-cells = <1>; @@ -250,8 +250,8 @@ reg = <1>; regulator-compatible = "sm0"; regulator-name = "vdd_sm0,vdd_core"; - regulator-min-microvolt = <1275000>; - regulator-max-microvolt = <1275000>; + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; regulator-always-on; }; @@ -259,17 +259,20 @@ reg = <2>; regulator-compatible = "sm1"; regulator-name = "vdd_sm1,vdd_cpu"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; + regulator-min-microvolt = <1025000>; + regulator-max-microvolt = <1025000>; regulator-always-on; }; sm2_reg: regulator@3 { reg = <3>; regulator-compatible = "sm2"; - regulator-name = "vdd_sm2,vin_ldo*"; - regulator-min-microvolt = <3700000>; - regulator-max-microvolt = <3700000>; + regulator-name = "vdd_sm2,vdd_ddr"; + /* The voltage is lying, but results + in the desired 1,8V on the TPS version + used on the Colibri */ + regulator-min-microvolt = <3200000>; + regulator-max-microvolt = <3200000>; regulator-always-on; };