| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <f45f7663b694b16214604b55527f38eb9232f95b.1599214329.git.mchehab+huawei@kernel.org>
Date: Fri, 4 Sep 2020 12:23:31 +0200
From: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: linuxarm@...wei.com, mauro.chehab@...wei.com,
Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
John Stultz <john.stultz@...aro.org>,
Manivannan Sadhasivam <mani@...nel.org>,
Robin Murphy <robin.murphy@....com>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>, linux-kernel@...r.kernel.org
Subject: [RFC 09/10] misc: hisi_hikey_usb: add support for Hikey 970
The HiKey 970 board uses a voltage regulator and GPIO reset pin.
Add support for them.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
---
drivers/misc/hisi_hikey_usb.c | 97 +++++++++++++++++++++++++++++------
1 file changed, 82 insertions(+), 15 deletions(-)
diff --git a/drivers/misc/hisi_hikey_usb.c b/drivers/misc/hisi_hikey_usb.c
index 3a98a890757c..3b08ca880151 100644
--- a/drivers/misc/hisi_hikey_usb.c
+++ b/drivers/misc/hisi_hikey_usb.c
@@ -14,8 +14,10 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/notifier.h>
+#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/property.h>
+#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/usb/role.h>
@@ -46,23 +48,30 @@ struct hisi_hikey_usb {
static void hub_power_ctrl(struct hisi_hikey_usb *hisi_hikey_usb, int value)
{
+ if (!hisi_hikey_usb->hub_vbus)
+ return;
+
gpiod_set_value_cansleep(hisi_hikey_usb->hub_vbus, value);
}
static void usb_switch_ctrl(struct hisi_hikey_usb *hisi_hikey_usb,
int switch_to)
{
+ if (!hisi_hikey_usb->otg_switch)
+ return;
+
gpiod_set_value_cansleep(hisi_hikey_usb->otg_switch, switch_to);
}
static void usb_typec_power_ctrl(struct hisi_hikey_usb *hisi_hikey_usb,
int value)
{
+ if (!hisi_hikey_usb->typec_vbus)
+ return;
+
gpiod_set_value_cansleep(hisi_hikey_usb->typec_vbus, value);
}
-
-
static void relay_set_role_switch(struct work_struct *work)
{
struct hisi_hikey_usb *hisi_hikey_usb = container_of(work,
@@ -117,31 +126,89 @@ static int hub_usb_role_switch_set(struct usb_role_switch *sw, enum usb_role rol
return 0;
}
+static int hisi_hikey_usb_parse_kirin970(struct platform_device *pdev)
+{
+ struct regulator *regulator;
+ int hub_reset_en_gpio;
+ int ret;
+
+ regulator = devm_regulator_get_optional(&pdev->dev, "hub-vdd");
+ if (IS_ERR(regulator)) {
+ if (PTR_ERR(regulator) == -EPROBE_DEFER) {
+ dev_info(&pdev->dev,
+ "waiting for hub-vdd-supply to be probed\n");
+ return PTR_ERR(regulator);
+ }
+
+ /* let it fall back to regulator dummy */
+ regulator = devm_regulator_get(&pdev->dev, "hub-vdd");
+ if (IS_ERR(regulator)) {
+ dev_err(&pdev->dev,
+ "get hub-vdd-supply failed with error %ld\n",
+ PTR_ERR(regulator));
+ return PTR_ERR(regulator);
+ }
+ }
+
+ ret = regulator_set_voltage(regulator, 3300000, 3300000);
+ if (ret)
+ dev_err(&pdev->dev, "set hub-vdd-supply voltage failed\n");
+
+ hub_reset_en_gpio = of_get_named_gpio(pdev->dev.of_node,
+ "hub_reset_en_gpio", 0);
+ if (!gpio_is_valid(hub_reset_en_gpio)) {
+ dev_err(&pdev->dev, "Failed to get a valid reset gpio\n");
+ return -ENODEV;
+ }
+
+ ret = devm_gpio_request(&pdev->dev, hub_reset_en_gpio,
+ "hub_reset_en_gpio");
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to request the reset gpio\n");
+ return ret;
+ }
+ ret = gpio_direction_output(hub_reset_en_gpio, 1);
+ if (ret)
+ dev_err(&pdev->dev,
+ "Failed to set the direction of the reset gpio\n");
+
+ return ret;
+}
+
static int hisi_hikey_usb_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct hisi_hikey_usb *hisi_hikey_usb;
struct usb_role_switch_desc hub_role_switch = {NULL};
+ int ret;
hisi_hikey_usb = devm_kzalloc(dev, sizeof(*hisi_hikey_usb), GFP_KERNEL);
if (!hisi_hikey_usb)
return -ENOMEM;
- hisi_hikey_usb->typec_vbus = devm_gpiod_get(dev, "typec-vbus",
- GPIOD_OUT_LOW);
- if (IS_ERR(hisi_hikey_usb->typec_vbus))
- return PTR_ERR(hisi_hikey_usb->typec_vbus);
-
hisi_hikey_usb->otg_switch = devm_gpiod_get(dev, "otg-switch",
GPIOD_OUT_HIGH);
if (IS_ERR(hisi_hikey_usb->otg_switch))
return PTR_ERR(hisi_hikey_usb->otg_switch);
- /* hub-vdd33-en is optional */
- hisi_hikey_usb->hub_vbus = devm_gpiod_get_optional(dev, "hub-vdd33-en",
- GPIOD_OUT_HIGH);
- if (IS_ERR(hisi_hikey_usb->hub_vbus))
- return PTR_ERR(hisi_hikey_usb->hub_vbus);
+ hisi_hikey_usb->typec_vbus = devm_gpiod_get(dev, "typec-vbus",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(hisi_hikey_usb->typec_vbus))
+ return PTR_ERR(hisi_hikey_usb->typec_vbus);
+
+ /* Parse Kirin 970-specific OF data */
+ if (of_device_is_compatible(pdev->dev.of_node,
+ "hisilicon,kirin970_hikey_usbhub")) {
+ ret = hisi_hikey_usb_parse_kirin970(pdev);
+ if (ret)
+ return ret;
+ } else {
+ /* hub-vdd33-en is optional */
+ hisi_hikey_usb->hub_vbus = devm_gpiod_get_optional(dev, "hub-vdd33-en",
+ GPIOD_OUT_HIGH);
+ if (IS_ERR(hisi_hikey_usb->hub_vbus))
+ return PTR_ERR(hisi_hikey_usb->hub_vbus);
+ }
hisi_hikey_usb->dev_role_sw = usb_role_switch_get(dev);
if (!hisi_hikey_usb->dev_role_sw)
@@ -149,7 +216,6 @@ static int hisi_hikey_usb_probe(struct platform_device *pdev)
if (IS_ERR(hisi_hikey_usb->dev_role_sw))
return PTR_ERR(hisi_hikey_usb->dev_role_sw);
-
INIT_WORK(&hisi_hikey_usb->work, relay_set_role_switch);
mutex_init(&hisi_hikey_usb->lock);
@@ -158,7 +224,7 @@ static int hisi_hikey_usb_probe(struct platform_device *pdev)
hub_role_switch.driver_data = hisi_hikey_usb;
hisi_hikey_usb->hub_role_sw = usb_role_switch_register(dev,
- &hub_role_switch);
+ &hub_role_switch);
if (IS_ERR(hisi_hikey_usb->hub_role_sw)) {
usb_role_switch_put(hisi_hikey_usb->dev_role_sw);
@@ -184,7 +250,8 @@ static int hisi_hikey_usb_remove(struct platform_device *pdev)
}
static const struct of_device_id id_table_hisi_hikey_usb[] = {
- {.compatible = "hisilicon,gpio_hubv1"},
+ { .compatible = "hisilicon,gpio_hubv1" },
+ { .compatible = "hisilicon,kirin970_hikey_usbhub" },
{}
};
MODULE_DEVICE_TABLE(of, id_table_hisi_hikey_usb);
--
2.26.2
Powered by blists - more mailing lists