config: follow porting guide [1/1]

PD#SWPL-67821

Problem:
follow the configure rules

Solution:
1. follow the configure rules
2. follow the module name rules
3. follow the directoy rules

Verify:
s4d

Change-Id: Iac68261fe7ce994240fcab2c6edc1f283a719b3d
Signed-off-by: wanwei.jiang <wanwei.jiang@amlogic.com>

android/abi_gki_aarch64_amlogic

@@ -1,30 +1,30 @@
 [abi_symbol_list]
 # commonly used symbols
 
-# clk: amlogic-clk-common.ko amlogic-clk-soc.ko
+# clk: amlogic-clk.ko amlogic-clk-soc.ko
   clk_hw_set_parent
   clk_mux_determine_rate_flags
   clk_mux_index_to_val
   clk_mux_val_to_index
   of_get_parent
 
-# pinctrl: amlogic-pinctrl-common.ko amlogic-pinctrl-s4.ko
+# pinctrl: amlogic-pinctrl.ko amlogic-pinctrl-soc-s4.ko
   gpiochip_generic_config
   irq_create_fwspec_mapping
 
-# irqchip: amlogic-irqchip-common.ko
+# irqchip: amlogic-irqchip.ko
   bitmap_free
   bitmap_zalloc
   irq_domain_free_irqs_parent
   irq_domain_get_irq_data
   irq_to_desc
 
-# amlogic-secmon-common.ko
+# amlogic-secmon.ko
   ioremap_cache
   of_reserved_mem_device_init_by_idx
   pfn_valid
   of_find_node_by_name
   copy_from_kernel_nofault
 
-# amlogic-secmon-cpuinfo.ko
+# amlogic-cpuinfo.ko
   dump_stack

android/abi_gki_aarch64_amlogic_illegal

@@ -2,8 +2,8 @@
 
 [abi_symbol_list]
 
-# clk driver: amlogic-clk-common.ko: meson-clk-debug.c
+# clk driver: amlogic-clk.ko: meson-clk-debug.c
   __clk_lookup
 
-# power driver: amlogic-power-common.ko: sec_power_domain.c
+# power driver: amlogic-power.ko: sec_power_domain.c
   pm_domain_always_on_gov

arch/arm64/configs/amlogic_gki.fragment

@@ -8,38 +8,38 @@ CONFIG_AMLOGIC_MODIFY=y
 CONFIG_AMLOGIC_UART=y
 CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y
 
-# amlogic-clk-common.ko
+# amlogic-clk.ko
 CONFIG_AMLOGIC_COMMON_CLK=m
-CONFIG_AMLOGIC_COMMON_CLK_AO_CLKC=y
-CONFIG_AMLOGIC_COMMON_CLK_CPU_DYNDIV=y
-CONFIG_AMLOGIC_COMMON_CLK_DUALDIV=y
-CONFIG_AMLOGIC_COMMON_CLK_EE_CLKC=y
-CONFIG_AMLOGIC_COMMON_CLK_MPLL=y
-CONFIG_AMLOGIC_COMMON_CLK_PHASE=y
-CONFIG_AMLOGIC_COMMON_CLK_PLL=y
-CONFIG_AMLOGIC_COMMON_CLK_REGMAP=y
-CONFIG_AMLOGIC_COMMON_CLK_SCLK_DIV=y
-CONFIG_AMLOGIC_COMMON_CLK_VID_PLL_DIV=y
-CONFIG_AMLOGIC_COMMON_CLK_MEASURE=y
-CONFIG_AMLOGIC_COMMON_CLK_DEBUG=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_CPU_DYNDIV=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_EE_CLKC=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_MPLL=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_PHASE=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_PLL=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_REGMAP=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_SCLK_DIV=y
+CONFIG_AMLOGIC_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_AMLOGIC_MESON_CLK_MEASURE=y
+CONFIG_AMLOGIC_CLK_DEBUG=y
 
-# amlogic-clk-s4.ko
-CONFIG_AMLOGIC_CLK_S4=m
+# amlogic-clk-soc-s4.ko
+CONFIG_AMLOGIC_COMMON_CLK_S4=m
 
-# amlogic-pinctrl-common.ko
-CONFIG_AMLOGIC_COMMON_PINCTRL=m
+# amlogic-pinctrl.ko
+CONFIG_AMLOGIC_PINCTRL_MESON=m
 
