From patchwork Thu Feb 1 15:14:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13541766 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56BBD5F46B; Thu, 1 Feb 2024 20:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.55.52.88 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706817708; cv=none; b=Emrso9aUjOdm9iIMfWXbOLU4AAVUxQBKwLvivITRYM+FjLpWspCOSmyb1F/YNJn0xM9LeU6fvY/jZe/oKarxbAWWNx75q0SCsXPyx7XHlu1QwoLvnt/rScRJwqdOoEBvxT79vus3x0KbSl6MxiryIxGmgjPVOz46J9cS0VA2yVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706817708; c=relaxed/simple; bh=Eogk3XjgcRHFKVfwFBmgrv6XFe+ww9n/tWDnoLocj6o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V+QYiyE1gKxmeIHVkiee1Y0lqi+N3lTR97S8VTNILgYYpomocPzhhIkDlVq8TVZVb+yR+SteRxMAjyQP2OA8GEGzOlGDEqEs/wChQ7qnSNyg/zLQFyQ9ZFUya4nBbQxIM8lLip0OtuVkQgKrUEp3tOEumFvIeakGtw17/QY0P/s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mkNGhkJu; arc=none smtp.client-ip=192.55.52.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mkNGhkJu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706817706; x=1738353706; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Eogk3XjgcRHFKVfwFBmgrv6XFe+ww9n/tWDnoLocj6o=; b=mkNGhkJuULoZzOZf6Hl9mFTK3ip+At1oZJ9WY9GgXdgH9yyU4v/P3hUR uIwoamh8NmqciZUZ7asJ30Z/PhFSFgj5RIUS8FEbQ1yxoLeUpo3YOXSm5 So5ajUBE0ix8rnVMxB9A/uBEDE/bVb8CFEuxfAqt5XfPBhxPSUvZaCALN ggi7DqIU6Y+ojin3NNXoF+g7sHlKzWKWNczHZnUU+e9gKEEtmuhlvi0OR pb4KQkIjw3Tt6qxvRJmORoxs8tDxInTVnSIckztn9KUiHizqsFCTlujP5 fwT0+JpAPobtoO3Pm1mS/sUs7fBKPzg8NUA7OwV7jJpN43aKXHZekEtfa A==; X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="435148104" X-IronPort-AV: E=Sophos;i="6.05,236,1701158400"; d="scan'208";a="435148104" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Feb 2024 12:01:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="1120050426" X-IronPort-AV: E=Sophos;i="6.05,236,1701158400"; d="scan'208";a="1120050426" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 01 Feb 2024 12:01:42 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C5F0CB84; Thu, 1 Feb 2024 17:15:42 +0200 (EET) From: Andy Shevchenko To: Flavio Suligoi , Andy Shevchenko , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lee Jones , Daniel Thompson , Jingoo Han , Helge Deller Subject: [PATCH v2 1/3] backlight: mp3309c: Make use of device properties Date: Thu, 1 Feb 2024 17:14:13 +0200 Message-ID: <20240201151537.367218-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240201151537.367218-1-andriy.shevchenko@linux.intel.com> References: <20240201151537.367218-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the module to be property provider agnostic and allow it to be used on non-OF platforms. Add mod_devicetable.h include. Tested-by: Flavio Suligoi Signed-off-by: Andy Shevchenko Reviewed-by: Daniel Thompson --- drivers/video/backlight/mp3309c.c | 44 +++++++++++++------------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/drivers/video/backlight/mp3309c.c b/drivers/video/backlight/mp3309c.c index 34d71259fac1..762bd738c903 100644 --- a/drivers/video/backlight/mp3309c.c +++ b/drivers/video/backlight/mp3309c.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -199,18 +201,15 @@ static const struct backlight_ops mp3309c_bl_ops = { .update_status = mp3309c_bl_update_status, }; -static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, - struct mp3309c_platform_data *pdata) +static int mp3309c_parse_fwnode(struct mp3309c_chip *chip, + struct mp3309c_platform_data *pdata) { - struct device_node *node = chip->dev->of_node; - struct property *prop_pwms; - struct property *prop_levels = NULL; - int length = 0; int ret, i; unsigned int num_levels, tmp_value; + struct device *dev = chip->dev; - if (!node) { - dev_err(chip->dev, "failed to get DT node\n"); + if (!dev_fwnode(dev)) { + dev_err(dev, "failed to get firmware node\n"); return -ENODEV; } @@ -224,8 +223,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, * found in the backlight node, the mode switches to PWM mode. */ pdata->dimming_mode = DIMMING_ANALOG_I2C; - prop_pwms = of_find_property(node, "pwms", &length); - if (prop_pwms) { + if (device_property_present(dev, "pwms")) { chip->pwmd = devm_pwm_get(chip->dev, NULL); if (IS_ERR(chip->pwmd)) return dev_err_probe(chip->dev, PTR_ERR(chip->pwmd), @@ -257,11 +255,9 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, /* * PWM control mode: check for brightness level in DT */ - prop_levels = of_find_property(node, "brightness-levels", - &length); - if (prop_levels) { + if (device_property_present(dev, "brightness-levels")) { /* Read brightness levels from DT */ - num_levels = length / sizeof(u32); + num_levels = device_property_count_u32(dev, "brightness-levels"); if (num_levels < 2) return -EINVAL; } else { @@ -275,10 +271,9 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, sizeof(*pdata->levels), GFP_KERNEL); if (!pdata->levels) return -ENOMEM; - if (prop_levels) { - ret = of_property_read_u32_array(node, "brightness-levels", - pdata->levels, - num_levels); + if (device_property_present(dev, "brightness-levels")) { + ret = device_property_read_u32_array(dev, "brightness-levels", + pdata->levels, num_levels); if (ret < 0) return ret; } else { @@ -288,8 +283,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, pdata->max_brightness = num_levels - 1; - ret = of_property_read_u32(node, "default-brightness", - &pdata->default_brightness); + ret = device_property_read_u32(dev, "default-brightness", &pdata->default_brightness); if (ret) pdata->default_brightness = pdata->max_brightness; if (pdata->default_brightness > pdata->max_brightness) { @@ -310,8 +304,8 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, * If missing, the default value for OVP is 35.5V */ pdata->over_voltage_protection = REG_I2C_1_OVP1; - if (!of_property_read_u32(node, "mps,overvoltage-protection-microvolt", - &tmp_value)) { + ret = device_property_read_u32(dev, "mps,overvoltage-protection-microvolt", &tmp_value); + if (!ret) { switch (tmp_value) { case 13500000: pdata->over_voltage_protection = 0x00; @@ -328,9 +322,7 @@ static int pm3309c_parse_dt_node(struct mp3309c_chip *chip, } /* Synchronous (default) and non-synchronous mode */ - pdata->sync_mode = true; - if (of_property_read_bool(node, "mps,no-sync-mode")) - pdata->sync_mode = false; + pdata->sync_mode = !device_property_read_bool(dev, "mps,no-sync-mode"); return 0; } @@ -366,7 +358,7 @@ static int mp3309c_probe(struct i2c_client *client) if (!pdata) return -ENOMEM; - ret = pm3309c_parse_dt_node(chip, pdata); + ret = mp3309c_parse_fwnode(chip, pdata); if (ret) return ret; }