arm/fsl_frdm_k64f: fix kconfig hierarchy

This makes sure the CONFIG_GPIO_K64F_* kconfig options have correct
dependencies. Or else CONFIG_GPIO_K64F can be disabled, but all
the CONFIG_GPIO_K64F_{A,B,C,D,E} are enabled.

Same goes for SPI, FTM and pinmux.

Change-Id: I8d225dea714081b14b19006d61b8f3f6afafa5ee
Signed-off-by: Daniel Leung <daniel.leung@intel.com>

arch/arm/soc/fsl_frdm_k64f/Kconfig

@@ -197,6 +197,8 @@ if GPIO
 config GPIO_K64
 	def_bool y
 
+if GPIO_K64
+
 config GPIO_K64_A
 	def_bool y
 
@@ -212,7 +214,9 @@ config GPIO_K64_D
 config GPIO_K64_E
 	def_bool y
 
-endif
+endif # GPIO_K64
+
+if GPIO_K64_A
 
 config GPIO_K64_A_BASE_ADDR
 	default 0x400FF000
@@ -220,30 +224,49 @@ config GPIO_K64_A_BASE_ADDR
 config PORT_K64_A_BASE_ADDR
 	default 0x40049000
 
+endif # GPIO_K64_A
+
+if GPIO_K64_B
+
 config GPIO_K64_B_BASE_ADDR
 	default 0x400FF040
 
 config PORT_K64_B_BASE_ADDR
 	default 0x4004A000
 
+endif # GPIO_K64_B
+
+if GPIO_K64_C
+
 config GPIO_K64_C_BASE_ADDR
 	default 0x400FF080
 
 config PORT_K64_C_BASE_ADDR
 	default 0x4004B000
 
+endif # GPIO_K64_C
+
+if GPIO_K64_D
+
 config GPIO_K64_D_BASE_ADDR
 	default 0x400FF0C0
 
 config PORT_K64_D_BASE_ADDR
 	default 0x4004C000
 
+endif # GPIO_K64_D
+
+if GPIO_K64_E
+
 config GPIO_K64_E_BASE_ADDR
 	default 0x400FF100
 
 config PORT_K64_E_BASE_ADDR
 	default 0x4004D000
 
+endif # GPIO_K64_E
+
+endif # if GPIO
 
 if PINMUX
 
@@ -253,6 +276,9 @@ config PINMUX_BASE
 	default 0x00000000
 config PINMUX_NUM_PINS
 	default 160
+
+if PINMUX_K64
+
 config PINMUX_K64_GPIO_A_NAME
 	default GPIO_K64_A_DEV_NAME
 config PINMUX_K64_GPIO_B_NAME
@@ -274,15 +300,22 @@ config PRESERVE_JTAG_IO_PINS
 	the Arduino header as D8, D3 and D5, respectively.
 	Enable this option to preserve these pins for the debug interface.
 
+endif # PINMUX_K64
+
 endif # PINMUX
 
 if PWM
 
 config PWM_K64_FTM
 	def_bool y
+
+if PWM_K64_FTM
+
 config PWM_K64_FTM_0
 	def_bool y
 
+endif # PWM_K64_FTM
+
 endif
 
 config SPI
@@ -293,6 +326,8 @@ if SPI
 config SPI_K64
 	def_bool y
 
+if SPI_K64
+
 config SPI_K64_0
 	def_bool y
 
@@ -302,6 +337,8 @@ config SPI_K64_1
 config SPI_K64_2
 	def_bool n
 
+endif # SPI_K64
+
 endif
 
 endif # SOC_FSL_FRDM_K64F

drivers/pinmux/Kconfig

@@ -116,35 +116,35 @@ config PINMUX_K64
 
 config PINMUX_K64_GPIO_A_NAME
         string "Name of the Port A GPIO"
-        depends on PINMUX && GPIO_K64
+        depends on PINMUX_K64 && GPIO_K64
         default "GPIO_A"
         help
         The name of the Port A GPIO referred to as PTA0..PTA31.
 
 config PINMUX_K64_GPIO_B_NAME
         string "Name of the Port B GPIO"
-        depends on PINMUX && GPIO_K64
+        depends on PINMUX_K64 && GPIO_K64
         default "GPIO_B"
         help
         The name of the Port B GPIO referred to as PTB0..PTB31.
 
 config PINMUX_K64_GPIO_C_NAME
         string "Name of the Port C GPIO"
-        depends on PINMUX && GPIO_K64
+        depends on PINMUX_K64 && GPIO_K64
         default "GPIO_C"
         help
         The name of the Port C GPIO referred to as PTC0..PTC31.
 
 config PINMUX_K64_GPIO_D_NAME
         string "Name of the Port D GPIO"
-        depends on PINMUX && GPIO_K64
+        depends on PINMUX_K64 && GPIO_K64
         default "GPIO_D"
         help
         The name of the Port D GPIO referred to as PTD0..PTD31.
 
 config PINMUX_K64_GPIO_E_NAME
         string "Name of the Port E GPIO"
-        depends on PINMUX && GPIO_K64
+        depends on PINMUX_K64 && GPIO_K64
         default "GPIO_E"
         help
         The name of the Port E GPIO referred to as PTE0..PTE31.