-# amlogic-pinctrl-s4.ko
-CONFIG_AMLOGIC_PINCTRL_S4=m
+# amlogic-pinctrl-soc-s4.ko
+CONFIG_AMLOGIC_PINCTRL_MESON_S4=m
 
-# amlogic-irqchip-common.ko
-CONFIG_AMLOGIC_COMMON_IRQCHIP=m
+# amlogic-irqchip.ko
+CONFIG_AMLOGIC_MESON_IRQ_GPIO=m
 
-# amlogic-secmon-common.ko
-CONFIG_AMLOGIC_COMMON_SECMON=m
+# amlogic-secmon.ko
+CONFIG_AMLOGIC_SECMON=m
 
-# amlogic-power-common.ko
-CONFIG_AMLOGIC_COMMON_POWER=m
+# amlogic-power.ko
+CONFIG_AMLOGIC_POWER=m
 
-# amlogic-cpuinfo-common.ko
-CONFIG_AMLOGIC_COMMON_CPUINFO=m
+# amlogic-cpuinfo.ko
+CONFIG_AMLOGIC_CPU_INFO=m

drivers/Kconfig

@@ -2,7 +2,7 @@
 
 menu "Amlogic Device Drivers"
 
-source "../common_drivers/drivers/uart/Kconfig"
+source "../common_drivers/drivers/tty/Kconfig"
 source "../common_drivers/drivers/clk/Kconfig"
 source "../common_drivers/drivers/pinctrl/Kconfig"
 source "../common_drivers/drivers/irqchip/Kconfig"

drivers/Makefile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-obj-y		+= uart/
+obj-y		+= tty/
 obj-y		+= clk/
 obj-y		+= pinctrl/
 obj-y		+= irqchip/

drivers/clk/Kconfig

@@ -1,80 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-menu "Clock support for Amlogic platforms"
-
-config AMLOGIC_COMMON_CLK
-	tristate "Meson clock common API"
-	default y
-	help
-	  provide meson clock common API and debuger tool
-
-config AMLOGIC_COMMON_CLK_REGMAP
-	tristate "meson regmap"
-	depends on REGMAP
-
-config AMLOGIC_COMMON_CLK_DUALDIV
-	tristate "meson dualdiv"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_MPLL
-	tristate "meson mpll"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_PHASE
-	tristate "meson phase"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_PLL
-	tristate "meson pll"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_SCLK_DIV
-	tristate "meson sclk div"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_VID_PLL_DIV
-	tristate "meson vid pll div"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_AO_CLKC
-	tristate "meson ao clkc"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-	depends on RESET_CONTROLLER
-
-config AMLOGIC_COMMON_CLK_EE_CLKC
-	tristate "meson ee clkc"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_CPU_DYNDIV
-	tristate "meson cpu dyndiv"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-
-config AMLOGIC_COMMON_CLK_MEASURE
-	tristate "Amlogic Meson SoC Clock Measure driver"
-	depends on REGMAP_MMIO
-	default n
-	help
-	  Say yes to support of Measuring a set of internal SoC clocks
-	  from the debugfs interface.
-
-config AMLOGIC_COMMON_CLK_DEBUG
-	tristate "Amlogic Meson SoC Clock Debug Driver"
-	depends on AMLOGIC_USERDEBUG
-	help
-	  Say yes to support of debugging online a set of SoC clocks
-	  from the debugfs interface.
-
-config AMLOGIC_CLK_S4
-	tristate "Meson S4 clock controller"
-	depends on AMLOGIC_COMMON_CLK_REGMAP
-	depends on AMLOGIC_COMMON_CLK_DUALDIV
-	depends on AMLOGIC_COMMON_CLK_MPLL
-	depends on AMLOGIC_COMMON_CLK_PLL
-	depends on AMLOGIC_COMMON_CLK_CPU_DYNDIV
-	depends on AMLOGIC_COMMON_CLK_VID_PLL_DIV
-	depends on MFD_SYSCON
-	help
-	  Support for the clock controller on Amlogic AH219 and AH212
-	  devices, aka s4. Say Y if you want peripherals to work.
-
-endmenu
+source "../common_drivers/drivers/clk/meson/Kconfig"

drivers/clk/Makefile

@@ -1,22 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# Amlogic clock drivers
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-MODULE_NAME = amlogic-clk-common
-obj-$(CONFIG_AMLOGIC_COMMON_CLK) = $(MODULE_NAME).o
-$(MODULE_NAME)-y = clk-common-init.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_AO_CLKC) += meson-aoclk.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_CPU_DYNDIV) += clk-cpu-dyndiv.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_DUALDIV) += clk-dualdiv.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_EE_CLKC) += meson-eeclk.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MPLL) += clk-mpll.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_PHASE) += clk-phase.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_PLL) += clk-pll.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_REGMAP) += clk-regmap.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_SCLK_DIV) += sclk-div.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_VID_PLL_DIV) += vid-pll-div.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MEASURE) += meson-clk-measure.o
-$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_DEBUG) += meson-clk-debug.o
-
-S4_MODULE_NAME = amlogic-clk-s4
-obj-$(CONFIG_AMLOGIC_CLK_S4) += $(S4_MODULE_NAME).o
-$(S4_MODULE_NAME)-y = s4.o
+obj-y		+= meson/

drivers/clk/meson/Kconfig

@@ -0,0 +1,81 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+menu "Clock support for Amlogic platforms"
+
+config AMLOGIC_COMMON_CLK
+	tristate "Meson clock common API"
+	default y
+	help
+	  provide meson clock common
+	  API and debuger tool
+
+config AMLOGIC_COMMON_CLK_MESON_REGMAP
+	tristate "meson regmap"
+	depends on REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_DUALDIV
+	tristate "meson dualdiv"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_MPLL
+	tristate "meson mpll"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_PHASE
+	tristate "meson phase"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_PLL
+	tristate "meson pll"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_SCLK_DIV
+	tristate "meson sclk div"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_VID_PLL_DIV
+	tristate "meson vid pll div"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_AO_CLKC
+	tristate "meson ao clkc"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+	depends on RESET_CONTROLLER
+
+config AMLOGIC_COMMON_CLK_MESON_EE_CLKC
+	tristate "meson ee clkc"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_COMMON_CLK_MESON_CPU_DYNDIV
+	tristate "meson cpu dyndiv"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+
+config AMLOGIC_MESON_CLK_MEASURE
+	tristate "Amlogic Meson SoC Clock Measure driver"
+	depends on REGMAP_MMIO
+	default n
+	help
+	  Say yes to support of Measuring a set of internal SoC clocks
+	  from the debugfs interface.
+
+config AMLOGIC_CLK_DEBUG
+	tristate "Amlogic Meson SoC Clock Debug Driver"
+	depends on AMLOGIC_USERDEBUG
+	help
+	  Say yes to support of debugging online a set of SoC clocks
+	  from the debugfs interface.
+
+config AMLOGIC_COMMON_CLK_S4
+	tristate "Meson S4 clock controller"
+	depends on AMLOGIC_COMMON_CLK_MESON_REGMAP
+	depends on AMLOGIC_COMMON_CLK_MESON_DUALDIV
+	depends on AMLOGIC_COMMON_CLK_MESON_MPLL
+	depends on AMLOGIC_COMMON_CLK_MESON_PLL
+	depends on AMLOGIC_COMMON_CLK_MESON_CPU_DYNDIV
+	depends on AMLOGIC_COMMON_CLK_MESON_VID_PLL_DIV
+	depends on MFD_SYSCON
+	help
+	  Support for the clock controller on Amlogic AH219 and AH212
+	  devices, aka s4. Say Y if you want peripherals to work.
+
+endmenu

drivers/clk/meson/Makefile

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Amlogic clock drivers
+
+MODULE_NAME = amlogic-clk
+obj-$(CONFIG_AMLOGIC_COMMON_CLK) = $(MODULE_NAME).o
+$(MODULE_NAME)-y = clk-common-init.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_AO_CLKC) += meson-aoclk.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_CPU_DYNDIV) += clk-cpu-dyndiv.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_DUALDIV) += clk-dualdiv.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_EE_CLKC) += meson-eeclk.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_MPLL) += clk-mpll.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_PHASE) += clk-phase.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_PLL) += clk-pll.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_REGMAP) += clk-regmap.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_SCLK_DIV) += sclk-div.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_COMMON_CLK_MESON_VID_PLL_DIV) += vid-pll-div.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_MESON_CLK_MEASURE) += meson-clk-measure.o
+$(MODULE_NAME)-$(CONFIG_AMLOGIC_CLK_DEBUG) += meson-clk-debug.o
+
+S4_MODULE_NAME = amlogic-clk-soc-s4
+obj-$(CONFIG_AMLOGIC_COMMON_CLK_S4) += $(S4_MODULE_NAME).o
+$(S4_MODULE_NAME)-y = s4.o

drivers/clk/meson/clk-common-init.h

@@ -8,7 +8,7 @@
 
 #ifdef MODULE
 
-#ifdef CONFIG_AMLOGIC_COMMON_CLK_MEASURE
+#ifdef CONFIG_AMLOGIC_MESON_CLK_MEASURE
 int clk_measure_init(void);
 #else
 static inline int clk_measure_init(void)
@@ -17,7 +17,7 @@ static inline int clk_measure_init(void)
 }
 #endif
 
-#ifdef CONFIG_AMLOGIC_COMMON_CLK_DEBUG
+#ifdef CONFIG_AMLOGIC_CLK_DEBUG
 int __init clk_debug_init(void);
 #else
 static inline int clk_debug_init(void)

drivers/cpu_info/Kconfig

@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-config	AMLOGIC_COMMON_CPUINFO
+config	AMLOGIC_CPU_INFO
 	tristate "Amlogic chipid"
-	depends on AMLOGIC_COMMON_SECMON
+	depends on AMLOGIC_SECMON
 	depends on MFD_SYSCON
 	default n
 	help

drivers/cpu_info/Makefile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-MODULE_NAME = amlogic-cpuinfo-common
-obj-$(CONFIG_AMLOGIC_COMMON_CPUINFO) = $(MODULE_NAME).o
+MODULE_NAME = amlogic-cpuinfo
+obj-$(CONFIG_AMLOGIC_CPU_INFO) = $(MODULE_NAME).o
 $(MODULE_NAME)-y += cpu_info.o cpu_version.o

drivers/irqchip/Kconfig

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-config AMLOGIC_COMMON_IRQCHIP
+config AMLOGIC_MESON_IRQ_GPIO
 	tristate "Amlogic GPIO Interrupt Multiplexer"
 	depends on IRQ_DOMAIN_HIERARCHY
 	help

drivers/irqchip/Makefile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 
-MODULE_NAME = amlogic-irqchip-common
-obj-$(CONFIG_AMLOGIC_COMMON_IRQCHIP) = $(MODULE_NAME).o
+MODULE_NAME = amlogic-irqchip
+obj-$(CONFIG_AMLOGIC_MESON_IRQ_GPIO) = $(MODULE_NAME).o
 $(MODULE_NAME)-y += irq-meson-gpio.o

drivers/pinctrl/Kconfig

@@ -1,23 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-menuconfig AMLOGIC_COMMON_PINCTRL
-	tristate "Amlogic SoC pinctrl drivers"
-	depends on OF
-	depends on PINMUX
-	depends on PINCONF
-	depends on GENERIC_PINCONF
-	depends on GPIOLIB
-	depends on OF_GPIO
-	depends on REGMAP_MMIO
-
-if AMLOGIC_COMMON_PINCTRL
-config AMLOGIC_PINCTRL_S4
-	tristate "Meson s4 Soc pinctrl driver"
-	default n
-	help
-	  the chip of s4 will be built
-	  when enable this config.
-	  s4 pinctrl can work.
-	  otherwise s4 pinctrl can't work
-
-endif
+source "../common_drivers/drivers/pinctrl/meson/Kconfig"

drivers/pinctrl/Makefile

@@ -1,8 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
-MODULE_NAME = amlogic-pinctrl-common
-obj-$(CONFIG_AMLOGIC_COMMON_PINCTRL) = $(MODULE_NAME).o
-$(MODULE_NAME)-y += pinctrl-module-init.o pinctrl-meson.o pinctrl-meson-axg-pmx.o
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-S4_MODULE_NAME = amlogic-pinctrl-s4
-obj-$(CONFIG_AMLOGIC_PINCTRL_S4) += $(S4_MODULE_NAME).o
-$(S4_MODULE_NAME)-y += pinctrl-meson-s4.o
+obj-y		+= meson/

