Hi,
The cros-ec transport drivers are placed in two subsystems, in MFD and
in platform/chrome. As far as I know there is no reason for this, so,
move the I2C and the SPI cros-ec transport driver from the MFD subsystem
to the platform/chrome. The series also removes the MFD_ prefix for the
Kconfig symbols, modifies the defconfigs that used these symbols and
fixes the KEYBOARD_CROS_EC Kconfig help.
Best regards,
Enric
Enric Balletbo i Serra (3):
platform/chrome: Move cros-ec transport drivers to drivers/platform.
arm/arm64: configs: Remove the MFD_ prefix for MFD_CROS_EC_I2C/SPI
symbols.
Input: keyboard: Fix ChromeOS EC keyboard help message.
arch/arm/configs/exynos_defconfig | 4 ++--
arch/arm/configs/multi_v7_defconfig | 4 ++--
arch/arm/configs/pxa_defconfig | 4 ++--
arch/arm64/configs/defconfig | 4 ++--
drivers/input/keyboard/Kconfig | 2 +-
drivers/mfd/Kconfig | 20 -------------------
drivers/mfd/Makefile | 2 --
drivers/platform/chrome/Kconfig | 20 +++++++++++++++++++
drivers/platform/chrome/Makefile | 2 ++
.../{mfd => platform/chrome}/cros_ec_i2c.c | 0
.../{mfd => platform/chrome}/cros_ec_spi.c | 0
11 files changed, 31 insertions(+), 31 deletions(-)
rename drivers/{mfd => platform/chrome}/cros_ec_i2c.c (100%)
rename drivers/{mfd => platform/chrome}/cros_ec_spi.c (100%)
--
2.18.0
The cros-ec I2C and SPI transport drivers have been moved from MFD
subsystem to platform/chrome, at the same time, the config symbol has
been renamed and lost the MFD_ prefix, so update all configs to the new
config symbol name.
Signed-off-by: Enric Balletbo i Serra <[email protected]>
---
arch/arm/configs/exynos_defconfig | 4 ++--
arch/arm/configs/multi_v7_defconfig | 4 ++--
arch/arm/configs/pxa_defconfig | 4 ++--
arch/arm64/configs/defconfig | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 85b2369d6b20..27ea6dfcf2f2 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -155,8 +155,8 @@ CONFIG_THERMAL_EMULATION=y
CONFIG_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=y
-CONFIG_MFD_CROS_EC_SPI=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_SPI=y
CONFIG_MFD_MAX14577=y
CONFIG_MFD_MAX77686=y
CONFIG_MFD_MAX77693=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 8f6be1982545..be732f382418 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -490,8 +490,8 @@ CONFIG_MFD_AC100=y
CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
CONFIG_MFD_DA9063=m
CONFIG_MFD_MAX14577=y
CONFIG_MFD_MAX77686=y
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index 5655a1cee87d..6bb506edb1f5 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -398,8 +398,8 @@ CONFIG_MFD_AS3711=y
CONFIG_MFD_BCM590XX=m
CONFIG_MFD_AXP20X=y
CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
CONFIG_MFD_ASIC3=y
CONFIG_PMIC_DA903X=y
CONFIG_HTC_EGPIO=y
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f9a186f6af8a..3ec0feccdd62 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -372,8 +372,8 @@ CONFIG_UNIPHIER_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=y
-CONFIG_MFD_CROS_EC_SPI=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_SPI=y
CONFIG_MFD_CROS_EC_CHARDEV=m
CONFIG_MFD_EXYNOS_LPASS=m
CONFIG_MFD_HI6421_PMIC=y
--
2.18.0
The cros-ec I2C and SPI transport drivers have been moved from MFD
subsystem to platform/chrome, at the same time, the config symbol
has been renamed and lost the MFD_ prefix So, update the help message
accordingly.
Signed-off-by: Enric Balletbo i Serra <[email protected]>
---
drivers/input/keyboard/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 6bd97ffee761..4713957b0cbb 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -721,7 +721,7 @@ config KEYBOARD_CROS_EC
help
Say Y here to enable the matrix keyboard used by ChromeOS devices
and implemented on the ChromeOS EC. You must enable one bus option
- (MFD_CROS_EC_I2C or MFD_CROS_EC_SPI) to use this.
+ (CROS_EC_I2C or CROS_EC_SPI) to use this.
To compile this driver as a module, choose M here: the
module will be called cros_ec_keyb.
--
2.18.0
There are some cros-ec transport drivers (I2C, SPI) living in MFD, while
others (LPC) living in drivers/platform. The transport drivers are more
platform specific. So, move the I2C and SPI transport drivers to the
platform/chrome directory. The patch also removes the MFD_ prefix of
their Kconfig symbols.
Signed-off-by: Enric Balletbo i Serra <[email protected]>
---
drivers/mfd/Kconfig | 20 -------------------
drivers/mfd/Makefile | 2 --
drivers/platform/chrome/Kconfig | 20 +++++++++++++++++++
drivers/platform/chrome/Makefile | 2 ++
.../{mfd => platform/chrome}/cros_ec_i2c.c | 0
.../{mfd => platform/chrome}/cros_ec_spi.c | 0
6 files changed, 22 insertions(+), 22 deletions(-)
rename drivers/{mfd => platform/chrome}/cros_ec_i2c.c (100%)
rename drivers/{mfd => platform/chrome}/cros_ec_spi.c (100%)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b860eb5aa194..013458e728dc 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -202,26 +202,6 @@ config MFD_CROS_EC
You also need to enable the driver for the bus you are using. The
protocol for talking to the EC is defined by the bus driver.
-config MFD_CROS_EC_I2C
- tristate "ChromeOS Embedded Controller (I2C)"
- depends on MFD_CROS_EC && I2C
-
- help
- If you say Y here, you get support for talking to the ChromeOS
- EC through an I2C bus. This uses a simple byte-level protocol with
- a checksum. Failing accesses will be retried three times to
- improve reliability.
-
-config MFD_CROS_EC_SPI
- tristate "ChromeOS Embedded Controller (SPI)"
- depends on MFD_CROS_EC && SPI
-
- ---help---
- If you say Y here, you get support for talking to the ChromeOS EC
- through a SPI bus, using a byte-level protocol. Since the EC's
- response time cannot be guaranteed, we support ignoring
- 'pre-amble' bytes before the response actually starts.
-
config MFD_CROS_EC_CHARDEV
tristate "Chrome OS Embedded Controller userspace device interface"
depends on MFD_CROS_EC
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index e9fd20dba18d..d13e859d7c1e 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -14,8 +14,6 @@ obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
cros_ec_core-objs := cros_ec.o
obj-$(CONFIG_MFD_CROS_EC) += cros_ec_core.o
-obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o
-obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o
obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index cb0df9eb3e0f..16b1615958aa 100644
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -52,6 +52,26 @@ config CHROMEOS_TBMC
config CROS_EC_CTL
tristate
+config CROS_EC_I2C
+ tristate "ChromeOS Embedded Controller (I2C)"
+ depends on MFD_CROS_EC && I2C
+
+ help
+ If you say Y here, you get support for talking to the ChromeOS
+ EC through an I2C bus. This uses a simple byte-level protocol with
+ a checksum. Failing accesses will be retried three times to
+ improve reliability.
+
+config CROS_EC_SPI
+ tristate "ChromeOS Embedded Controller (SPI)"
+ depends on MFD_CROS_EC && SPI
+
+ ---help---
+ If you say Y here, you get support for talking to the ChromeOS EC
+ through a SPI bus, using a byte-level protocol. Since the EC's
+ response time cannot be guaranteed, we support ignoring
+ 'pre-amble' bytes before the response actually starts.
+
config CROS_EC_LPC
tristate "ChromeOS Embedded Controller (LPC)"
depends on MFD_CROS_EC && ACPI && (X86 || COMPILE_TEST)
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
index e44c37a63fa9..cd591bf872bb 100644
--- a/drivers/platform/chrome/Makefile
+++ b/drivers/platform/chrome/Makefile
@@ -6,6 +6,8 @@ obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o
cros_ec_ctl-objs := cros_ec_sysfs.o cros_ec_lightbar.o \
cros_ec_vbc.o cros_ec_debugfs.o
obj-$(CONFIG_CROS_EC_CTL) += cros_ec_ctl.o
+obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o
+obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o
cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_reg.o
cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC) += cros_ec_lpc_mec.o
obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o
diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c
similarity index 100%
rename from drivers/mfd/cros_ec_i2c.c
rename to drivers/platform/chrome/cros_ec_i2c.c
diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
similarity index 100%
rename from drivers/mfd/cros_ec_spi.c
rename to drivers/platform/chrome/cros_ec_spi.c
--
2.18.0
On 2 July 2018 at 12:22, Enric Balletbo i Serra
<[email protected]> wrote:
> The cros-ec I2C and SPI transport drivers have been moved from MFD
> subsystem to platform/chrome, at the same time, the config symbol has
> been renamed and lost the MFD_ prefix, so update all configs to the new
> config symbol name.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
> ---
>
> arch/arm/configs/exynos_defconfig | 4 ++--
> arch/arm/configs/multi_v7_defconfig | 4 ++--
> arch/arm/configs/pxa_defconfig | 4 ++--
> arch/arm64/configs/defconfig | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
Since you put in one patch multiple defconfigs belonging to multiple
maintainers, I assume you are pushing this through arm-soc or Russell.
In such case, for Exynos boards:
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On Mon, Jul 2, 2018 at 3:22 AM Enric Balletbo i Serra
<[email protected]> wrote:
>
> There are some cros-ec transport drivers (I2C, SPI) living in MFD, while
> others (LPC) living in drivers/platform. The transport drivers are more
> platform specific. So, move the I2C and SPI transport drivers to the
> platform/chrome directory. The patch also removes the MFD_ prefix of
> their Kconfig symbols.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
>
> drivers/mfd/Kconfig | 20 -------------------
> drivers/mfd/Makefile | 2 --
> drivers/platform/chrome/Kconfig | 20 +++++++++++++++++++
> drivers/platform/chrome/Makefile | 2 ++
> .../{mfd => platform/chrome}/cros_ec_i2c.c | 0
> .../{mfd => platform/chrome}/cros_ec_spi.c | 0
> 6 files changed, 22 insertions(+), 22 deletions(-)
> rename drivers/{mfd => platform/chrome}/cros_ec_i2c.c (100%)
> rename drivers/{mfd => platform/chrome}/cros_ec_spi.c (100%)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index b860eb5aa194..013458e728dc 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -202,26 +202,6 @@ config MFD_CROS_EC
> You also need to enable the driver for the bus you are using. The
> protocol for talking to the EC is defined by the bus driver.
>
> -config MFD_CROS_EC_I2C
> - tristate "ChromeOS Embedded Controller (I2C)"
> - depends on MFD_CROS_EC && I2C
> -
> - help
> - If you say Y here, you get support for talking to the ChromeOS
> - EC through an I2C bus. This uses a simple byte-level protocol with
> - a checksum. Failing accesses will be retried three times to
> - improve reliability.
> -
> -config MFD_CROS_EC_SPI
> - tristate "ChromeOS Embedded Controller (SPI)"
> - depends on MFD_CROS_EC && SPI
> -
> - ---help---
> - If you say Y here, you get support for talking to the ChromeOS EC
> - through a SPI bus, using a byte-level protocol. Since the EC's
> - response time cannot be guaranteed, we support ignoring
> - 'pre-amble' bytes before the response actually starts.
> -
> config MFD_CROS_EC_CHARDEV
> tristate "Chrome OS Embedded Controller userspace device interface"
> depends on MFD_CROS_EC
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index e9fd20dba18d..d13e859d7c1e 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -14,8 +14,6 @@ obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
> obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
> cros_ec_core-objs := cros_ec.o
> obj-$(CONFIG_MFD_CROS_EC) += cros_ec_core.o
> -obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o
> -obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o
> obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
> obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
>
> diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
> index cb0df9eb3e0f..16b1615958aa 100644
> --- a/drivers/platform/chrome/Kconfig
> +++ b/drivers/platform/chrome/Kconfig
> @@ -52,6 +52,26 @@ config CHROMEOS_TBMC
> config CROS_EC_CTL
> tristate
>
> +config CROS_EC_I2C
> + tristate "ChromeOS Embedded Controller (I2C)"
> + depends on MFD_CROS_EC && I2C
> +
> + help
> + If you say Y here, you get support for talking to the ChromeOS
> + EC through an I2C bus. This uses a simple byte-level protocol with
> + a checksum. Failing accesses will be retried three times to
> + improve reliability.
> +
> +config CROS_EC_SPI
> + tristate "ChromeOS Embedded Controller (SPI)"
> + depends on MFD_CROS_EC && SPI
> +
> + ---help---
> + If you say Y here, you get support for talking to the ChromeOS EC
> + through a SPI bus, using a byte-level protocol. Since the EC's
> + response time cannot be guaranteed, we support ignoring
> + 'pre-amble' bytes before the response actually starts.
> +
> config CROS_EC_LPC
> tristate "ChromeOS Embedded Controller (LPC)"
> depends on MFD_CROS_EC && ACPI && (X86 || COMPILE_TEST)
> diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
> index e44c37a63fa9..cd591bf872bb 100644
> --- a/drivers/platform/chrome/Makefile
> +++ b/drivers/platform/chrome/Makefile
> @@ -6,6 +6,8 @@ obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o
> cros_ec_ctl-objs := cros_ec_sysfs.o cros_ec_lightbar.o \
> cros_ec_vbc.o cros_ec_debugfs.o
> obj-$(CONFIG_CROS_EC_CTL) += cros_ec_ctl.o
> +obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o
> +obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o
> cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_reg.o
> cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC) += cros_ec_lpc_mec.o
> obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o
> diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c
> similarity index 100%
> rename from drivers/mfd/cros_ec_i2c.c
> rename to drivers/platform/chrome/cros_ec_i2c.c
> diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
> similarity index 100%
> rename from drivers/mfd/cros_ec_spi.c
> rename to drivers/platform/chrome/cros_ec_spi.c
> --
> 2.18.0
>
On Mon, Jul 2, 2018 at 3:22 AM Enric Balletbo i Serra
<[email protected]> wrote:
>
> The cros-ec I2C and SPI transport drivers have been moved from MFD
> subsystem to platform/chrome, at the same time, the config symbol has
> been renamed and lost the MFD_ prefix, so update all configs to the new
> config symbol name.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
>
> arch/arm/configs/exynos_defconfig | 4 ++--
> arch/arm/configs/multi_v7_defconfig | 4 ++--
> arch/arm/configs/pxa_defconfig | 4 ++--
> arch/arm64/configs/defconfig | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
> index 85b2369d6b20..27ea6dfcf2f2 100644
> --- a/arch/arm/configs/exynos_defconfig
> +++ b/arch/arm/configs/exynos_defconfig
> @@ -155,8 +155,8 @@ CONFIG_THERMAL_EMULATION=y
> CONFIG_WATCHDOG=y
> CONFIG_S3C2410_WATCHDOG=y
> CONFIG_MFD_CROS_EC=y
> -CONFIG_MFD_CROS_EC_I2C=y
> -CONFIG_MFD_CROS_EC_SPI=y
> +CONFIG_CROS_EC_I2C=y
> +CONFIG_CROS_EC_SPI=y
> CONFIG_MFD_MAX14577=y
> CONFIG_MFD_MAX77686=y
> CONFIG_MFD_MAX77693=y
> diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
> index 8f6be1982545..be732f382418 100644
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@ -490,8 +490,8 @@ CONFIG_MFD_AC100=y
> CONFIG_MFD_AXP20X_I2C=y
> CONFIG_MFD_AXP20X_RSB=y
> CONFIG_MFD_CROS_EC=m
> -CONFIG_MFD_CROS_EC_I2C=m
> -CONFIG_MFD_CROS_EC_SPI=m
> +CONFIG_CROS_EC_I2C=m
> +CONFIG_CROS_EC_SPI=m
> CONFIG_MFD_DA9063=m
> CONFIG_MFD_MAX14577=y
> CONFIG_MFD_MAX77686=y
> diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
> index 5655a1cee87d..6bb506edb1f5 100644
> --- a/arch/arm/configs/pxa_defconfig
> +++ b/arch/arm/configs/pxa_defconfig
> @@ -398,8 +398,8 @@ CONFIG_MFD_AS3711=y
> CONFIG_MFD_BCM590XX=m
> CONFIG_MFD_AXP20X=y
> CONFIG_MFD_CROS_EC=m
> -CONFIG_MFD_CROS_EC_I2C=m
> -CONFIG_MFD_CROS_EC_SPI=m
> +CONFIG_CROS_EC_I2C=m
> +CONFIG_CROS_EC_SPI=m
> CONFIG_MFD_ASIC3=y
> CONFIG_PMIC_DA903X=y
> CONFIG_HTC_EGPIO=y
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index f9a186f6af8a..3ec0feccdd62 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -372,8 +372,8 @@ CONFIG_UNIPHIER_WATCHDOG=y
> CONFIG_BCM2835_WDT=y
> CONFIG_MFD_AXP20X_RSB=y
> CONFIG_MFD_CROS_EC=y
> -CONFIG_MFD_CROS_EC_I2C=y
> -CONFIG_MFD_CROS_EC_SPI=y
> +CONFIG_CROS_EC_I2C=y
> +CONFIG_CROS_EC_SPI=y
> CONFIG_MFD_CROS_EC_CHARDEV=m
> CONFIG_MFD_EXYNOS_LPASS=m
> CONFIG_MFD_HI6421_PMIC=y
> --
> 2.18.0
>
On Mon, Jul 2, 2018 at 3:22 AM Enric Balletbo i Serra
<[email protected]> wrote:
>
> The cros-ec I2C and SPI transport drivers have been moved from MFD
> subsystem to platform/chrome, at the same time, the config symbol
> has been renamed and lost the MFD_ prefix So, update the help message
> accordingly.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
>
> drivers/input/keyboard/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
> index 6bd97ffee761..4713957b0cbb 100644
> --- a/drivers/input/keyboard/Kconfig
> +++ b/drivers/input/keyboard/Kconfig
> @@ -721,7 +721,7 @@ config KEYBOARD_CROS_EC
> help
> Say Y here to enable the matrix keyboard used by ChromeOS devices
> and implemented on the ChromeOS EC. You must enable one bus option
> - (MFD_CROS_EC_I2C or MFD_CROS_EC_SPI) to use this.
> + (CROS_EC_I2C or CROS_EC_SPI) to use this.
>
> To compile this driver as a module, choose M here: the
> module will be called cros_ec_keyb.
> --
> 2.18.0
>
Hi Krzysztof,
On Mon, Jul 02, 2018 at 01:05:40PM +0200, Krzysztof Kozlowski wrote:
> On 2 July 2018 at 12:22, Enric Balletbo i Serra
> <[email protected]> wrote:
> > The cros-ec I2C and SPI transport drivers have been moved from MFD
> > subsystem to platform/chrome, at the same time, the config symbol has
> > been renamed and lost the MFD_ prefix, so update all configs to the new
> > config symbol name.
> >
> > Signed-off-by: Enric Balletbo i Serra <[email protected]>
> > ---
> >
> > arch/arm/configs/exynos_defconfig | 4 ++--
> > arch/arm/configs/multi_v7_defconfig | 4 ++--
> > arch/arm/configs/pxa_defconfig | 4 ++--
> > arch/arm64/configs/defconfig | 4 ++--
> > 4 files changed, 8 insertions(+), 8 deletions(-)
>
> Since you put in one patch multiple defconfigs belonging to multiple
> maintainers, I assume you are pushing this through arm-soc or Russell.
> In such case, for Exynos boards:
> Acked-by: Krzysztof Kozlowski <[email protected]>
>
> Best regards,
> Krzysztof
I was planning on creating an immutable branch for this series and merging it
through platform/chrome.
Lee, Russell, Dmitry, what do you think?
Benson
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
Hi Enric,
On Mon, Jul 02, 2018 at 12:21:58PM +0200, Enric Balletbo i Serra wrote:
> Hi,
>
> The cros-ec transport drivers are placed in two subsystems, in MFD and
> in platform/chrome. As far as I know there is no reason for this, so,
> move the I2C and the SPI cros-ec transport driver from the MFD subsystem
> to the platform/chrome. The series also removes the MFD_ prefix for the
> Kconfig symbols, modifies the defconfigs that used these symbols and
> fixes the KEYBOARD_CROS_EC Kconfig help.
>
Thanks for putting this together.
I can create an IB with this for the others to pull. What do you all think?
Thanks,
Benson
--
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]
On Mon, 02 Jul 2018, Enric Balletbo i Serra wrote:
> There are some cros-ec transport drivers (I2C, SPI) living in MFD, while
> others (LPC) living in drivers/platform. The transport drivers are more
> platform specific. So, move the I2C and SPI transport drivers to the
> platform/chrome directory. The patch also removes the MFD_ prefix of
> their Kconfig symbols.
>
> Signed-off-by: Enric Balletbo i Serra <[email protected]>
> ---
>
> drivers/mfd/Kconfig | 20 -------------------
> drivers/mfd/Makefile | 2 --
> drivers/platform/chrome/Kconfig | 20 +++++++++++++++++++
> drivers/platform/chrome/Makefile | 2 ++
> .../{mfd => platform/chrome}/cros_ec_i2c.c | 0
> .../{mfd => platform/chrome}/cros_ec_spi.c | 0
> 6 files changed, 22 insertions(+), 22 deletions(-)
> rename drivers/{mfd => platform/chrome}/cros_ec_i2c.c (100%)
> rename drivers/{mfd => platform/chrome}/cros_ec_spi.c (100%)
Acked-by: Lee Jones <[email protected]>
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Mon, 02 Jul 2018, Benson Leung wrote:
> On Mon, Jul 02, 2018 at 01:05:40PM +0200, Krzysztof Kozlowski wrote:
> > On 2 July 2018 at 12:22, Enric Balletbo i Serra
> > <[email protected]> wrote:
> > > The cros-ec I2C and SPI transport drivers have been moved from MFD
> > > subsystem to platform/chrome, at the same time, the config symbol has
> > > been renamed and lost the MFD_ prefix, so update all configs to the new
> > > config symbol name.
> > >
> > > Signed-off-by: Enric Balletbo i Serra <[email protected]>
> > > ---
> > >
> > > arch/arm/configs/exynos_defconfig | 4 ++--
> > > arch/arm/configs/multi_v7_defconfig | 4 ++--
> > > arch/arm/configs/pxa_defconfig | 4 ++--
> > > arch/arm64/configs/defconfig | 4 ++--
> > > 4 files changed, 8 insertions(+), 8 deletions(-)
> >
> > Since you put in one patch multiple defconfigs belonging to multiple
> > maintainers, I assume you are pushing this through arm-soc or Russell.
> > In such case, for Exynos boards:
> > Acked-by: Krzysztof Kozlowski <[email protected]>
> >
> > Best regards,
> > Krzysztof
>
> I was planning on creating an immutable branch for this series and merging it
> through platform/chrome.
>
> Lee, Russell, Dmitry, what do you think?
Fine by me.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog