lkml.org 
[lkml]   [2017]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/11] platform/x86: intel_cht_int33fe: Add mux mappings for the Type-C port
    Date
    We need to add mappings for the mux subsys to be able to find the
    muxes for the fusb302 driver to be able to control the PI3USB30532
    Type-C mux and the device/host mux integrated in the CHT SoC.

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    ---
    drivers/platform/x86/Kconfig | 1 +
    drivers/platform/x86/intel_cht_int33fe.c | 23 +++++++++++++++++++++++
    2 files changed, 24 insertions(+)

    diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
    index c5554577681a..4256e05ee584 100644
    --- a/drivers/platform/x86/Kconfig
    +++ b/drivers/platform/x86/Kconfig
    @@ -794,6 +794,7 @@ config ACPI_CMPC
    config INTEL_CHT_INT33FE
    tristate "Intel Cherry Trail ACPI INT33FE Driver"
    depends on X86 && ACPI && I2C && REGULATOR
    + select MULTIPLEXER
    ---help---
    This driver add support for the INT33FE ACPI device found on
    some Intel Cherry Trail devices.
    diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
    index 24a1662be81d..611b8af9cefd 100644
    --- a/drivers/platform/x86/intel_cht_int33fe.c
    +++ b/drivers/platform/x86/intel_cht_int33fe.c
    @@ -24,6 +24,7 @@
    #include <linux/i2c.h>
    #include <linux/interrupt.h>
    #include <linux/module.h>
    +#include <linux/mux/consumer.h>
    #include <linux/regulator/consumer.h>
    #include <linux/slab.h>

    @@ -35,6 +36,19 @@ struct cht_int33fe_data {
    struct i2c_client *pi3usb30532;
    };

    +static struct mux_lookup cht_int33fe_mux_lookup[] = {
    + {
    + .provider = "i2c-pi3usb30532",
    + .dev_id = "i2c-fusb302",
    + .mux_name = "type-c-mode-mux",
    + },
    + {
    + .provider = "intel_cht_usb_mux",
    + .dev_id = "i2c-fusb302",
    + .mux_name = "usb-role-mux",
    + },
    +};
    +
    /*
    * Grrr I severly dislike buggy BIOS-es. At least one BIOS enumerates
    * the max17047 both through the INT33FE ACPI device (it is right there
    @@ -170,6 +184,9 @@ static int cht_int33fe_probe(struct i2c_client *client)
    board_info.properties = fusb302_props;
    board_info.irq = fusb302_irq;

    + mux_add_table(cht_int33fe_mux_lookup,
    + ARRAY_SIZE(cht_int33fe_mux_lookup));
    +
    data->fusb302 = i2c_acpi_new_device(dev, 2, &board_info);
    if (!data->fusb302)
    goto out_unregister_max17047;
    @@ -193,6 +210,9 @@ static int cht_int33fe_probe(struct i2c_client *client)
    if (data->max17047)
    i2c_unregister_device(data->max17047);

    + mux_remove_table(cht_int33fe_mux_lookup,
    + ARRAY_SIZE(cht_int33fe_mux_lookup));
    +
    return -EPROBE_DEFER; /* Wait for the i2c-adapter to load */
    }

    @@ -205,6 +225,9 @@ static int cht_int33fe_remove(struct i2c_client *i2c)
    if (data->max17047)
    i2c_unregister_device(data->max17047);

    + mux_remove_table(cht_int33fe_mux_lookup,
    + ARRAY_SIZE(cht_int33fe_mux_lookup));
    +
    return 0;
    }

    --
    2.13.5
    \
     
     \ /
      Last update: 2017-09-01 23:50    [W:9.395 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site