drivers/pinctrl/meson/Kconfig

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+menuconfig AMLOGIC_PINCTRL_MESON
+	tristate "Amlogic SoC pinctrl drivers"
+	depends on OF
+	depends on PINMUX
+	depends on PINCONF
+	depends on GENERIC_PINCONF
+	depends on GPIOLIB
+	depends on OF_GPIO
+	depends on REGMAP_MMIO
+
+if AMLOGIC_PINCTRL_MESON
+config AMLOGIC_PINCTRL_MESON_S4
+	tristate "Meson s4 Soc pinctrl driver"
+	default n
+	help
+	  the chip of s4 will be built
+	  when enable this config.
+	  s4 pinctrl can work.
+	  otherwise s4 pinctrl can't work
+
+endif

drivers/pinctrl/meson/Makefile

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+MODULE_NAME = amlogic-pinctrl
+obj-$(CONFIG_AMLOGIC_PINCTRL_MESON) = $(MODULE_NAME).o
+$(MODULE_NAME)-y += pinctrl-module-init.o pinctrl-meson.o pinctrl-meson-axg-pmx.o
+
+S4_MODULE_NAME = amlogic-pinctrl-soc-s4
+obj-$(CONFIG_AMLOGIC_PINCTRL_MESON_S4) += $(S4_MODULE_NAME).o
+$(S4_MODULE_NAME)-y += pinctrl-meson-s4.o

drivers/power/Kconfig

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-config AMLOGIC_COMMON_POWER
+config AMLOGIC_POWER
 	tristate "Amloigc power related driver support"
 	default n
 	help

drivers/power/Makefile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-MODULE_NAME = amlogic-power-common
-obj-$(CONFIG_AMLOGIC_COMMON_POWER)		+= $(MODULE_NAME).o
-$(MODULE_NAME)-y += sec_pwr_ctrl.o sec_power_domain.o power_domain_sysfs.o
+MODULE_NAME = amlogic-power
+obj-$(CONFIG_AMLOGIC_POWER)		+= $(MODULE_NAME).o
+$(MODULE_NAME)-y += sec_pwr_ctrl.o sec_power_domain.o power_domain_sysfs.o

drivers/secmon/Kconfig

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-config AMLOGIC_COMMON_SECMON
+config AMLOGIC_SECMON
 	tristate "Amlogic secure monitor driver support"
 	default n
 	help

drivers/secmon/Makefile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 
-MODULE_NAME = amlogic-secmon-common
-obj-$(CONFIG_AMLOGIC_COMMON_SECMON) = $(MODULE_NAME).o
+MODULE_NAME = amlogic-secmon
+obj-$(CONFIG_AMLOGIC_SECMON) = $(MODULE_NAME).o
 $(MODULE_NAME)-y += secmon.o

drivers/tty/Kconfig

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+source "../common_drivers/drivers/tty/serial/Kconfig"

drivers/tty/Makefile

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+
+obj-y		+= serial/

drivers/tty/serial/Kconfig

@@ -0,0 +1,24 @@
+#
+# Amlogic driver configuration
+#
+
+config AMLOGIC_UART
+	tristate "Serial support"
+	depends on SERIAL_CORE
+	default n
+	help
+	  Add support for the Amlogic serial port.
+	  this config only ctrl in makefile
+	  this config do not in meson_uart.c
+	  this config add
+
+config AMLOGIC_SERIAL_MESON_CONSOLE
+	bool "Console on Amlogic Serial port"
+	depends on AMLOGIC_UART
+	depends on SERIAL_CORE_CONSOLE
+	depends on SERIAL_EARLYCON
+	default y
+	help
+	  Support for running a console on the Amlogic serial
+	  this config is only
+	  used in meson_uart.c

drivers/uart/Kconfig

@@ -1,26 +0,0 @@
-#
-# Amlogic driver configuration
-#
-
-config AMLOGIC_UART
-	tristate "Serial support"
-	depends on SERIAL_CORE
-	select AMLOGIC_SERIAL_MESON_CONSOLE
-	default n
-    help
-	Add support for the Amlogic serial port.
-	this config only ctrl in makefile
-	this config do not in meson_uart.c
-	this config add
-
-config AMLOGIC_SERIAL_MESON_CONSOLE
-	bool "Console on Amlogic Serial port"
-	depends on AMLOGIC_UART
-	depends on SERIAL_CORE_CONSOLE
-	depends on SERIAL_EARLYCON
-	default n
-	help
-		Support for running a console on the Amlogic serial
-		this config is only
-		used in meson_uart.c
-		so so