* [PATCH v2 1/4] mmc: sdhci-of-aspeed: Fix link failure for SPARC
From: Andrew Jeffery @ 2019-09-02 3:58 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190902035842.2747-1-andrew@aj.id.au>
Resolves the following build error reported by the 0-day bot:
ERROR: "of_platform_device_create" [drivers/mmc/host/sdhci-of-aspeed.ko] undefined!
SPARC does not set CONFIG_OF_ADDRESS so the symbol is missing. Guard the
callsite to maintain build coverage for the rest of the driver.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed.c | 38 ++++++++++++++++++++----------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index d5acb5afc50f..96ca494752c5 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -224,10 +224,30 @@ static struct platform_driver aspeed_sdhci_driver = {
.remove = aspeed_sdhci_remove,
};
-static int aspeed_sdc_probe(struct platform_device *pdev)
-
+static int aspeed_sdc_create_sdhcis(struct platform_device *pdev)
{
+#if defined(CONFIG_OF_ADDRESS)
struct device_node *parent, *child;
+
+ parent = pdev->dev.of_node;
+
+ for_each_available_child_of_node(parent, child) {
+ struct platform_device *cpdev;
+
+ cpdev = of_platform_device_create(child, NULL, &pdev->dev);
+ if (!cpdev) {
+ of_node_put(child);
+ return -ENODEV;
+ }
+ }
+#endif
+
+ return 0;
+}
+
+static int aspeed_sdc_probe(struct platform_device *pdev)
+
+{
struct aspeed_sdc *sdc;
int ret;
@@ -256,17 +276,9 @@ static int aspeed_sdc_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, sdc);
- parent = pdev->dev.of_node;
- for_each_available_child_of_node(parent, child) {
- struct platform_device *cpdev;
-
- cpdev = of_platform_device_create(child, NULL, &pdev->dev);
- if (!cpdev) {
- of_node_put(child);
- ret = -ENODEV;
- goto err_clk;
- }
- }
+ ret = aspeed_sdc_create_sdhcis(pdev);
+ if (ret)
+ goto err_clk;
return 0;
--
2.20.1
^ permalink raw reply related
* [PATCH v2 0/4] mmc: sdhci-of-aspeed: Fixes for AST2600 eMMC support
From: Andrew Jeffery @ 2019-09-02 3:58 UTC (permalink / raw)
To: linux-aspeed
Hello,
I've added a couple of patches since v1 of this series. The horizon has
broadened slightly with a fix for SPARC builds as well in patch 1/4. Ulf
suggested a minor cleanup on v1 with respect to handling of the current clock
value, so that's now patch 2/4. Patches 3/4 and 4/4 are as they were in v1.
The v1 series can be found here:
https://patchwork.ozlabs.org/cover/1155757/
Please review!
Andrew
Andrew Jeffery (4):
mmc: sdhci-of-aspeed: Fix link failure for SPARC
mmc: sdhci-of-aspeed: Drop redundant assignment to host->clock
mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
mmc: sdhci-of-aspeed: Allow max-frequency limitation of SDCLK
drivers/mmc/host/sdhci-of-aspeed.c | 62 ++++++++++++++++++++----------
1 file changed, 42 insertions(+), 20 deletions(-)
--
2.20.1
^ permalink raw reply
* [PATCH v2 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU
From: Guenter Roeck @ 2019-08-31 15:28 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567192263-15065-4-git-send-email-eajames@linux.ibm.com>
On Fri, Aug 30, 2019 at 02:11:03PM -0500, Eddie James wrote:
> Version 2 of the PSU supports a second page of data and changes the
> format of the FW version. Use the devicetree binding to differentiate
> between the version the driver should use.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Changes since v1:
> - use an enum for the version instead of integers 1, 2, etc
>
> drivers/hwmon/pmbus/ibm-cffps.c | 110 ++++++++++++++++++++++++++++++++--------
> 1 file changed, 88 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
> index ee2ee9e..d44745e 100644
> --- a/drivers/hwmon/pmbus/ibm-cffps.c
> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
> @@ -12,6 +12,7 @@
> #include <linux/leds.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> +#include <linux/of_device.h>
> #include <linux/pmbus.h>
>
> #include "pmbus.h"
> @@ -20,8 +21,9 @@
> #define CFFPS_PN_CMD 0x9B
> #define CFFPS_SN_CMD 0x9E
> #define CFFPS_CCIN_CMD 0xBD
> -#define CFFPS_FW_CMD_START 0xFA
> -#define CFFPS_FW_NUM_BYTES 4
> +#define CFFPS_FW_CMD 0xFA
> +#define CFFPS1_FW_NUM_BYTES 4
> +#define CFFPS2_FW_NUM_WORDS 3
> #define CFFPS_SYS_CONFIG_CMD 0xDA
>
> #define CFFPS_INPUT_HISTORY_CMD 0xD6
> @@ -52,6 +54,8 @@ enum {
> CFFPS_DEBUGFS_NUM_ENTRIES
> };
>
> +enum versions { cffps1, cffps2 };
> +
> struct ibm_cffps_input_history {
> struct mutex update_lock;
> unsigned long last_update;
> @@ -61,6 +65,7 @@ struct ibm_cffps_input_history {
> };
>
> struct ibm_cffps {
> + enum versions version;
> struct i2c_client *client;
>
> struct ibm_cffps_input_history input_history;
> @@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
> struct ibm_cffps *psu = to_psu(idxp, idx);
> char data[I2C_SMBUS_BLOCK_MAX] = { 0 };
>
> + pmbus_set_page(psu->client, 0);
> +
> switch (idx) {
> case CFFPS_DEBUGFS_INPUT_HISTORY:
> return ibm_cffps_read_input_history(psu, buf, count, ppos);
> @@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
> rc = snprintf(data, 5, "%04X", rc);
> goto done;
> case CFFPS_DEBUGFS_FW:
> - for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) {
> - rc = i2c_smbus_read_byte_data(psu->client,
> - CFFPS_FW_CMD_START + i);
> - if (rc < 0)
> - return rc;
> + switch (psu->version) {
> + case cffps1:
> + for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) {
> + rc = i2c_smbus_read_byte_data(psu->client,
> + CFFPS_FW_CMD +
> + i);
> + if (rc < 0)
> + return rc;
> +
> + snprintf(&data[i * 2], 3, "%02X", rc);
> + }
>
> - snprintf(&data[i * 2], 3, "%02X", rc);
> - }
> + rc = i * 2;
> + break;
> + case cffps2:
> + for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) {
> + rc = i2c_smbus_read_word_data(psu->client,
> + CFFPS_FW_CMD +
> + i);
> + if (rc < 0)
> + return rc;
> +
> + snprintf(&data[i * 4], 5, "%04X", rc);
> + }
>
> - rc = i * 2;
> + rc = i * 4;
> + break;
> + default:
> + return -EOPNOTSUPP;
> + }
> goto done;
> default:
> return -EINVAL;
> @@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,
> psu->led_state = CFFPS_LED_ON;
> }
>
> + pmbus_set_page(psu->client, 0);
> +
> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
> psu->led_state);
> if (rc < 0)
> @@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
> if (led_cdev->brightness == LED_OFF)
> return 0;
>
> + pmbus_set_page(psu->client, 0);
> +
> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
> CFFPS_LED_BLINK);
> if (rc < 0)
> @@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
> dev_warn(dev, "failed to register led class: %d\n", rc);
> }
>
> -static struct pmbus_driver_info ibm_cffps_info = {
> - .pages = 1,
> - .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> - PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> - PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT |
> - PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT |
> - PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12,
> - .read_byte_data = ibm_cffps_read_byte_data,
> - .read_word_data = ibm_cffps_read_word_data,
> +static struct pmbus_driver_info ibm_cffps_info[] = {
> + [cffps1] = {
> + .pages = 1,
> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
> + PMBUS_HAVE_STATUS_FAN12,
> + .read_byte_data = ibm_cffps_read_byte_data,
> + .read_word_data = ibm_cffps_read_word_data,
> + },
> + [cffps2] = {
> + .pages = 2,
> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
> + PMBUS_HAVE_STATUS_FAN12,
> + .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,
> + .read_byte_data = ibm_cffps_read_byte_data,
> + .read_word_data = ibm_cffps_read_word_data,
> + },
> };
>
> static struct pmbus_platform_data ibm_cffps_pdata = {
> @@ -347,12 +395,21 @@ static int ibm_cffps_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> int i, rc;
> + enum versions vs;
> struct dentry *debugfs;
> struct dentry *ibm_cffps_dir;
> struct ibm_cffps *psu;
> + const void *md = of_device_get_match_data(&client->dev);
> +
> + if (md)
> + vs = (enum versions)md;
> + else if (id)
> + vs = (enum versions)id->driver_data;
> + else
> + vs = cffps1;
>
> client->dev.platform_data = &ibm_cffps_pdata;
> - rc = pmbus_do_probe(client, id, &ibm_cffps_info);
> + rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs]);
> if (rc)
> return rc;
>
> @@ -364,6 +421,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
> if (!psu)
> return 0;
>
> + psu->version = vs;
> psu->client = client;
> mutex_init(&psu->input_history.update_lock);
> psu->input_history.last_update = jiffies - HZ;
> @@ -405,13 +463,21 @@ static int ibm_cffps_probe(struct i2c_client *client,
> }
>
> static const struct i2c_device_id ibm_cffps_id[] = {
> - { "ibm_cffps1", 1 },
> + { "ibm_cffps1", cffps1 },
> + { "ibm_cffps2", cffps2 },
> {}
> };
> MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
>
> static const struct of_device_id ibm_cffps_of_match[] = {
> - { .compatible = "ibm,cffps1" },
> + {
> + .compatible = "ibm,cffps1",
> + .data = (void *)cffps1
> + },
> + {
> + .compatible = "ibm,cffps2",
> + .data = (void *)cffps2
> + },
> {}
> };
> MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
^ permalink raw reply
* [PATCH v2 1/3] dt-bindings: hwmon: Document ibm,cffps2 compatible string
From: Guenter Roeck @ 2019-08-31 15:26 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567192263-15065-2-git-send-email-eajames@linux.ibm.com>
On Fri, Aug 30, 2019 at 02:11:01PM -0500, Eddie James wrote:
> Document the compatible string for version 2 of the IBM CFFPS PSU.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Applied to hwmon-next. Note that we'll still need review from a DT maintainer.
I don't see any problems, but then who knows.
Thanks,
Guenter
> ---
> Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
> index f68a0a6..1036f65 100644
> --- a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
> +++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
> @@ -1,8 +1,10 @@
> -Device-tree bindings for IBM Common Form Factor Power Supply Version 1
> -----------------------------------------------------------------------
> +Device-tree bindings for IBM Common Form Factor Power Supply Versions 1 and 2
> +-----------------------------------------------------------------------------
>
> Required properties:
> - - compatible = "ibm,cffps1";
> + - compatible : Must be one of the following:
> + "ibm,cffps1"
> + "ibm,cffps2"
> - reg = < I2C bus address >; : Address of the power supply on the
> I2C bus.
>
^ permalink raw reply
* [PATCH v4 4/4] aspeed/watchdog: Add access_cs0 option for alt-boot
From: Guenter Roeck @ 2019-08-31 15:01 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190828102402.13155-5-i.mikhaylov@yadro.com>
On Wed, Aug 28, 2019 at 01:24:02PM +0300, Ivan Mikhaylov wrote:
> The option for the ast2400/2500 to get access to CS0 at runtime.
>
> Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> .../ABI/testing/sysfs-class-watchdog | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
>
> diff --git a/Documentation/ABI/testing/sysfs-class-watchdog b/Documentation/ABI/testing/sysfs-class-watchdog
> index 6317ade5ad19..675f9b537661 100644
> --- a/Documentation/ABI/testing/sysfs-class-watchdog
> +++ b/Documentation/ABI/testing/sysfs-class-watchdog
> @@ -72,3 +72,37 @@ Description:
> It is a read/write file. When read, the currently assigned
> pretimeout governor is returned. When written, it sets
> the pretimeout governor.
> +
> +What: /sys/class/watchdog/watchdog1/access_cs0
> +Date: August 2019
> +Contact: Ivan Mikhaylov <i.mikhaylov@yadro.com>,
> + Alexander Amelkin <a.amelkin@yadro.com>
> +Description:
> + It is a read/write file. This attribute exists only if the
> + system has booted from the alternate flash chip due to
> + expiration of a watchdog timer of AST2400/AST2500 when
> + alternate boot function was enabled with 'aspeed,alt-boot'
> + devicetree option for that watchdog or with an appropriate
> + h/w strapping (for WDT2 only).
> +
> + At alternate flash the 'access_cs0' sysfs node provides:
> + ast2400: a way to get access to the primary SPI flash
> + chip at CS0 after booting from the alternate
> + chip at CS1.
> + ast2500: a way to restore the normal address mapping
> + from (CS0->CS1, CS1->CS0) to (CS0->CS0,
> + CS1->CS1).
> +
> + Clearing the boot code selection and timeout counter also
> + resets to the initial state the chip select line mapping. When
> + the SoC is in normal mapping state (i.e. booted from CS0),
> + clearing those bits does nothing for both versions of the SoC.
> + For alternate boot mode (booted from CS1 due to wdt2
> + expiration) the behavior differs as described above.
> +
> + This option can be used with wdt2 (watchdog1) only.
> +
> + When read, the current status of the boot code selection is
> + shown. When written with any non-zero value, it clears
> + the boot code selection and the timeout counter, which results
> + in chipselect reset for AST2400/AST2500.
^ permalink raw reply
* [PATCH v4 3/4] watchdog/aspeed: add support for dual boot
From: Guenter Roeck @ 2019-08-31 15:01 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190828102402.13155-4-i.mikhaylov@yadro.com>
On Wed, Aug 28, 2019 at 01:24:01PM +0300, Ivan Mikhaylov wrote:
> Set WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION into WDT_CLEAR_TIMEOUT_STATUS
> to clear out boot code source and re-enable access to the primary SPI flash
> chip while booted via wdt2 from the alternate chip.
>
> AST2400 datasheet says:
> "In the 2nd flash booting mode, all the address mapping to CS0# would be
> re-directed to CS1#. And CS0# is not accessible under this mode. To access
> CS0#, firmware should clear the 2nd boot mode register in the WDT2 status
> register WDT30.bit[1]."
>
> Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/aspeed_wdt.c | 65 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 64 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
> index cc71861e033a..125dbd349b00 100644
> --- a/drivers/watchdog/aspeed_wdt.c
> +++ b/drivers/watchdog/aspeed_wdt.c
> @@ -53,6 +53,8 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table);
> #define WDT_CTRL_ENABLE BIT(0)
> #define WDT_TIMEOUT_STATUS 0x10
> #define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1)
> +#define WDT_CLEAR_TIMEOUT_STATUS 0x14
> +#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0)
>
> /*
> * WDT_RESET_WIDTH controls the characteristics of the external pulse (if
> @@ -165,6 +167,60 @@ static int aspeed_wdt_restart(struct watchdog_device *wdd,
> return 0;
> }
>
> +/* access_cs0 shows if cs0 is accessible, hence the reverted bit */
> +static ssize_t access_cs0_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct aspeed_wdt *wdt = dev_get_drvdata(dev);
> + u32 status = readl(wdt->base + WDT_TIMEOUT_STATUS);
> +
> + return sprintf(buf, "%u\n",
> + !(status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY));
> +}
> +
> +static ssize_t access_cs0_store(struct device *dev,
> + struct device_attribute *attr, const char *buf,
> + size_t size)
> +{
> + struct aspeed_wdt *wdt = dev_get_drvdata(dev);
> + unsigned long val;
> +
> + if (kstrtoul(buf, 10, &val))
> + return -EINVAL;
> +
> + if (val)
> + writel(WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION,
> + wdt->base + WDT_CLEAR_TIMEOUT_STATUS);
> +
> + return size;
> +}
> +
> +/*
> + * This attribute exists only if the system has booted from the alternate
> + * flash with 'alt-boot' option.
> + *
> + * At alternate flash the 'access_cs0' sysfs node provides:
> + * ast2400: a way to get access to the primary SPI flash chip at CS0
> + * after booting from the alternate chip at CS1.
> + * ast2500: a way to restore the normal address mapping from
> + * (CS0->CS1, CS1->CS0) to (CS0->CS0, CS1->CS1).
> + *
> + * Clearing the boot code selection and timeout counter also resets to the
> + * initial state the chip select line mapping. When the SoC is in normal
> + * mapping state (i.e. booted from CS0), clearing those bits does nothing for
> + * both versions of the SoC. For alternate boot mode (booted from CS1 due to
> + * wdt2 expiration) the behavior differs as described above.
> + *
> + * This option can be used with wdt2 (watchdog1) only.
> + */
> +static DEVICE_ATTR_RW(access_cs0);
> +
> +static struct attribute *bswitch_attrs[] = {
> + &dev_attr_access_cs0.attr,
> + NULL
> +};
> +ATTRIBUTE_GROUPS(bswitch);
> +
> static const struct watchdog_ops aspeed_wdt_ops = {
> .start = aspeed_wdt_start,
> .stop = aspeed_wdt_stop,
> @@ -306,9 +362,16 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
> }
>
> status = readl(wdt->base + WDT_TIMEOUT_STATUS);
> - if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)
> + if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) {
> wdt->wdd.bootstatus = WDIOF_CARDRESET;
>
> + if (of_device_is_compatible(np, "aspeed,ast2400-wdt") ||
> + of_device_is_compatible(np, "aspeed,ast2500-wdt"))
> + wdt->wdd.groups = bswitch_groups;
> + }
> +
> + dev_set_drvdata(dev, wdt);
> +
> return devm_watchdog_register_device(dev, &wdt->wdd);
> }
>
^ permalink raw reply
* [PATCH v2 1/2] dt-bindings: watchdog: Add ast2600 compatible
From: Guenter Roeck @ 2019-08-31 14:52 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190819051738.17370-2-joel@jms.id.au>
On Mon, Aug 19, 2019 at 02:47:37PM +0930, Joel Stanley wrote:
> This adds a compatible for the ast2600, a new ASPEED SoC.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> v2:
> - Add Andrew's r-b
> ---
> Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> index c5077a1f5cb3..d78d4a8fb868 100644
> --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> @@ -4,6 +4,7 @@ Required properties:
> - compatible: must be one of:
> - "aspeed,ast2400-wdt"
> - "aspeed,ast2500-wdt"
> + - "aspeed,ast2600-wdt"
>
> - reg: physical base address of the controller and length of memory mapped
> region
^ permalink raw reply
* [PATCH v2 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU
From: Eddie James @ 2019-08-30 19:11 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567192263-15065-1-git-send-email-eajames@linux.ibm.com>
Version 2 of the PSU supports a second page of data and changes the
format of the FW version. Use the devicetree binding to differentiate
between the version the driver should use.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
Changes since v1:
- use an enum for the version instead of integers 1, 2, etc
drivers/hwmon/pmbus/ibm-cffps.c | 110 ++++++++++++++++++++++++++++++++--------
1 file changed, 88 insertions(+), 22 deletions(-)
diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index ee2ee9e..d44745e 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -12,6 +12,7 @@
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/of_device.h>
#include <linux/pmbus.h>
#include "pmbus.h"
@@ -20,8 +21,9 @@
#define CFFPS_PN_CMD 0x9B
#define CFFPS_SN_CMD 0x9E
#define CFFPS_CCIN_CMD 0xBD
-#define CFFPS_FW_CMD_START 0xFA
-#define CFFPS_FW_NUM_BYTES 4
+#define CFFPS_FW_CMD 0xFA
+#define CFFPS1_FW_NUM_BYTES 4
+#define CFFPS2_FW_NUM_WORDS 3
#define CFFPS_SYS_CONFIG_CMD 0xDA
#define CFFPS_INPUT_HISTORY_CMD 0xD6
@@ -52,6 +54,8 @@ enum {
CFFPS_DEBUGFS_NUM_ENTRIES
};
+enum versions { cffps1, cffps2 };
+
struct ibm_cffps_input_history {
struct mutex update_lock;
unsigned long last_update;
@@ -61,6 +65,7 @@ struct ibm_cffps_input_history {
};
struct ibm_cffps {
+ enum versions version;
struct i2c_client *client;
struct ibm_cffps_input_history input_history;
@@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
struct ibm_cffps *psu = to_psu(idxp, idx);
char data[I2C_SMBUS_BLOCK_MAX] = { 0 };
+ pmbus_set_page(psu->client, 0);
+
switch (idx) {
case CFFPS_DEBUGFS_INPUT_HISTORY:
return ibm_cffps_read_input_history(psu, buf, count, ppos);
@@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
rc = snprintf(data, 5, "%04X", rc);
goto done;
case CFFPS_DEBUGFS_FW:
- for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) {
- rc = i2c_smbus_read_byte_data(psu->client,
- CFFPS_FW_CMD_START + i);
- if (rc < 0)
- return rc;
+ switch (psu->version) {
+ case cffps1:
+ for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) {
+ rc = i2c_smbus_read_byte_data(psu->client,
+ CFFPS_FW_CMD +
+ i);
+ if (rc < 0)
+ return rc;
+
+ snprintf(&data[i * 2], 3, "%02X", rc);
+ }
- snprintf(&data[i * 2], 3, "%02X", rc);
- }
+ rc = i * 2;
+ break;
+ case cffps2:
+ for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) {
+ rc = i2c_smbus_read_word_data(psu->client,
+ CFFPS_FW_CMD +
+ i);
+ if (rc < 0)
+ return rc;
+
+ snprintf(&data[i * 4], 5, "%04X", rc);
+ }
- rc = i * 2;
+ rc = i * 4;
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
goto done;
default:
return -EINVAL;
@@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,
psu->led_state = CFFPS_LED_ON;
}
+ pmbus_set_page(psu->client, 0);
+
rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
psu->led_state);
if (rc < 0)
@@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
if (led_cdev->brightness == LED_OFF)
return 0;
+ pmbus_set_page(psu->client, 0);
+
rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
CFFPS_LED_BLINK);
if (rc < 0)
@@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
dev_warn(dev, "failed to register led class: %d\n", rc);
}
-static struct pmbus_driver_info ibm_cffps_info = {
- .pages = 1,
- .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
- PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
- PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT |
- PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT |
- PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12,
- .read_byte_data = ibm_cffps_read_byte_data,
- .read_word_data = ibm_cffps_read_word_data,
+static struct pmbus_driver_info ibm_cffps_info[] = {
+ [cffps1] = {
+ .pages = 1,
+ .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
+ PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
+ PMBUS_HAVE_STATUS_FAN12,
+ .read_byte_data = ibm_cffps_read_byte_data,
+ .read_word_data = ibm_cffps_read_word_data,
+ },
+ [cffps2] = {
+ .pages = 2,
+ .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
+ PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
+ PMBUS_HAVE_STATUS_FAN12,
+ .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,
+ .read_byte_data = ibm_cffps_read_byte_data,
+ .read_word_data = ibm_cffps_read_word_data,
+ },
};
static struct pmbus_platform_data ibm_cffps_pdata = {
@@ -347,12 +395,21 @@ static int ibm_cffps_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int i, rc;
+ enum versions vs;
struct dentry *debugfs;
struct dentry *ibm_cffps_dir;
struct ibm_cffps *psu;
+ const void *md = of_device_get_match_data(&client->dev);
+
+ if (md)
+ vs = (enum versions)md;
+ else if (id)
+ vs = (enum versions)id->driver_data;
+ else
+ vs = cffps1;
client->dev.platform_data = &ibm_cffps_pdata;
- rc = pmbus_do_probe(client, id, &ibm_cffps_info);
+ rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs]);
if (rc)
return rc;
@@ -364,6 +421,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
if (!psu)
return 0;
+ psu->version = vs;
psu->client = client;
mutex_init(&psu->input_history.update_lock);
psu->input_history.last_update = jiffies - HZ;
@@ -405,13 +463,21 @@ static int ibm_cffps_probe(struct i2c_client *client,
}
static const struct i2c_device_id ibm_cffps_id[] = {
- { "ibm_cffps1", 1 },
+ { "ibm_cffps1", cffps1 },
+ { "ibm_cffps2", cffps2 },
{}
};
MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
static const struct of_device_id ibm_cffps_of_match[] = {
- { .compatible = "ibm,cffps1" },
+ {
+ .compatible = "ibm,cffps1",
+ .data = (void *)cffps1
+ },
+ {
+ .compatible = "ibm,cffps2",
+ .data = (void *)cffps2
+ },
{}
};
MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
--
1.8.3.1
^ permalink raw reply related
* [PATCH v2 2/3] ARM: dts: aspeed: swift: Change power supplies to version 2
From: Eddie James @ 2019-08-30 19:11 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567192263-15065-1-git-send-email-eajames@linux.ibm.com>
Swift power supplies are version 2 of the IBM CFFPS. Make it so in the
devicetree.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
index f14f745..815b865 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
@@ -494,7 +494,7 @@
};
power-supply at 68 {
- compatible = "ibm,cffps1";
+ compatible = "ibm,cffps2";
reg = <0x68>;
};
@@ -504,7 +504,7 @@
};
power-supply at 69 {
- compatible = "ibm,cffps1";
+ compatible = "ibm,cffps2";
reg = <0x69>;
};
--
1.8.3.1
^ permalink raw reply related
* [PATCH v2 1/3] dt-bindings: hwmon: Document ibm, cffps2 compatible string
From: Eddie James @ 2019-08-30 19:11 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567192263-15065-1-git-send-email-eajames@linux.ibm.com>
Document the compatible string for version 2 of the IBM CFFPS PSU.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
index f68a0a6..1036f65 100644
--- a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
+++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
@@ -1,8 +1,10 @@
-Device-tree bindings for IBM Common Form Factor Power Supply Version 1
-----------------------------------------------------------------------
+Device-tree bindings for IBM Common Form Factor Power Supply Versions 1 and 2
+-----------------------------------------------------------------------------
Required properties:
- - compatible = "ibm,cffps1";
+ - compatible : Must be one of the following:
+ "ibm,cffps1"
+ "ibm,cffps2"
- reg = < I2C bus address >; : Address of the power supply on the
I2C bus.
--
1.8.3.1
^ permalink raw reply related
* [PATCH v2 0/3] pmbus: ibm-cffps: Add support for version 2 of PSU
From: Eddie James @ 2019-08-30 19:11 UTC (permalink / raw)
To: linux-aspeed
Version 2 of this PSU supports a second page of data and changes the
format of the FW version command. Use the devicetree binding (or the I2C
device ID) to determine which version the driver should use. Therefore add
the new compatible string to the devicetree documentation and change the
Swift system devicetree to use version 2.
Changes since v1:
- use an enum for the version instead of integers 1, 2, etc
Eddie James (3):
dt-bindings: hwmon: Document ibm,cffps2 compatible string
ARM: dts: aspeed: swift: Change power supplies to version 2
pmbus: ibm-cffps: Add support for version 2 of the PSU
.../devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +-
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +-
drivers/hwmon/pmbus/ibm-cffps.c | 110 ++++++++++++++++-----
3 files changed, 95 insertions(+), 27 deletions(-)
--
1.8.3.1
^ permalink raw reply
* [PATCH 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU
From: Eddie James @ 2019-08-30 18:19 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190830173603.GA10472@roeck-us.net>
On 8/30/19 12:36 PM, Guenter Roeck wrote:
> On Fri, Aug 30, 2019 at 11:09:45AM -0500, Eddie James wrote:
>> Version 2 of the PSU supports a second page of data and changes the
>> format of the FW version. Use the devicetree binding to differentiate
>> between the version the driver should use.
>>
>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>> ---
>> drivers/hwmon/pmbus/ibm-cffps.c | 109 ++++++++++++++++++++++++++++++++--------
>> 1 file changed, 87 insertions(+), 22 deletions(-)
>>
>> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
>> index ee2ee9e..ca26fbd 100644
>> --- a/drivers/hwmon/pmbus/ibm-cffps.c
>> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
>> @@ -12,16 +12,20 @@
>> #include <linux/leds.h>
>> #include <linux/module.h>
>> #include <linux/mutex.h>
>> +#include <linux/of_device.h>
>> #include <linux/pmbus.h>
>>
>> #include "pmbus.h"
>>
>> +#define CFFPS_VERSIONS 2
>> +
> Any chance you can use an enum for the versions ? Using version
> numbers 1/2 combined with array indices 0/1 is confusing, error
> prone, and seems unnecessary.
Sure, good idea.
Thanks,
Eddie
>
> Thanks,
> Guenter
>
>> #define CFFPS_FRU_CMD 0x9A
>> #define CFFPS_PN_CMD 0x9B
>> #define CFFPS_SN_CMD 0x9E
>> #define CFFPS_CCIN_CMD 0xBD
>> -#define CFFPS_FW_CMD_START 0xFA
>> -#define CFFPS_FW_NUM_BYTES 4
>> +#define CFFPS_FW_CMD 0xFA
>> +#define CFFPS1_FW_NUM_BYTES 4
>> +#define CFFPS2_FW_NUM_WORDS 3
>> #define CFFPS_SYS_CONFIG_CMD 0xDA
>>
>> #define CFFPS_INPUT_HISTORY_CMD 0xD6
>> @@ -61,6 +65,7 @@ struct ibm_cffps_input_history {
>> };
>>
>> struct ibm_cffps {
>> + int version;
>> struct i2c_client *client;
>>
>> struct ibm_cffps_input_history input_history;
>> @@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
>> struct ibm_cffps *psu = to_psu(idxp, idx);
>> char data[I2C_SMBUS_BLOCK_MAX] = { 0 };
>>
>> + pmbus_set_page(psu->client, 0);
>> +
>> switch (idx) {
>> case CFFPS_DEBUGFS_INPUT_HISTORY:
>> return ibm_cffps_read_input_history(psu, buf, count, ppos);
>> @@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
>> rc = snprintf(data, 5, "%04X", rc);
>> goto done;
>> case CFFPS_DEBUGFS_FW:
>> - for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) {
>> - rc = i2c_smbus_read_byte_data(psu->client,
>> - CFFPS_FW_CMD_START + i);
>> - if (rc < 0)
>> - return rc;
>> + switch (psu->version) {
>> + case 1:
>> + for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) {
>> + rc = i2c_smbus_read_byte_data(psu->client,
>> + CFFPS_FW_CMD +
>> + i);
>> + if (rc < 0)
>> + return rc;
>> +
>> + snprintf(&data[i * 2], 3, "%02X", rc);
>> + }
>>
>> - snprintf(&data[i * 2], 3, "%02X", rc);
>> - }
>> + rc = i * 2;
>> + break;
>> + case 2:
>> + for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) {
>> + rc = i2c_smbus_read_word_data(psu->client,
>> + CFFPS_FW_CMD +
>> + i);
>> + if (rc < 0)
>> + return rc;
>> +
>> + snprintf(&data[i * 4], 5, "%04X", rc);
>> + }
>>
>> - rc = i * 2;
>> + rc = i * 4;
>> + break;
>> + default:
>> + return -EOPNOTSUPP;
>> + }
>> goto done;
>> default:
>> return -EINVAL;
>> @@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,
>> psu->led_state = CFFPS_LED_ON;
>> }
>>
>> + pmbus_set_page(psu->client, 0);
>> +
>> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
>> psu->led_state);
>> if (rc < 0)
>> @@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
>> if (led_cdev->brightness == LED_OFF)
>> return 0;
>>
>> + pmbus_set_page(psu->client, 0);
>> +
>> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
>> CFFPS_LED_BLINK);
>> if (rc < 0)
>> @@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
>> dev_warn(dev, "failed to register led class: %d\n", rc);
>> }
>>
>> -static struct pmbus_driver_info ibm_cffps_info = {
>> - .pages = 1,
>> - .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
>> - PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
>> - PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT |
>> - PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT |
>> - PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12,
>> - .read_byte_data = ibm_cffps_read_byte_data,
>> - .read_word_data = ibm_cffps_read_word_data,
>> +static struct pmbus_driver_info ibm_cffps_info[CFFPS_VERSIONS] = {
>> + [0] = {
>> + .pages = 1,
>> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
>> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
>> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
>> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
>> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
>> + PMBUS_HAVE_STATUS_FAN12,
>> + .read_byte_data = ibm_cffps_read_byte_data,
>> + .read_word_data = ibm_cffps_read_word_data,
>> + },
>> + [1] = {
>> + .pages = 2,
>> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
>> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
>> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
>> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
>> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
>> + PMBUS_HAVE_STATUS_FAN12,
>> + .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
>> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
>> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,
>> + .read_byte_data = ibm_cffps_read_byte_data,
>> + .read_word_data = ibm_cffps_read_word_data,
>> + },
>> };
>>
>> static struct pmbus_platform_data ibm_cffps_pdata = {
>> @@ -346,13 +394,21 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
>> static int ibm_cffps_probe(struct i2c_client *client,
>> const struct i2c_device_id *id)
>> {
>> - int i, rc;
>> + int i, rc, vs;
>> struct dentry *debugfs;
>> struct dentry *ibm_cffps_dir;
>> struct ibm_cffps *psu;
>> + const void *md = of_device_get_match_data(&client->dev);
>> +
>> + if (md)
>> + vs = (int)md;
>> + else if (id)
>> + vs = (int)id->driver_data;
>> + else
>> + vs = 1;
>>
>> client->dev.platform_data = &ibm_cffps_pdata;
>> - rc = pmbus_do_probe(client, id, &ibm_cffps_info);
>> + rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs - 1]);
>> if (rc)
>> return rc;
>>
>> @@ -364,6 +420,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
>> if (!psu)
>> return 0;
>>
>> + psu->version = vs;
>> psu->client = client;
>> mutex_init(&psu->input_history.update_lock);
>> psu->input_history.last_update = jiffies - HZ;
>> @@ -406,12 +463,20 @@ static int ibm_cffps_probe(struct i2c_client *client,
>>
>> static const struct i2c_device_id ibm_cffps_id[] = {
>> { "ibm_cffps1", 1 },
>> + { "ibm_cffps2", 2 },
>> {}
>> };
>> MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
>>
>> static const struct of_device_id ibm_cffps_of_match[] = {
>> - { .compatible = "ibm,cffps1" },
>> + {
>> + .compatible = "ibm,cffps1",
>> + .data = (void *)1
>> + },
>> + {
>> + .compatible = "ibm,cffps2",
>> + .data = (void *)2
>> + },
>> {}
>> };
>> MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
>> --
>> 1.8.3.1
>>
^ permalink raw reply
* [PATCH 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU
From: Guenter Roeck @ 2019-08-30 17:36 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567181385-22129-4-git-send-email-eajames@linux.ibm.com>
On Fri, Aug 30, 2019 at 11:09:45AM -0500, Eddie James wrote:
> Version 2 of the PSU supports a second page of data and changes the
> format of the FW version. Use the devicetree binding to differentiate
> between the version the driver should use.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> drivers/hwmon/pmbus/ibm-cffps.c | 109 ++++++++++++++++++++++++++++++++--------
> 1 file changed, 87 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
> index ee2ee9e..ca26fbd 100644
> --- a/drivers/hwmon/pmbus/ibm-cffps.c
> +++ b/drivers/hwmon/pmbus/ibm-cffps.c
> @@ -12,16 +12,20 @@
> #include <linux/leds.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> +#include <linux/of_device.h>
> #include <linux/pmbus.h>
>
> #include "pmbus.h"
>
> +#define CFFPS_VERSIONS 2
> +
Any chance you can use an enum for the versions ? Using version
numbers 1/2 combined with array indices 0/1 is confusing, error
prone, and seems unnecessary.
Thanks,
Guenter
> #define CFFPS_FRU_CMD 0x9A
> #define CFFPS_PN_CMD 0x9B
> #define CFFPS_SN_CMD 0x9E
> #define CFFPS_CCIN_CMD 0xBD
> -#define CFFPS_FW_CMD_START 0xFA
> -#define CFFPS_FW_NUM_BYTES 4
> +#define CFFPS_FW_CMD 0xFA
> +#define CFFPS1_FW_NUM_BYTES 4
> +#define CFFPS2_FW_NUM_WORDS 3
> #define CFFPS_SYS_CONFIG_CMD 0xDA
>
> #define CFFPS_INPUT_HISTORY_CMD 0xD6
> @@ -61,6 +65,7 @@ struct ibm_cffps_input_history {
> };
>
> struct ibm_cffps {
> + int version;
> struct i2c_client *client;
>
> struct ibm_cffps_input_history input_history;
> @@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
> struct ibm_cffps *psu = to_psu(idxp, idx);
> char data[I2C_SMBUS_BLOCK_MAX] = { 0 };
>
> + pmbus_set_page(psu->client, 0);
> +
> switch (idx) {
> case CFFPS_DEBUGFS_INPUT_HISTORY:
> return ibm_cffps_read_input_history(psu, buf, count, ppos);
> @@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
> rc = snprintf(data, 5, "%04X", rc);
> goto done;
> case CFFPS_DEBUGFS_FW:
> - for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) {
> - rc = i2c_smbus_read_byte_data(psu->client,
> - CFFPS_FW_CMD_START + i);
> - if (rc < 0)
> - return rc;
> + switch (psu->version) {
> + case 1:
> + for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) {
> + rc = i2c_smbus_read_byte_data(psu->client,
> + CFFPS_FW_CMD +
> + i);
> + if (rc < 0)
> + return rc;
> +
> + snprintf(&data[i * 2], 3, "%02X", rc);
> + }
>
> - snprintf(&data[i * 2], 3, "%02X", rc);
> - }
> + rc = i * 2;
> + break;
> + case 2:
> + for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) {
> + rc = i2c_smbus_read_word_data(psu->client,
> + CFFPS_FW_CMD +
> + i);
> + if (rc < 0)
> + return rc;
> +
> + snprintf(&data[i * 4], 5, "%04X", rc);
> + }
>
> - rc = i * 2;
> + rc = i * 4;
> + break;
> + default:
> + return -EOPNOTSUPP;
> + }
> goto done;
> default:
> return -EINVAL;
> @@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,
> psu->led_state = CFFPS_LED_ON;
> }
>
> + pmbus_set_page(psu->client, 0);
> +
> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
> psu->led_state);
> if (rc < 0)
> @@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
> if (led_cdev->brightness == LED_OFF)
> return 0;
>
> + pmbus_set_page(psu->client, 0);
> +
> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
> CFFPS_LED_BLINK);
> if (rc < 0)
> @@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
> dev_warn(dev, "failed to register led class: %d\n", rc);
> }
>
> -static struct pmbus_driver_info ibm_cffps_info = {
> - .pages = 1,
> - .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> - PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> - PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT |
> - PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT |
> - PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12,
> - .read_byte_data = ibm_cffps_read_byte_data,
> - .read_word_data = ibm_cffps_read_word_data,
> +static struct pmbus_driver_info ibm_cffps_info[CFFPS_VERSIONS] = {
> + [0] = {
> + .pages = 1,
> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
> + PMBUS_HAVE_STATUS_FAN12,
> + .read_byte_data = ibm_cffps_read_byte_data,
> + .read_word_data = ibm_cffps_read_word_data,
> + },
> + [1] = {
> + .pages = 2,
> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
> + PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
> + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
> + PMBUS_HAVE_STATUS_FAN12,
> + .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,
> + .read_byte_data = ibm_cffps_read_byte_data,
> + .read_word_data = ibm_cffps_read_word_data,
> + },
> };
>
> static struct pmbus_platform_data ibm_cffps_pdata = {
> @@ -346,13 +394,21 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
> static int ibm_cffps_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> - int i, rc;
> + int i, rc, vs;
> struct dentry *debugfs;
> struct dentry *ibm_cffps_dir;
> struct ibm_cffps *psu;
> + const void *md = of_device_get_match_data(&client->dev);
> +
> + if (md)
> + vs = (int)md;
> + else if (id)
> + vs = (int)id->driver_data;
> + else
> + vs = 1;
>
> client->dev.platform_data = &ibm_cffps_pdata;
> - rc = pmbus_do_probe(client, id, &ibm_cffps_info);
> + rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs - 1]);
> if (rc)
> return rc;
>
> @@ -364,6 +420,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
> if (!psu)
> return 0;
>
> + psu->version = vs;
> psu->client = client;
> mutex_init(&psu->input_history.update_lock);
> psu->input_history.last_update = jiffies - HZ;
> @@ -406,12 +463,20 @@ static int ibm_cffps_probe(struct i2c_client *client,
>
> static const struct i2c_device_id ibm_cffps_id[] = {
> { "ibm_cffps1", 1 },
> + { "ibm_cffps2", 2 },
> {}
> };
> MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
>
> static const struct of_device_id ibm_cffps_of_match[] = {
> - { .compatible = "ibm,cffps1" },
> + {
> + .compatible = "ibm,cffps1",
> + .data = (void *)1
> + },
> + {
> + .compatible = "ibm,cffps2",
> + .data = (void *)2
> + },
> {}
> };
> MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
> --
> 1.8.3.1
>
^ permalink raw reply
* [PATCH 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU
From: Eddie James @ 2019-08-30 16:09 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567181385-22129-1-git-send-email-eajames@linux.ibm.com>
Version 2 of the PSU supports a second page of data and changes the
format of the FW version. Use the devicetree binding to differentiate
between the version the driver should use.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/hwmon/pmbus/ibm-cffps.c | 109 ++++++++++++++++++++++++++++++++--------
1 file changed, 87 insertions(+), 22 deletions(-)
diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c
index ee2ee9e..ca26fbd 100644
--- a/drivers/hwmon/pmbus/ibm-cffps.c
+++ b/drivers/hwmon/pmbus/ibm-cffps.c
@@ -12,16 +12,20 @@
#include <linux/leds.h>
#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/of_device.h>
#include <linux/pmbus.h>
#include "pmbus.h"
+#define CFFPS_VERSIONS 2
+
#define CFFPS_FRU_CMD 0x9A
#define CFFPS_PN_CMD 0x9B
#define CFFPS_SN_CMD 0x9E
#define CFFPS_CCIN_CMD 0xBD
-#define CFFPS_FW_CMD_START 0xFA
-#define CFFPS_FW_NUM_BYTES 4
+#define CFFPS_FW_CMD 0xFA
+#define CFFPS1_FW_NUM_BYTES 4
+#define CFFPS2_FW_NUM_WORDS 3
#define CFFPS_SYS_CONFIG_CMD 0xDA
#define CFFPS_INPUT_HISTORY_CMD 0xD6
@@ -61,6 +65,7 @@ struct ibm_cffps_input_history {
};
struct ibm_cffps {
+ int version;
struct i2c_client *client;
struct ibm_cffps_input_history input_history;
@@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
struct ibm_cffps *psu = to_psu(idxp, idx);
char data[I2C_SMBUS_BLOCK_MAX] = { 0 };
+ pmbus_set_page(psu->client, 0);
+
switch (idx) {
case CFFPS_DEBUGFS_INPUT_HISTORY:
return ibm_cffps_read_input_history(psu, buf, count, ppos);
@@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf,
rc = snprintf(data, 5, "%04X", rc);
goto done;
case CFFPS_DEBUGFS_FW:
- for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) {
- rc = i2c_smbus_read_byte_data(psu->client,
- CFFPS_FW_CMD_START + i);
- if (rc < 0)
- return rc;
+ switch (psu->version) {
+ case 1:
+ for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) {
+ rc = i2c_smbus_read_byte_data(psu->client,
+ CFFPS_FW_CMD +
+ i);
+ if (rc < 0)
+ return rc;
+
+ snprintf(&data[i * 2], 3, "%02X", rc);
+ }
- snprintf(&data[i * 2], 3, "%02X", rc);
- }
+ rc = i * 2;
+ break;
+ case 2:
+ for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) {
+ rc = i2c_smbus_read_word_data(psu->client,
+ CFFPS_FW_CMD +
+ i);
+ if (rc < 0)
+ return rc;
+
+ snprintf(&data[i * 4], 5, "%04X", rc);
+ }
- rc = i * 2;
+ rc = i * 4;
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
goto done;
default:
return -EINVAL;
@@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,
psu->led_state = CFFPS_LED_ON;
}
+ pmbus_set_page(psu->client, 0);
+
rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
psu->led_state);
if (rc < 0)
@@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,
if (led_cdev->brightness == LED_OFF)
return 0;
+ pmbus_set_page(psu->client, 0);
+
rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD,
CFFPS_LED_BLINK);
if (rc < 0)
@@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
dev_warn(dev, "failed to register led class: %d\n", rc);
}
-static struct pmbus_driver_info ibm_cffps_info = {
- .pages = 1,
- .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
- PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
- PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | PMBUS_HAVE_STATUS_VOUT |
- PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT |
- PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_FAN12,
- .read_byte_data = ibm_cffps_read_byte_data,
- .read_word_data = ibm_cffps_read_word_data,
+static struct pmbus_driver_info ibm_cffps_info[CFFPS_VERSIONS] = {
+ [0] = {
+ .pages = 1,
+ .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
+ PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
+ PMBUS_HAVE_STATUS_FAN12,
+ .read_byte_data = ibm_cffps_read_byte_data,
+ .read_word_data = ibm_cffps_read_word_data,
+ },
+ [1] = {
+ .pages = 2,
+ .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_PIN | PMBUS_HAVE_FAN12 | PMBUS_HAVE_TEMP |
+ PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP |
+ PMBUS_HAVE_STATUS_FAN12,
+ .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT |
+ PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 |
+ PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT,
+ .read_byte_data = ibm_cffps_read_byte_data,
+ .read_word_data = ibm_cffps_read_word_data,
+ },
};
static struct pmbus_platform_data ibm_cffps_pdata = {
@@ -346,13 +394,21 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu)
static int ibm_cffps_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
- int i, rc;
+ int i, rc, vs;
struct dentry *debugfs;
struct dentry *ibm_cffps_dir;
struct ibm_cffps *psu;
+ const void *md = of_device_get_match_data(&client->dev);
+
+ if (md)
+ vs = (int)md;
+ else if (id)
+ vs = (int)id->driver_data;
+ else
+ vs = 1;
client->dev.platform_data = &ibm_cffps_pdata;
- rc = pmbus_do_probe(client, id, &ibm_cffps_info);
+ rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs - 1]);
if (rc)
return rc;
@@ -364,6 +420,7 @@ static int ibm_cffps_probe(struct i2c_client *client,
if (!psu)
return 0;
+ psu->version = vs;
psu->client = client;
mutex_init(&psu->input_history.update_lock);
psu->input_history.last_update = jiffies - HZ;
@@ -406,12 +463,20 @@ static int ibm_cffps_probe(struct i2c_client *client,
static const struct i2c_device_id ibm_cffps_id[] = {
{ "ibm_cffps1", 1 },
+ { "ibm_cffps2", 2 },
{}
};
MODULE_DEVICE_TABLE(i2c, ibm_cffps_id);
static const struct of_device_id ibm_cffps_of_match[] = {
- { .compatible = "ibm,cffps1" },
+ {
+ .compatible = "ibm,cffps1",
+ .data = (void *)1
+ },
+ {
+ .compatible = "ibm,cffps2",
+ .data = (void *)2
+ },
{}
};
MODULE_DEVICE_TABLE(of, ibm_cffps_of_match);
--
1.8.3.1
^ permalink raw reply related
* [PATCH 2/3] ARM: dts: aspeed: swift: Change power supplies to version 2
From: Eddie James @ 2019-08-30 16:09 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567181385-22129-1-git-send-email-eajames@linux.ibm.com>
Swift power supplies are version 2 of the IBM CFFPS. Make it so in the
devicetree.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
index f14f745..815b865 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
@@ -494,7 +494,7 @@
};
power-supply at 68 {
- compatible = "ibm,cffps1";
+ compatible = "ibm,cffps2";
reg = <0x68>;
};
@@ -504,7 +504,7 @@
};
power-supply at 69 {
- compatible = "ibm,cffps1";
+ compatible = "ibm,cffps2";
reg = <0x69>;
};
--
1.8.3.1
^ permalink raw reply related
* [PATCH 1/3] dt-bindings: hwmon: Document ibm, cffps2 compatible string
From: Eddie James @ 2019-08-30 16:09 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <1567181385-22129-1-git-send-email-eajames@linux.ibm.com>
Document the compatible string for version 2 of the IBM CFFPS PSU.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
index f68a0a6..1036f65 100644
--- a/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
+++ b/Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
@@ -1,8 +1,10 @@
-Device-tree bindings for IBM Common Form Factor Power Supply Version 1
-----------------------------------------------------------------------
+Device-tree bindings for IBM Common Form Factor Power Supply Versions 1 and 2
+-----------------------------------------------------------------------------
Required properties:
- - compatible = "ibm,cffps1";
+ - compatible : Must be one of the following:
+ "ibm,cffps1"
+ "ibm,cffps2"
- reg = < I2C bus address >; : Address of the power supply on the
I2C bus.
--
1.8.3.1
^ permalink raw reply related
* [PATCH 0/3] pmbus: ibm-cffps: Add support for version 2 of PSU
From: Eddie James @ 2019-08-30 16:09 UTC (permalink / raw)
To: linux-aspeed
Version 2 of this PSU supports a second page of data and changes the
format of the FW version command. Use the devicetree binding (or the I2C
device ID) to determine which version the driver should use. Therefore add
the new compatible string to the devicetree documentation and change the
Swift system devicetree to use version 2.
Eddie James (3):
dt-bindings: hwmon: Document ibm,cffps2 compatible string
ARM: dts: aspeed: swift: Change power supplies to version 2
pmbus: ibm-cffps: Add support for version 2 of the PSU
.../devicetree/bindings/hwmon/ibm,cffps1.txt | 8 +-
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +-
drivers/hwmon/pmbus/ibm-cffps.c | 109 ++++++++++++++++-----
3 files changed, 94 insertions(+), 27 deletions(-)
--
1.8.3.1
^ permalink raw reply
* [PATCH 1/2] mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
From: Ulf Hansson @ 2019-08-30 8:29 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <6feca359-34ce-445e-87bf-62fa063d785f@www.fastmail.com>
On Fri, 30 Aug 2019 at 10:07, Andrew Jeffery <andrew@aj.id.au> wrote:
>
>
>
> On Fri, 30 Aug 2019, at 17:31, Ulf Hansson wrote:
> > On Fri, 30 Aug 2019 at 09:46, Andrew Jeffery <andrew@aj.id.au> wrote:
> > >
> > > The early-exit didn't seem to matter on the AST2500, but on the AST2600
> > > the SD clock genuinely may not be running on entry to
> > > aspeed_sdhci_set_clock(). Remove the early exit to ensure we always run
> > > sdhci_enable_clk().
> > >
> > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> > > ---
> > > drivers/mmc/host/sdhci-of-aspeed.c | 3 ---
> > > 1 file changed, 3 deletions(-)
> > >
> > > diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> > > index d5acb5afc50f..a9175ca85696 100644
> > > --- a/drivers/mmc/host/sdhci-of-aspeed.c
> > > +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> > > @@ -55,9 +55,6 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
> > > int div;
> > > u16 clk;
> > >
> > > - if (clock == host->clock)
> > > - return;
> > > -
> > > sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
> > >
> > > if (clock == 0)
> > > --
> > > 2.20.1
> > >
> >
> > Further down in aspeed_sdhci_set_clock() you should probably also
> > remove the assignment of host->clock = clock, as that is already
> > managed by sdhci_set_ios().
>
> Ah, I'll fix that in a v2 once I have your thoughts on patch 2/2.
I leave this one to Adrian to comment on, as he knows this better than me.
[...]
Kind regards
Uffe
^ permalink raw reply
* Re: [PATCH 1/2] mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
From: Andrew Jeffery @ 2019-08-30 8:07 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <CAPDyKFrKXfB1F2dh63KrkCiKGbmbBWaAM16vJqtQncnF4YctQw@mail.gmail.com>
On Fri, 30 Aug 2019, at 17:31, Ulf Hansson wrote:
> On Fri, 30 Aug 2019 at 09:46, Andrew Jeffery <andrew@aj.id.au> wrote:
> >
> > The early-exit didn't seem to matter on the AST2500, but on the AST2600
> > the SD clock genuinely may not be running on entry to
> > aspeed_sdhci_set_clock(). Remove the early exit to ensure we always run
> > sdhci_enable_clk().
> >
> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> > ---
> > drivers/mmc/host/sdhci-of-aspeed.c | 3 ---
> > 1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> > index d5acb5afc50f..a9175ca85696 100644
> > --- a/drivers/mmc/host/sdhci-of-aspeed.c
> > +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> > @@ -55,9 +55,6 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
> > int div;
> > u16 clk;
> >
> > - if (clock == host->clock)
> > - return;
> > -
> > sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
> >
> > if (clock == 0)
> > --
> > 2.20.1
> >
>
> Further down in aspeed_sdhci_set_clock() you should probably also
> remove the assignment of host->clock = clock, as that is already
> managed by sdhci_set_ios().
Ah, I'll fix that in a v2 once I have your thoughts on patch 2/2.
Thanks for the lightning quick feedback!
Andrew
^ permalink raw reply
* [PATCH 1/2] mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
From: Ulf Hansson @ 2019-08-30 8:01 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190830074644.10936-2-andrew@aj.id.au>
On Fri, 30 Aug 2019 at 09:46, Andrew Jeffery <andrew@aj.id.au> wrote:
>
> The early-exit didn't seem to matter on the AST2500, but on the AST2600
> the SD clock genuinely may not be running on entry to
> aspeed_sdhci_set_clock(). Remove the early exit to ensure we always run
> sdhci_enable_clk().
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/mmc/host/sdhci-of-aspeed.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> index d5acb5afc50f..a9175ca85696 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> @@ -55,9 +55,6 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
> int div;
> u16 clk;
>
> - if (clock == host->clock)
> - return;
> -
> sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
>
> if (clock == 0)
> --
> 2.20.1
>
Further down in aspeed_sdhci_set_clock() you should probably also
remove the assignment of host->clock = clock, as that is already
managed by sdhci_set_ios().
Kind regards
Uffe
^ permalink raw reply
* [PATCH 2/2] mmc: sdhci-of-aspeed: Allow max-frequency limitation of SDCLK
From: Andrew Jeffery @ 2019-08-30 7:46 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190830074644.10936-1-andrew@aj.id.au>
Add a get_max_clock() handler to sdhci-of-aspeed to report f_max as the
maximum clock rate if it is set. This enables artificial limitation of
the bus speed via max-frequency in the devicetree for e.g. the AST2600
evaluation board where I am seeing errors at 200MHz.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index a9175ca85696..5cc00abcd71f 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -52,16 +52,24 @@ static void aspeed_sdc_configure_8bit_mode(struct aspeed_sdc *sdc,
static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
{
+ struct sdhci_pltfm_host *pltfm_host;
+ unsigned long parent;
int div;
u16 clk;
+ pltfm_host = sdhci_priv(host);
+ parent = clk_get_rate(pltfm_host->clk);
+
sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
if (clock == 0)
goto out;
+ if (WARN_ON(clock > host->max_clk))
+ clock = host->max_clk;
+
for (div = 1; div < 256; div *= 2) {
- if ((host->max_clk / div) <= clock)
+ if ((parent / div) <= clock)
break;
}
div >>= 1;
@@ -74,6 +82,14 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
host->clock = clock;
}
+static unsigned int aspeed_sdhci_get_max_clock(struct sdhci_host *host)
+{
+ if (host->mmc->f_max)
+ return host->mmc->f_max;
+
+ return sdhci_pltfm_clk_get_max_clock(host);
+}
+
static void aspeed_sdhci_set_bus_width(struct sdhci_host *host, int width)
{
struct sdhci_pltfm_host *pltfm_priv;
@@ -100,7 +116,7 @@ static void aspeed_sdhci_set_bus_width(struct sdhci_host *host, int width)
static const struct sdhci_ops aspeed_sdhci_ops = {
.set_clock = aspeed_sdhci_set_clock,
- .get_max_clock = sdhci_pltfm_clk_get_max_clock,
+ .get_max_clock = aspeed_sdhci_get_max_clock,
.set_bus_width = aspeed_sdhci_set_bus_width,
.get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
.reset = sdhci_reset,
--
2.20.1
^ permalink raw reply related
* [PATCH 1/2] mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
From: Andrew Jeffery @ 2019-08-30 7:46 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190830074644.10936-1-andrew@aj.id.au>
The early-exit didn't seem to matter on the AST2500, but on the AST2600
the SD clock genuinely may not be running on entry to
aspeed_sdhci_set_clock(). Remove the early exit to ensure we always run
sdhci_enable_clk().
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index d5acb5afc50f..a9175ca85696 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -55,9 +55,6 @@ static void aspeed_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
int div;
u16 clk;
- if (clock == host->clock)
- return;
-
sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
if (clock == 0)
--
2.20.1
^ permalink raw reply related
* [PATCH 0/2] mmc: sdhci-of-aspeed: Fixes for AST2600 eMMC support
From: Andrew Jeffery @ 2019-08-30 7:46 UTC (permalink / raw)
To: linux-aspeed
Hello,
The ASPEED SDHCI driver patches sent previously were based on testing on the
AST2500. The SD controllers in the 2500 and 2600 had the same register layout
according to the documentation, so we added the necessary devicetree compatible
string at the same time.
Now that I've got access to 2600 hardware with an eMMC chip I have a couple of
patches that are fixes enabling support for it. I don't think the first patch
is too controversial - in some cases we weren't ensuring the clock was enabled
before returning from the set_clock() callback.
I'm a bit unsure about the second patch though which enables use of
max-frequency in the devicetree, it feels a bit hacky so I'm looking for any
suggestions on the approach.
Please review!
Andrew
Andrew Jeffery (2):
mmc: sdhci-of-aspeed: Uphold clocks-on post-condition of set_clock()
mmc: sdhci-of-aspeed: Allow max-frequency limitation of SDCLK
drivers/mmc/host/sdhci-of-aspeed.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
--
2.20.1
^ permalink raw reply
* [PATCH v2 4/4] dt-bindings/watchdog: Add access_cs0 option for alt-boot
From: Rob Herring @ 2019-08-29 22:56 UTC (permalink / raw)
To: linux-aspeed
In-Reply-To: <20190826104636.19324-5-i.mikhaylov@yadro.com>
On Mon, Aug 26, 2019 at 01:46:36PM +0300, Ivan Mikhaylov wrote:
> The option for the ast2400/2500 to get access to CS0 at runtime.
>
> Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com>
> ---
> Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> index c5077a1f5cb3..023a9b578df6 100644
> --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt
> @@ -34,6 +34,13 @@ Optional properties:
> engine is responsible for this.
>
> - aspeed,alt-boot: If property is present then boot from alternate block.
> + At alternate side 'access_cs0' sysfs file provides:
What's sysfs?
Don't put Linux stuff in bindings.
> + ast2400: a way to get access to the primary SPI flash
> + chip at CS0 after booting from the alternate
> + chip at CS1.
> + ast2500: a way to restore the normal address mapping from
> + (CS0->CS1, CS1->CS0) to (CS0->CS0, CS1->CS1).
> +
> - aspeed,external-signal: If property is present then signal is sent to
> external reset counter (only WDT1 and WDT2). If not
> specified no external signal is sent.
> --
> 2.20.1
>
^ permalink raw reply
* [PATCH pinctrl/fixes] pinctrl: aspeed: Fix spurious mux failures on the AST2500
From: Andrew Jeffery @ 2019-08-29 7:17 UTC (permalink / raw)
To: linux-aspeed
Commit 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps")
was determined to be a partial fix to the problem of acquiring the LPC
Host Controller and GFX regmaps: The AST2500 pin controller may need to
fetch syscon regmaps during expression evaluation as well as when
setting mux state. For example, this case is hit by attempting to export
pins exposing the LPC Host Controller as GPIOs.
An optional eval() hook is added to the Aspeed pinmux operation struct
and called from aspeed_sig_expr_eval() if the pointer is set by the
SoC-specific driver. This enables the AST2500 to perform the custom
action of acquiring its regmap dependencies as required.
John Wang tested the fix on an Inspur FP5280G2 machine (AST2500-based)
where the issue was found, and I've booted the fix on Witherspoon
(AST2500) and Palmetto (AST2400) machines, and poked at relevant pins
under QEMU by forcing mux configurations via devmem before exporting
GPIOs to exercise the driver.
Fixes: 7d29ed88acbb ("pinctrl: aspeed: Read and write bits in LPC and GFX controllers")
Fixes: 674fa8daa8c9 ("pinctrl: aspeed-g5: Delay acquisition of regmaps")
Reported-by: John Wang <wangzqbj@inspur.com>
Tested-by: John Wang <wangzqbj@inspur.com>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
Hi Linus,
The timing of merging the AST2600 (g6) driver and 674fa8daa8c9 ("pinctrl:
aspeed-g5: Delay acquisition of regmaps") caused a bit of a rough spot a
few weeks back. This fix doesn't cause any such disruption - I've
developed it on top of pinctrl/fixes and back-merged the result into
pinctrl/devel to test for build breakage (via CONFIG_COMPILE_TEST to
enable all of the g4, g5 and g6 drivers). All three ASPEED pinctrl
drivers built successfully, so it should be enough to simply take this
patch through pinctrl/fixes and leave pinctrl/devel as is for the 5.4
merge window.
---
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 30 +++++++++++++++++++++-
drivers/pinctrl/aspeed/pinmux-aspeed.c | 7 +++--
drivers/pinctrl/aspeed/pinmux-aspeed.h | 7 ++---
3 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
index ba6438ac4d72..ff84d1afd229 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c
@@ -2552,7 +2552,7 @@ static struct regmap *aspeed_g5_acquire_regmap(struct aspeed_pinmux_data *ctx,
if (IS_ERR(map))
return map;
} else
- map = ERR_PTR(-ENODEV);
+ return ERR_PTR(-ENODEV);
ctx->maps[ASPEED_IP_LPC] = map;
dev_dbg(ctx->dev, "Acquired LPC regmap");
@@ -2562,6 +2562,33 @@ static struct regmap *aspeed_g5_acquire_regmap(struct aspeed_pinmux_data *ctx,
return ERR_PTR(-EINVAL);
}
+static int aspeed_g5_sig_expr_eval(struct aspeed_pinmux_data *ctx,
+ const struct aspeed_sig_expr *expr,
+ bool enabled)
+{
+ int ret;
+ int i;
+
+ for (i = 0; i < expr->ndescs; i++) {
+ const struct aspeed_sig_desc *desc = &expr->descs[i];
+ struct regmap *map;
+
+ map = aspeed_g5_acquire_regmap(ctx, desc->ip);
+ if (IS_ERR(map)) {
+ dev_err(ctx->dev,
+ "Failed to acquire regmap for IP block %d\n",
+ desc->ip);
+ return PTR_ERR(map);
+ }
+
+ ret = aspeed_sig_desc_eval(desc, enabled, ctx->maps[desc->ip]);
+ if (ret <= 0)
+ return ret;
+ }
+
+ return 1;
+}
+
/**
* Configure a pin's signal by applying an expression's descriptor state for
* all descriptors in the expression.
@@ -2647,6 +2674,7 @@ static int aspeed_g5_sig_expr_set(struct aspeed_pinmux_data *ctx,
}
static const struct aspeed_pinmux_ops aspeed_g5_ops = {
+ .eval = aspeed_g5_sig_expr_eval,
.set = aspeed_g5_sig_expr_set,
};
diff --git a/drivers/pinctrl/aspeed/pinmux-aspeed.c b/drivers/pinctrl/aspeed/pinmux-aspeed.c
index 839c01b7953f..57305ca838a7 100644
--- a/drivers/pinctrl/aspeed/pinmux-aspeed.c
+++ b/drivers/pinctrl/aspeed/pinmux-aspeed.c
@@ -78,11 +78,14 @@ int aspeed_sig_desc_eval(const struct aspeed_sig_desc *desc,
* neither the enabled nor disabled state. Thus we must explicitly test for
* either condition as required.
*/
-int aspeed_sig_expr_eval(const struct aspeed_pinmux_data *ctx,
+int aspeed_sig_expr_eval(struct aspeed_pinmux_data *ctx,
const struct aspeed_sig_expr *expr, bool enabled)
{
+ int ret;
int i;
- int ret;
+
+ if (ctx->ops->eval)
+ return ctx->ops->eval(ctx, expr, enabled);
for (i = 0; i < expr->ndescs; i++) {
const struct aspeed_sig_desc *desc = &expr->descs[i];
diff --git a/drivers/pinctrl/aspeed/pinmux-aspeed.h b/drivers/pinctrl/aspeed/pinmux-aspeed.h
index 52d299b59ce2..db3457c86f48 100644
--- a/drivers/pinctrl/aspeed/pinmux-aspeed.h
+++ b/drivers/pinctrl/aspeed/pinmux-aspeed.h
@@ -702,6 +702,8 @@ struct aspeed_pin_function {
struct aspeed_pinmux_data;
struct aspeed_pinmux_ops {
+ int (*eval)(struct aspeed_pinmux_data *ctx,
+ const struct aspeed_sig_expr *expr, bool enabled);
int (*set)(struct aspeed_pinmux_data *ctx,
const struct aspeed_sig_expr *expr, bool enabled);
};
@@ -722,9 +724,8 @@ struct aspeed_pinmux_data {
int aspeed_sig_desc_eval(const struct aspeed_sig_desc *desc, bool enabled,
struct regmap *map);
-int aspeed_sig_expr_eval(const struct aspeed_pinmux_data *ctx,
- const struct aspeed_sig_expr *expr,
- bool enabled);
+int aspeed_sig_expr_eval(struct aspeed_pinmux_data *ctx,
+ const struct aspeed_sig_expr *expr, bool enabled);
static inline int aspeed_sig_expr_set(struct aspeed_pinmux_data *ctx,
const struct aspeed_sig_expr *expr,
--
2.20.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox