Hi,
On 8/19/21 5:29 AM, Kate Hsuan wrote:
> Move intel_atomisp2_led to intel sub-directory to improve
> readability.
>
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> ---
> drivers/platform/x86/Kconfig | 34 -----------------
> drivers/platform/x86/Makefile | 4 +-
> drivers/platform/x86/intel/Kconfig | 1 +
> drivers/platform/x86/intel/Makefile | 2 +
> drivers/platform/x86/intel/atomisp2/Kconfig | 38 +++++++++++++++++++
> drivers/platform/x86/intel/atomisp2/Makefile | 9 +++++
> .../atomisp2/led.c} | 0
> .../atomisp2/pm.c} | 0
> 8 files changed, 52 insertions(+), 36 deletions(-)
> create mode 100644 drivers/platform/x86/intel/atomisp2/Kconfig
> create mode 100644 drivers/platform/x86/intel/atomisp2/Makefile
> rename drivers/platform/x86/{intel_atomisp2_led.c => intel/atomisp2/led.c} (100%)
> rename drivers/platform/x86/{intel_atomisp2_pm.c => intel/atomisp2/pm.c} (100%)
>
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 163dc73f3f95..196e70a8b264 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -667,40 +667,6 @@ config THINKPAD_LMI
>
> source "drivers/platform/x86/intel/Kconfig"
>
> -config INTEL_ATOMISP2_LED
> - tristate "Intel AtomISP2 camera LED driver"
> - depends on GPIOLIB && LEDS_GPIO
> - help
> - Many Bay Trail and Cherry Trail devices come with a camera attached
> - to Intel's Image Signal Processor. Linux currently does not have a
> - driver for these, so they do not work as a camera. Some of these
> - camera's have a LED which is controlled through a GPIO.
> -
> - Some of these devices have a firmware issue where the LED gets turned
> - on at boot. This driver will turn the LED off at boot and also allows
> - controlling the LED (repurposing it) through the sysfs LED interface.
> -
> - Which GPIO is attached to the LED is usually not described in the
> - ACPI tables, so this driver contains per-system info about the GPIO
> - inside the driver, this means that this driver only works on systems
> - the driver knows about.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called intel_atomisp2_led.
> -
> -config INTEL_ATOMISP2_PM
> - tristate "Intel AtomISP2 dummy / power-management driver"
> - depends on PCI && IOSF_MBI && PM
> - depends on !INTEL_ATOMISP
> - help
> - Power-management driver for Intel's Image Signal Processor found on
> - Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
> - is to turn the ISP off (put it in D3) to save power and to allow
> - entering of S0ix modes.
> -
> - To compile this driver as a module, choose M here: the module
> - will be called intel_atomisp2_pm.
> -
> config INTEL_HID_EVENT
> tristate "INTEL HID Event"
> depends on ACPI
> diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
> index 3d25ba595d4f..2a48171c11c1 100644
> --- a/drivers/platform/x86/Makefile
> +++ b/drivers/platform/x86/Makefile
> @@ -61,6 +61,8 @@ obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
> # Hewlett Packard Enterprise
> obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o
>
> +
> +
> # IBM Thinkpad and Lenovo
> obj-$(CONFIG_IBM_RTL) += ibm_rtl.o
> obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
> @@ -71,8 +73,6 @@ obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
> # Intel
> obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
>
> -obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
> -obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
> obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
> obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
> obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
> diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
> index f4f21c2f9230..01db66ec1462 100644
> --- a/drivers/platform/x86/intel/Kconfig
> +++ b/drivers/platform/x86/intel/Kconfig
> @@ -19,6 +19,7 @@ if X86_PLATFORM_DRIVERS_INTEL
> source "drivers/platform/x86/intel/int33fe/Kconfig"
> source "drivers/platform/x86/intel/int3472/Kconfig"
> source "drivers/platform/x86/intel/pmt/Kconfig"
> +source "drivers/platform/x86/intel/atomisp2/Kconfig"
>
> config INTEL_BXTWC_PMIC_TMU
> tristate "Intel BXT Whiskey Cove TMU Driver"
> diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
> index 317e8f8d144a..05a012118ea1 100644
> --- a/drivers/platform/x86/intel/Makefile
> +++ b/drivers/platform/x86/intel/Makefile
> @@ -7,6 +7,8 @@
> obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
> obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
> obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/
> +obj-$(CONFIG_INTEL_ATOMISP2_LED) += atomisp2/
> +obj-$(CONFIG_INTEL_ATOMISP2_PM) += atomisp2/
Here is the issue of entering into the subdir twice if both
options are enabled again (and also the indent is wrong
and seems to be using spaces).
I've fixed this by adding making some changes to:
drivers/platform/x86/intel/atomisp2/Kconfig
I added:
config INTEL_ATOMISP2_PDX86
bool
Which is basically a hidden (not user selectable) bool option,
defaulting to N (which is the default default)
And then I added:
select INTEL_ATOMISP2_PDX86
The the config bits for both CONFIG_INTEL_ATOMISP2_LED and CONFIG_INTEL_ATOMISP2_PM
and then used the new CONFIG_INTEL_ATOMISP2_PDX86 in the Makefile to dive into
the subdir.
I have made these changes while merging the series there is no need for
a new version.
Regards,
Hans
>
> # Intel PMIC / PMC / P-Unit devices
> intel_bxtwc_tmu-y := bxtwc_tmu.o
> diff --git a/drivers/platform/x86/intel/atomisp2/Kconfig b/drivers/platform/x86/intel/atomisp2/Kconfig
> new file mode 100644
> index 000000000000..e5851d8c33eb
> --- /dev/null
> +++ b/drivers/platform/x86/intel/atomisp2/Kconfig
> @@ -0,0 +1,38 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +config INTEL_ATOMISP2_LED
> + tristate "Intel AtomISP2 camera LED driver"
> + depends on GPIOLIB && LEDS_GPIO
> + help
> + Many Bay Trail and Cherry Trail devices come with a camera attached
> + to Intel's Image Signal Processor. Linux currently does not have a
> + driver for these, so they do not work as a camera. Some of these
> + camera's have a LED which is controlled through a GPIO.
> +
> + Some of these devices have a firmware issue where the LED gets turned
> + on at boot. This driver will turn the LED off at boot and also allows
> + controlling the LED (repurposing it) through the sysfs LED interface.
> +
> + Which GPIO is attached to the LED is usually not described in the
> + ACPI tables, so this driver contains per-system info about the GPIO
> + inside the driver, this means that this driver only works on systems
> + the driver knows about.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called intel_atomisp2_led.
> +
> +config INTEL_ATOMISP2_PM
> + tristate "Intel AtomISP2 dummy / power-management driver"
> + depends on PCI && IOSF_MBI && PM
> + depends on !INTEL_ATOMISP
> + help
> + Power-management driver for Intel's Image Signal Processor found on
> + Bay Trail and Cherry Trail devices. This dummy driver's sole purpose
> + is to turn the ISP off (put it in D3) to save power and to allow
> + entering of S0ix modes.
> +
> + To compile this driver as a module, choose M here: the module
> + will be called intel_atomisp2_pm.
> diff --git a/drivers/platform/x86/intel/atomisp2/Makefile b/drivers/platform/x86/intel/atomisp2/Makefile
> new file mode 100644
> index 000000000000..96b1e877d1f1
> --- /dev/null
> +++ b/drivers/platform/x86/intel/atomisp2/Makefile
> @@ -0,0 +1,9 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# Intel x86 Platform Specific Drivers
> +#
> +
> +intel_atomisp2_led-y := led.o
> +obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
> +intel_atomisp2_pm-y += pm.o
> +obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
> diff --git a/drivers/platform/x86/intel_atomisp2_led.c b/drivers/platform/x86/intel/atomisp2/led.c
> similarity index 100%
> rename from drivers/platform/x86/intel_atomisp2_led.c
> rename to drivers/platform/x86/intel/atomisp2/led.c
> diff --git a/drivers/platform/x86/intel_atomisp2_pm.c b/drivers/platform/x86/intel/atomisp2/pm.c
> similarity index 100%
> rename from drivers/platform/x86/intel_atomisp2_pm.c
> rename to drivers/platform/x86/intel/atomisp2/pm.c
>
