lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 18/20] platform/x86: intel-vbtn: Move to intel sub-directory
    Date
    Move intel-vbtn to intel sub-directory to improve
    readability.

    Signed-off-by: Kate Hsuan <hpa@redhat.com>
    ---
    drivers/platform/x86/Kconfig | 13 -------------
    drivers/platform/x86/Makefile | 2 --
    drivers/platform/x86/intel/Kconfig | 13 +++++++++++++
    drivers/platform/x86/intel/Makefile | 3 +++
    drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} | 0
    5 files changed, 16 insertions(+), 15 deletions(-)
    rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (100%)

    diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
    index 3d1cb7f03309..3a087cb140cb 100644
    --- a/drivers/platform/x86/Kconfig
    +++ b/drivers/platform/x86/Kconfig
    @@ -677,19 +677,6 @@ config INTEL_MENLOW

    If unsure, say N.

    -config INTEL_VBTN
    - tristate "INTEL VIRTUAL BUTTON"
    - depends on ACPI
    - depends on INPUT
    - depends on I2C
    - select INPUT_SPARSEKMAP
    - help
    - This driver provides support for the Intel Virtual Button interface.
    - Some laptops require this driver for power button support.
    -
    - To compile this driver as a module, choose M here: the module will
    - be called intel_vbtn.
    -
    config MSI_LAPTOP
    tristate "MSI Laptop Extras"
    depends on ACPI
    diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
    index 63e78ed69fb2..a6d90dc56d62 100644
    --- a/drivers/platform/x86/Makefile
    +++ b/drivers/platform/x86/Makefile
    @@ -70,9 +70,7 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o

    # Intel
    obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
    -
    obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
    -obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

    # MSI
    obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
    diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
    index 6df6e43d1061..f69fc6b004cf 100644
    --- a/drivers/platform/x86/intel/Kconfig
    +++ b/drivers/platform/x86/intel/Kconfig
    @@ -53,6 +53,19 @@ config INTEL_INT0002_VGPIO
    To compile this driver as a module, choose M here: the module will
    be called intel_int0002_vgpio.

    +config INTEL_VBTN
    + tristate "INTEL VIRTUAL BUTTON"
    + depends on ACPI
    + depends on INPUT
    + depends on I2C
    + select INPUT_SPARSEKMAP
    + help
    + This driver provides support for the Intel Virtual Button interface.
    + Some laptops require this driver for power button support.
    +
    + To compile this driver as a module, choose M here: the module will
    + be called intel_vbtn.
    +
    config INTEL_OAKTRAIL
    tristate "Intel Oaktrail Platform Extras"
    depends on ACPI
    diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
    index 291219f63b04..58d4ff0502b0 100644
    --- a/drivers/platform/x86/intel/Makefile
    +++ b/drivers/platform/x86/intel/Makefile
    @@ -16,6 +16,9 @@ intel_int0002_vgpio-y := int0002_vgpio.o
    obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
    intel_oaktrail-y := oaktrail.o
    obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
    +CFLAGS_vbtn.o := -I./drivers/platform/x86
    +intel-vbtn-y := vbtn.o
    +obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o

    # Intel PMIC / PMC / P-Unit devices
    intel_bxtwc_tmu-y := bxtwc_tmu.o
    diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn.c
    similarity index 100%
    rename from drivers/platform/x86/intel-vbtn.c
    rename to drivers/platform/x86/intel/vbtn.c
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-08-16 12:55    [W:3.788 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site