From patchwork Wed Jun 5 07:49:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 13686295 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A11218F2DE; Wed, 5 Jun 2024 07:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573790; cv=none; b=JmILFGZDDP+p8BxxQixDsaufZBbBYksvwASlzjZFFEg8zmuUz6BMaIVMIDz16uLCD5Rk6HnGhEG9TgYlYFZVbdpLpV572+YMxb5DMx6MYYTNFBTgNcoYHhNJf53nUkjEgabmUM38Bw5DIFIARlWQPapNBIiR+f7vILRIG2vsc+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573790; c=relaxed/simple; bh=USKL0G1o5LheoimXtr9ZYPptszOk/OOcnEsp0qsWC0M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VdvJJh4v/qs1MYnII8hKQ7DKLS8PoF6TXZLd79qOM6XQIVNUiHxIQ/jvQl2DVFYTBx0EgEsPIcjAh7ZmMiTzNSvnAVICC5/Lq2n0wwoA7yCqD0PC+VrCB6Lx+EiEFK+ishVXPc1m76cmiNaRUz31jd4J8uGdvY3PJmU3sfHqUaQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mvVT/o6c; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mvVT/o6c" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-354be94c874so5547830f8f.3; Wed, 05 Jun 2024 00:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717573787; x=1718178587; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qxXe4sA/PErwQyeZiZFHuVEidHuYAz95sjxpUK1e8PA=; b=mvVT/o6cC1/oOQgOFmL/HtK1K++l3a8Pj48tODq0J1p7wlLPCbLzQNxx6pilAqOYP9 stOVTyiV2UPlHusa9DnnladAPLK8SADuR9+xbSkIvioHLuoNJ54nkhKqeQa08edjuR0k wNgdMZs0cWKCvfo5anmojIgqh9R1I/E2l1b1Ntx+pk4YePgc/8f40W9yzLci2cw4bMMe Zm75v+gh9BYK90hG3Gh2JJdLmS5QK3XID9gkJnGLHTID2sqh4hfYRcwSEFyqa4MEubf1 ZZEBl1lQx8tJNthpRy59auq6byJ45BliikQUo6n3TpfFauer4rkxJ+X+352BJ2nhUa7w viRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717573787; x=1718178587; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qxXe4sA/PErwQyeZiZFHuVEidHuYAz95sjxpUK1e8PA=; b=MiM3Khh1RdJO5DARRvLLkO962ilVRoQ525u/ftP1Z0PZ8rxGrdBP0IcbAd8VtAVpIa kPtONLsxGrosGf+GJ3UIGxZC8cKydEiSXI3rt48BhSWHqSNsU27Y/ry/tKDu3eP7K1fJ UsYQnayOaSnl+YtZ7nTiss/dMP/HScsRO3wxTHXaoGfYHCJ2lZzgD1yIJpG6/JhLkXkV KP93AQ2aacF9LgPH0MSRdSrkijdD7EfzSxmpkEPy78oibpo6Rn3LJqL09PgZolWxzNQF F80lpEBdGyaIqH/CVC1sz+8zQE8VcODTyhlN3y4X4TLQsdU0tpO02yi//mClA9pr6CWv HcmQ== X-Forwarded-Encrypted: i=1; AJvYcCVqal6ubaA0j1UThhAlW1DSZrAaFEVV1vVLR625L6g2aGqH99OrRH34HehKRpM+3tq5elUTtKHZXZ0wTmNLE3mkDkOdS8sOt/Ib0Sm2iijsutB6Lmp7aT9esPCiu6sObFL0rI7i7qvWU1buhdT7DjUAToy1YBFGmOtbznk3gPU0eyAFEnOLzJZ5B/3y X-Gm-Message-State: AOJu0YyNfDrHB9uQEnUE6QPupfNm6QyPPM8MG3ga60Wr23eDAF80rzu+ 2sLjdStDq4NUNvOVW81e42DhBbXJFbcFDZZrhIiuJkzL/o4v/NJF X-Google-Smtp-Source: AGHT+IHeZK1Cm71nBtwgckr34373Kx2vWINVKF4tV/EJj2FoJd/EFN2NxWzODW9ItZiA7XzusiD0Og== X-Received: by 2002:a05:6000:1d93:b0:35e:ec8f:cb49 with SMTP id ffacd0b85a97d-35eec8fccd6mr527937f8f.61.1717573786665; Wed, 05 Jun 2024 00:49:46 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2500:a01:2595:4364:d152:dff3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064bbb1sm13527200f8f.101.2024.06.05.00.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:49:45 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wolfram Sang , Liam Girdwood , Mark Brown , Magnus Damm Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Fabrizio Castro , Biju Das , Lad Prabhakar Subject: [RFC PATCH 1/4] regulator: core: Ensure the cached state matches the hardware state in regulator_set_voltage_unlocked() Date: Wed, 5 Jun 2024 08:49:33 +0100 Message-Id: <20240605074936.578687-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Lad Prabhakar Ensure that the cached state matches the hardware setting before considering it a no-op in regulator_set_voltage_unlocked(). Signed-off-by: Lad Prabhakar --- Driver code flow: 1> set regulator to 1.8V (BIT0 = 1) 2> Regulator cached state now will be 1.8V 3> Now for some reason driver issues a reset to the IP block which resets the registers to default value. In this process the regulator is set to 3.3V (BIT0 = 0) 4> Now the driver requests the regulator core to set 1.8V 5> Due to below check of cached state we return back with success resulting undesired behaviour. Hence an additional check is introduced to make sure the cache state is matching with the HW. --- drivers/regulator/core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5794f4e9dd52..65ee54b13428 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3765,10 +3765,13 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, /* If we're setting the same range as last time the change * should be a noop (some cpufreq implementations use the same - * voltage for multiple frequencies, for example). + * voltage for multiple frequencies, for example). Also make sure + * state is the same in HW. */ - if (voltage->min_uV == min_uV && voltage->max_uV == max_uV) - goto out; + if (voltage->min_uV == min_uV && voltage->max_uV == max_uV) { + if (regulator_get_voltage_rdev(rdev) == min_uV) + goto out; + } /* If we're trying to set a range that overlaps the current voltage, * return successfully even though the regulator does not support From patchwork Wed Jun 5 07:49:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 13686296 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3173718F2FF; Wed, 5 Jun 2024 07:49:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573791; cv=none; b=GU8kMfX0Q4QGqF4N+84PdebpaQMvbNaiotQQMCoUUILKQZFY4OKQxcm663YvMV9hzrbqzwoSqwoa/WFqlQ6D+DnusraLcOUEfu3MevCQxhvSJmVNyFtfZteFxx3c7ln6MzDmhGPR5KUHdh2Lr0aRI8VWrBRDkOggW5jJcepOb7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573791; c=relaxed/simple; bh=GH/4yyA1cV2+k32gNINOfNb0ZQS63KppAFTgUxvFX1k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lHALVC0/YruOZUxYkdtKHA3SJTSJ6aDIOz9q5PeO6vm0uJu3lRB4aeAGcZcekzHX/eWE4gER4cMMqb/aB+dbBhdgmzNpq1oRbO/zOO4U8zcJT43N97Bek5+lIBLAxorrj0zzYhAbp+oA8zUbFU1n31cq9fOzZtQKZOV1trcz78w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZYBtDMNP; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZYBtDMNP" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-421392b8156so18806875e9.3; Wed, 05 Jun 2024 00:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717573788; x=1718178588; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JOPojFycEKbDb+6xYRN5lk81bk8N46X2BGBEfSW2AyQ=; b=ZYBtDMNPkdh6k0aqbFpCqtHLGd+xZIWBcUseZR++Ph/hAPRgJ94k1qlTNsL3a3gqe9 yDC/od/P14SsyvgwB22uPoD5muUVt7CVbnx/tXoqO8KykIXf7lo/XJDSiyVOtDRlQRBr e8TMBwzwA5xiB1CMghc60Y4f/g/m0nrzZn3K19CkLqRg2zttUm8AMC9qeMzbIyYaw39W NXQ3QoCmLiRU0KK15dTFTVnwoMpAdFfnX0dAwKXCCDMYWd5LaDC8ODZTeRbI3kiM+Fqv jfXn1j6bDXb7hMHPLWXjAonSasOk29+73qIkuUT9dng97oKqcVyvKCwel7+BEZmSLwqA nYqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717573788; x=1718178588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JOPojFycEKbDb+6xYRN5lk81bk8N46X2BGBEfSW2AyQ=; b=WlUFeEqcv53pXmpms2x/sO4jA/nNgIQ19o6Ijs6hx4BFIdc6LoUyypkdHulN4D/D8n ufbgnkt2NIE4pHAVixg6tnDK35oBSgvm4LTfWdzi6JCZcbTTv7I/CDLtr0ToF0uxAulo nk+xV6wf2H74BHXvHk+G87BkaJm/kJw6yTSMW5V8M6hWzQVzuGyQxUCKTd8mhRUaFCf7 ow1AjyMrexzkpg3MbtRkcDSie5z2bSNzJecCTUh801fEGSZEKAfXkj4V24LHTNgiz/WJ f7bZ137KcVp3QFRZivOnCS/thNjyyvOXbUUspqu72FFyy3lBMGPYacJ/RIOdEc6Z8adz cMSQ== X-Forwarded-Encrypted: i=1; AJvYcCUw+e772x6PworQjqrRjl7Odh+9ppiygdsj3EFoCAHcJmjma0A/DViftZq1Cw40GpCawYrpItxabN+cjkvGKne2sLaMHFm3EWyKWBBEme++bb3V8LHa2EcoYv1IU3vZui3hAJOGcToHgjNiUXBlwnbJDmQ6Enp9hTHBnc8ez74jnqXGBUTi2MoL1rom X-Gm-Message-State: AOJu0YwYN92t2S8fW/QjQVGdrRvjslmEuWBltXXAYmoaykCjLS/zu3hw j6U0o1RZ2hrNZMtVHEDBV+PhM2UZKJaKWsSuaXs4EGeTfd/DLhAs X-Google-Smtp-Source: AGHT+IGjkFT+ZKnjgwFk64cxSbtgs50RgnBYPxpbZoJAZJ3zr6J5iDQsjOlfhX/xxMDqfe1IA4qOcQ== X-Received: by 2002:a05:600c:4e08:b0:421:5242:ee2 with SMTP id 5b1f17b1804b1-42156f8cfb8mr11024645e9.25.1717573788214; Wed, 05 Jun 2024 00:49:48 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2500:a01:2595:4364:d152:dff3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064bbb1sm13527200f8f.101.2024.06.05.00.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:49:47 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wolfram Sang , Liam Girdwood , Mark Brown , Magnus Damm Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Fabrizio Castro , Biju Das , Lad Prabhakar Subject: [RFC PATCH 2/4] regulator: core: Add regulator_map_voltage_descend() API Date: Wed, 5 Jun 2024 08:49:34 +0100 Message-Id: <20240605074936.578687-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Lad Prabhakar Similarly to regulator_map_voltage_ascend() api add regulator_map_voltage_descend() api and export it. Drivers that have descendant voltage list can use this as their map_voltage() operation. Signed-off-by: Lad Prabhakar --- drivers/regulator/helpers.c | 31 +++++++++++++++++++++++++++++++ include/linux/regulator/driver.h | 2 ++ 2 files changed, 33 insertions(+) diff --git a/drivers/regulator/helpers.c b/drivers/regulator/helpers.c index 6e1ace660b8c..ac62d778e3c0 100644 --- a/drivers/regulator/helpers.c +++ b/drivers/regulator/helpers.c @@ -368,6 +368,37 @@ int regulator_map_voltage_ascend(struct regulator_dev *rdev, } EXPORT_SYMBOL_GPL(regulator_map_voltage_ascend); +/** + * regulator_map_voltage_descend - map_voltage() for descendant voltage list + * + * @rdev: Regulator to operate on + * @min_uV: Lower bound for voltage + * @max_uV: Upper bound for voltage + * + * Drivers that have descendant voltage list can use this as their + * map_voltage() operation. + */ +int regulator_map_voltage_descend(struct regulator_dev *rdev, + int min_uV, int max_uV) +{ + int i, ret; + + for (i = rdev->desc->n_voltages - 1; i >= 0 ; i--) { + ret = rdev->desc->ops->list_voltage(rdev, i); + if (ret < 0) + continue; + + if (ret > min_uV) + break; + + if (ret >= min_uV && ret <= max_uV) + return i; + } + + return -EINVAL; +} +EXPORT_SYMBOL_GPL(regulator_map_voltage_descend); + /** * regulator_map_voltage_linear - map_voltage() for simple linear mappings * diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index f230a472ccd3..6410c57ba85a 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h @@ -735,6 +735,8 @@ int regulator_map_voltage_iterate(struct regulator_dev *rdev, int min_uV, int max_uV); int regulator_map_voltage_ascend(struct regulator_dev *rdev, int min_uV, int max_uV); +int regulator_map_voltage_descend(struct regulator_dev *rdev, + int min_uV, int max_uV); int regulator_get_voltage_sel_pickable_regmap(struct regulator_dev *rdev); int regulator_set_voltage_sel_pickable_regmap(struct regulator_dev *rdev, unsigned int sel); From patchwork Wed Jun 5 07:49:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 13686297 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CA7A18FDC6; Wed, 5 Jun 2024 07:49:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573793; cv=none; b=aKr/6NZeZ0atuA5Joq4SpQZ7KV+Wty48P6TSNxneDGyQMXSBuv9pAmQSag1jgfuy+/+aD2aU3JjWmsbDcl+rGjSLhmpD3piPn2AzeKRvRtsg+cO4GSvIocslljhHWP23SUV1d5ygmx9uLBeVRjl1iq88CkYViRifP2B+W0MwwRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573793; c=relaxed/simple; bh=TyKyahdt4F4oRdL0xTtHczb4jdNxXFw31qd2zAJYHNA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k9Cb3JKVRxgkVxSHAvRq++SDHACbnpazRzoFqQGiTgxRngktLPE2nPBhRe+4NY7wenI8lBcrOKkFw0X1vL1o3t0oyg7eh0Y1HitQbiTqYg2RaF1u2d0ejRJ4qxNphAZQT0hg/HFPzJqsL11LzTZyBbKmZTBG5aVMKp4oPlyDb4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CuqzB2Vc; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CuqzB2Vc" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-52b7ffd9f6eso6483692e87.3; Wed, 05 Jun 2024 00:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717573790; x=1718178590; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CSxiemqQoIgjSV8XPLRpGscKuH5jcWFBmdotFuR94s0=; b=CuqzB2Vc26Fp6bm8jnEc9MEJ4UKJrSBQclCmsZqhLaM4+Y6gvFB4ds9Gul6s4EYBRT NOLJIwG8UwiskaZ+nXRPjliMirHMmpFYA7XJDs0fcjxwHinVXEMpa8tSOJbenG0Rc634 Rn7yWOTPB86FV0B9QPaYnHgZJ2GHg4yoArIVJ9LJEcX5OjB2dKp5lIZmP8D80cPBZkPh n6QFKglXogBU9UugBBFitNOvqlxBUwovLaUuVAK+DeLRDgP8KeiOgBr4Pg3wLo2jUWSy 6oqZfFaXWhI/jzKPqVohcHncd0a0EhUNndc4iNrDNiLBJLehBIDw/hAexlpEaRJm4U+b NeWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717573790; x=1718178590; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CSxiemqQoIgjSV8XPLRpGscKuH5jcWFBmdotFuR94s0=; b=huTbgIpE4wv98LxkPtKHySs4IpINQayEaXsT+8xoHcX+yz/LFoSGZGxhE9nXUyp0Q6 0pRkeY6MbTFVn4RyBoW7e9gJdL9Nr3vdFVpCjFmuQ6IAt6hxU3KkySLBW5OBUYeMDAM2 iTYnLtBI/wU2uCz2GCWGaKiLOKTQMM995qJg4RS5/YePyaxX44euRLFqZJMFvabmMFD2 GSm6Aydzg95mpVZ9unJNoImYnunQ+s05lcs9kGOR/S9Qdj8igIVQsVQIBhAMBVk4EC81 PFUdB5LH3cDBhhkT/KMZXF5bsBtBYg2PO9MjC1qXK32vRXzboKymMfQ831K4Upw9kPgd RTRQ== X-Forwarded-Encrypted: i=1; AJvYcCValdmRDh5sAMILx/lZy+sp+8P+J41bvpF3+gvJp5EKqJDhDUnqRPZS5u3kMypCXzHL/rBV20PCpcKmgjRoW4qgi97+4Mt8WHm4Xj++i19YW1tYQjuWy4UDykHj4YlNx7X4waSRhAhWXvPsZIj7hhOZGVxSNi8L6EOUjRAHPno3Ou2pO3y7T3CtxaVV X-Gm-Message-State: AOJu0Yydf4Vq0NvBmbvdnInZH/KK26P+ee/U9tbEZYxoTUN54hXsYuda 0cheQP3jChWeuSbBkuQ+kEUTlfz6kGhQ6FVEXhF8fOm2TRH4uA/D X-Google-Smtp-Source: AGHT+IHCQVlWtdQT2vsFwuLCbEu7G3gCcNuvAI5D6EtbgKI5L7tF6BHgoxqxFNTrkKdVqmLmEyDUVQ== X-Received: by 2002:ac2:491e:0:b0:52b:8871:9b31 with SMTP id 2adb3069b0e04-52bab4b0976mr980065e87.11.1717573789400; Wed, 05 Jun 2024 00:49:49 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2500:a01:2595:4364:d152:dff3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064bbb1sm13527200f8f.101.2024.06.05.00.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:49:48 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wolfram Sang , Liam Girdwood , Mark Brown , Magnus Damm Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Fabrizio Castro , Biju Das , Lad Prabhakar Subject: [RFC PATCH 3/4] dt-bindings: mmc: renesas,sdhi: Document RZ/V2H(P) support Date: Wed, 5 Jun 2024 08:49:35 +0100 Message-Id: <20240605074936.578687-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Lad Prabhakar The SD/MMC block on the RZ/V2H(P) ("R9A09G057") SoC is similar to that of the R-Car Gen3, but it has some differences: - HS400 is not supported. - It supports the SD_IOVS bit to control the IO voltage level. - It supports fixed address mode. To accommodate these differences, a SoC-specific 'renesas,sdhi-r9a09g057' compatible string is added. A "vqmmc-r9a09g057-regulator" regulator object is added to handle the voltage level switch of the SD/MMC pins. Signed-off-by: Lad Prabhakar --- .../devicetree/bindings/mmc/renesas,sdhi.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml index 3d0e61e59856..154f5767cf03 100644 --- a/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml @@ -18,6 +18,7 @@ properties: - renesas,sdhi-r7s9210 # SH-Mobile AG5 - renesas,sdhi-r8a73a4 # R-Mobile APE6 - renesas,sdhi-r8a7740 # R-Mobile A1 + - renesas,sdhi-r9a09g057 # RZ/V2H(P) - renesas,sdhi-sh73a0 # R-Mobile APE6 - items: - enum: @@ -118,7 +119,9 @@ allOf: properties: compatible: contains: - const: renesas,rzg2l-sdhi + enum: + - renesas,sdhi-r9a09g057 + - renesas,rzg2l-sdhi then: properties: clocks: @@ -204,6 +207,21 @@ allOf: sectioned off to be run by a separate second clock source to allow the main core clock to be turned off to save power. + - if: + properties: + compatible: + contains: + const: renesas,sdhi-r9a09g057 + then: + properties: + vqmmc-r9a09g057-regulator: + type: object + description: VQMMC SD regulator + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + required: + - vqmmc-r9a09g057-regulator + required: - compatible - reg From patchwork Wed Jun 5 07:49:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 13686298 X-Patchwork-Delegate: geert@linux-m68k.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45D6018F2CF; Wed, 5 Jun 2024 07:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573794; cv=none; b=JIdldrX/poswf6jp2jVk7oKzKS+R4KlG7B8Gir5TBU7GzFuKSiWpa0YYj61QJmZTnVibUVJXnoosbkpN8YnJ0BbhxTCJfY/q9+MlF+6MGIwQDNkdalIxYDhnsiHoRvrxciCY7BqlI6O63NLEWEYDA4tkrsCWsfERu7EaO2g/ALo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717573794; c=relaxed/simple; bh=ykxUPT80WdLC6iVgJGza9Nht0TsgDhu9nODeCPkaH/M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u4BxqP8UbGEYSK+KlNs2y6soB6G1s6E7QPWGdCn1TB8jbgzB0OCweCjUjIxDYnayykoqlDwS44luRDPyUFFOW0l7xP9AM7BWlH1tb/NPsT3BpEbYi4A9j5PLrYgsGpGLMuzLagdCba1UVfRA+Ss+EroUj6eE2jiQD2TXfsAQb2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g9MS58qb; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g9MS58qb" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-35e5604abdcso348084f8f.0; Wed, 05 Jun 2024 00:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717573791; x=1718178591; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Bmzy38dC9NVmz8wfo1K/I35iVA7xhkjqhd0v2ieluDA=; b=g9MS58qbwQ+/FLYSms9m1c5qtFhnbzLq8L447tyKjCAbT/QIxo9nKI7G2La9c35MPh IkHpVgAbQXOTHR8LDWpqNRqMSVYlzW+I5pXB6RTLi5OZBgKZl4cGQB8ZodIyWPvz3KJC SMZt08RxAusy+CdPY/XRcrQcTuU28YrZcLLGD77xGUaCRtqZqm+8l0TEMnghCenvl+e+ 3+eOmXjBCihRlgtO1nLKAyjHAmgc07TCnTIdIiSbXKvuTWcSL7fTnOh1LpMQLiHl7aoC +B23DgmVsYqJKwc4hVuUiseMaaGyAKjqaCsxjNYx+5rX/EbG5IJgQg0sohOANfeUwjDq Anlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717573791; x=1718178591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Bmzy38dC9NVmz8wfo1K/I35iVA7xhkjqhd0v2ieluDA=; b=M+EKH61BqFyLsd6meAjjtYBYmYpbzYeiETHMzsqtbRDNOrLu+me2moAOBeugeTKR1o Mj5dutjMvZpmUXNMr3zXd7VfHnGwmiG+d1YFt1rQcxQTaw2NeWJvP+nVoZIMEDWXzcYl UIcIkOFJW4sOzDmHvI49oxB5knkTrLDVy8GMujHaHPZb+dvYW+8acrtOW2MiGyIs15Ct OOffC6YIiRH8m18gQ4kRgC0oWruyctFKtoiuajAPzLL1k+6L0om1Ak3ADD0b3tHWXQu8 /JIKCuR7Ql2hOIXS98dSeF4viqcZi1p6PQT4bsmYgX/xG4odVByemuk7/hi3G4ymA0Cj +KgA== X-Forwarded-Encrypted: i=1; AJvYcCV8gHrGy7I6CZtqiehjv+eZMNWa8As7HQ4ntRbltWxG6/3ACzp/v+IQXtK6k1DOVfD6BJN2SlNm5Vvz7U/UZoFpcl2A1N9y+5evWG8AYrfIQSI31Bw9AAFW22Prth3rqjn05QjiUA02/wspNqNUIYgyHzwTQe+gN+I3QLh5O3xu2PAXez2ejZ758dtC X-Gm-Message-State: AOJu0YwiF+Sq5QQD2aNw7xMgdmK+4LxB9gn8YNRJmM8i5dPt8ZbCqVMq NAMMnq8z/xZqZlg/F3h++qdHduXKn9IKxvefTVtImM8S21z3QSh/ X-Google-Smtp-Source: AGHT+IEN48oPTM78VBqS88rsUuacvp+1LUBIFE6OWkcKa8sDlnvXZz4thNnTaPIhKwhLBPRWQJiCCQ== X-Received: by 2002:a05:6000:e0b:b0:357:d26a:4f71 with SMTP id ffacd0b85a97d-35e839f4098mr1447649f8f.31.1717573790646; Wed, 05 Jun 2024 00:49:50 -0700 (PDT) Received: from prasmi.home ([2a00:23c8:2500:a01:2595:4364:d152:dff3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd064bbb1sm13527200f8f.101.2024.06.05.00.49.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 00:49:50 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wolfram Sang , Liam Girdwood , Mark Brown , Magnus Damm Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Fabrizio Castro , Biju Das , Lad Prabhakar Subject: [RFC PATCH 4/4] mmc: renesas_sdhi: Add support for RZ/V2H(P) SoC Date: Wed, 5 Jun 2024 08:49:36 +0100 Message-Id: <20240605074936.578687-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20240605074936.578687-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Lad Prabhakar The SDHI/eMMC IPs found in the RZ/V2H(P) (a.k.a. r9a09g057) are very similar to those found in R-Car Gen3. However, they are not identical, necessitating an SoC-specific compatible string for fine-tuning driver support. Key features of the RZ/V2H(P) SDHI/eMMC IPs include: - Voltage level control via the IOVS bit. - PWEN pin support via SD_STATUS register. - Lack of HS400 support. - Fixed address mode operation. sd_iovs and sd_pwen quirks are introduced for SoCs supporting this bit to handle voltage level control and power enable via SD_STATUS register. regulator support is added to control the volatage levels of SD pins via sd_iovs bit in SD_STATUS register. Signed-off-by: Lad Prabhakar --- drivers/mmc/host/renesas_sdhi.h | 7 ++ drivers/mmc/host/renesas_sdhi_core.c | 67 +++++++++++++++++-- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 45 +++++++++++++ drivers/mmc/host/tmio_mmc.h | 4 ++ 4 files changed, 118 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h index 586f94d4dbfd..9ef4fdf44280 100644 --- a/drivers/mmc/host/renesas_sdhi.h +++ b/drivers/mmc/host/renesas_sdhi.h @@ -11,6 +11,8 @@ #include #include +#include +#include #include "tmio_mmc.h" struct renesas_sdhi_scc { @@ -49,6 +51,11 @@ struct renesas_sdhi_quirks { bool manual_tap_correction; bool old_info1_layout; u32 hs400_bad_taps; + bool sd_iovs; + bool sd_pwen; + struct regulator_desc *rdesc; + const struct regmap_config *rdesc_regmap_config; + unsigned int rdesc_offset; const u8 (*hs400_calib_table)[SDHI_CALIB_TABLE_MAX]; }; diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 12f4faaaf4ee..2eeea9513a23 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -248,6 +248,19 @@ static int renesas_sdhi_card_busy(struct mmc_host *mmc) TMIO_STAT_DAT0); } +static void renesas_sdhi_sd_status_pwen(struct tmio_mmc_host *host, bool on) +{ + u32 sd_status; + + sd_ctrl_read32_rep(host, CTL_SD_STATUS, &sd_status, 1); + if (on) + sd_status |= SD_STATUS_PWEN; + else + sd_status &= ~SD_STATUS_PWEN; + + sd_ctrl_write32(host, CTL_SD_STATUS, sd_status); +} + static int renesas_sdhi_start_signal_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) { @@ -587,6 +600,9 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host, bool preserve) false, priv->rstc); /* At least SDHI_VER_GEN2_SDR50 needs manual release of reset */ sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); + if (sdhi_has_quirk(priv, sd_pwen)) + renesas_sdhi_sd_status_pwen(host, true); + priv->needs_adjust_hs400 = false; renesas_sdhi_set_clock(host, host->clk_cache); @@ -904,6 +920,34 @@ static void renesas_sdhi_enable_dma(struct tmio_mmc_host *host, bool enable) renesas_sdhi_sdbuf_width(host, enable ? width : 16); } +static int renesas_sdhi_internal_dmac_register_regulator(struct platform_device *pdev, + const struct renesas_sdhi_quirks *quirks) +{ + struct tmio_mmc_host *host = platform_get_drvdata(pdev); + struct renesas_sdhi *priv = host_to_priv(host); + struct regulator_config rcfg = { + .dev = &pdev->dev, + .driver_data = priv, + }; + struct regulator_dev *rdev; + const char *devname; + + devname = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s-vqmmc-regulator", + dev_name(&pdev->dev)); + if (!devname) + return -ENOMEM; + + quirks->rdesc->name = devname; + rcfg.regmap = devm_regmap_init_mmio(&pdev->dev, host->ctl + quirks->rdesc_offset, + quirks->rdesc_regmap_config); + if (IS_ERR(rcfg.regmap)) + return PTR_ERR(rcfg.regmap); + + rdev = devm_regulator_register(&pdev->dev, quirks->rdesc, &rcfg); + + return PTR_ERR_OR_ZERO(rdev); +} + int renesas_sdhi_probe(struct platform_device *pdev, const struct tmio_mmc_dma_ops *dma_ops, const struct renesas_sdhi_of_data *of_data, @@ -1051,6 +1095,15 @@ int renesas_sdhi_probe(struct platform_device *pdev, if (ret) goto efree; + if (sdhi_has_quirk(priv, sd_iovs)) { + ret = renesas_sdhi_internal_dmac_register_regulator(pdev, quirks); + if (ret) + goto efree; + } + + if (sdhi_has_quirk(priv, sd_pwen)) + renesas_sdhi_sd_status_pwen(host, true); + ver = sd_ctrl_read16(host, CTL_VERSION); /* GEN2_SDR104 is first known SDHI to use 32bit block count */ if (ver < SDHI_VER_GEN2_SDR104 && mmc_data->max_blk_count > U16_MAX) @@ -1110,26 +1163,26 @@ int renesas_sdhi_probe(struct platform_device *pdev, num_irqs = platform_irq_count(pdev); if (num_irqs < 0) { ret = num_irqs; - goto eirq; + goto epwen; } /* There must be at least one IRQ source */ if (!num_irqs) { ret = -ENXIO; - goto eirq; + goto epwen; } for (i = 0; i < num_irqs; i++) { irq = platform_get_irq(pdev, i); if (irq < 0) { ret = irq; - goto eirq; + goto epwen; } ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0, dev_name(&pdev->dev), host); if (ret) - goto eirq; + goto epwen; } ret = tmio_mmc_host_probe(host); @@ -1141,7 +1194,9 @@ int renesas_sdhi_probe(struct platform_device *pdev, return ret; -eirq: +epwen: + if (sdhi_has_quirk(priv, sd_pwen)) + renesas_sdhi_sd_status_pwen(host, false); tmio_mmc_host_remove(host); edisclk: renesas_sdhi_clk_disable(host); @@ -1157,6 +1212,8 @@ void renesas_sdhi_remove(struct platform_device *pdev) struct tmio_mmc_host *host = platform_get_drvdata(pdev); tmio_mmc_host_remove(host); + if (sdhi_has_quirk(host_to_priv(host), sd_pwen)) + renesas_sdhi_sd_status_pwen(host, false); renesas_sdhi_clk_disable(host); tmio_mmc_host_free(host); } diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 422fa63a2e99..f824d167bb09 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -215,6 +215,45 @@ static const struct renesas_sdhi_quirks sdhi_quirks_rzg2l = { .hs400_disabled = true, }; +static const unsigned int r9a09g057_vqmmc_voltages[] = { + 3300000, 1800000, +}; + +static const struct regulator_ops r9a09g057_regulator_voltage_ops = { + .list_voltage = regulator_list_voltage_table, + .map_voltage = regulator_map_voltage_descend, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, +}; + +static struct regulator_desc r9a09g057_vqmmc_regulator = { + .of_match = of_match_ptr("vqmmc-r9a09g057-regulator"), + .owner = THIS_MODULE, + .type = REGULATOR_VOLTAGE, + .ops = &r9a09g057_regulator_voltage_ops, + .volt_table = r9a09g057_vqmmc_voltages, + .n_voltages = ARRAY_SIZE(r9a09g057_vqmmc_voltages), + .vsel_mask = 0x10000, + .vsel_reg = 0, +}; + +static const struct regmap_config r9a09g057_vqmmc_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .max_register = 1, +}; + +static const struct renesas_sdhi_quirks sdhi_quirks_r9a09g057 = { + .fixed_addr_mode = true, + .hs400_disabled = true, + .sd_iovs = true, + .sd_pwen = true, + .rdesc = &r9a09g057_vqmmc_regulator, + .rdesc_regmap_config = &r9a09g057_vqmmc_regmap_config, + .rdesc_offset = 0x3C8, +}; + /* * Note for r8a7796 / r8a774a1: we can't distinguish ES1.1 and 1.2 as of now. * So, we want to treat them equally and only have a match for ES1.2 to enforce @@ -260,6 +299,11 @@ static const struct renesas_sdhi_of_data_with_quirks of_rzg2l_compatible = { .quirks = &sdhi_quirks_rzg2l, }; +static const struct renesas_sdhi_of_data_with_quirks of_r9a09g057_compatible = { + .of_data = &of_data_rcar_gen3, + .quirks = &sdhi_quirks_r9a09g057, +}; + static const struct renesas_sdhi_of_data_with_quirks of_rcar_gen3_compatible = { .of_data = &of_data_rcar_gen3, }; @@ -284,6 +328,7 @@ static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = { { .compatible = "renesas,sdhi-r8a77990", .data = &of_r8a77990_compatible, }, { .compatible = "renesas,sdhi-r8a77995", .data = &of_rcar_gen3_nohs400_compatible, }, { .compatible = "renesas,sdhi-r9a09g011", .data = &of_rzg2l_compatible, }, + { .compatible = "renesas,sdhi-r9a09g057", .data = &of_r9a09g057_compatible, }, { .compatible = "renesas,rzg2l-sdhi", .data = &of_rzg2l_compatible, }, { .compatible = "renesas,rcar-gen3-sdhi", .data = &of_rcar_gen3_compatible, }, { .compatible = "renesas,rcar-gen4-sdhi", .data = &of_rcar_gen3_compatible, }, diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index de56e6534aea..d03aedf61aa3 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -43,6 +43,7 @@ #define CTL_RESET_SD 0xe0 #define CTL_VERSION 0xe2 #define CTL_SDIF_MODE 0xe6 /* only known on R-Car 2+ */ +#define CTL_SD_STATUS 0xf2 /* only known on RZ/G2L and RZ/V2H(P) */ /* Definitions for values the CTL_STOP_INTERNAL_ACTION register can take */ #define TMIO_STOP_STP BIT(0) @@ -102,6 +103,9 @@ /* Definitions for values the CTL_SDIF_MODE register can take */ #define SDIF_MODE_HS400 BIT(0) /* only known on R-Car 2+ */ +/* Definitions for values the CTL_SD_STATUS register can take */ +#define SD_STATUS_PWEN BIT(0) /* only known on RZ/V2H(P) */ + /* Define some IRQ masks */ /* This is the mask used at reset by the chip */ #define TMIO_MASK_ALL 0x837f031d