[U-Boot] [PATCH v3 00/11] arm: sunxi: Use proper and meaningful Kconfig entries
Current arch/arm/mach-sunxi/Makefile has improper build options which relies mostly on MACH_ options. This series get rid of those and added proper Kconfig options.
All Kconfig entry name are re-used from Linux so-that future dm conversion on these can be meaningful.
Changes for v3: - Rename SUNXI_RSB to SUN8I_RSB - Drop or invisible few generic config bool strings Changes for v2: - Renamed PMIC_SUNXI to PMIC_AXP, so it PMIC driver implies to have AXP helpers and name start with PMIC_ sothat the notation can compatible with pmic dm-drivers
Jagan Teki (11): sunxi: Add MFD_SUN6I_PRCM kconfig entry sunxi: Add I2C_SUN6I_P2WI kconfig entry sunxi: Use MFD_SUN6I_PRCM if used sunxi: Add SUN8I_RSB kconfig entry sunxi: Add PMIC_AXP kconfig entry sunxi: add DRAM_SUN6I kconfig sunxi: Add DRAM_SUN4I kconfig entry sunxi: Add DRAM_SUN9I kconfig entry sunxi: Add DRAM_SUN8I_A23 kconfig entry sunxi: Add DRAM_SUN8I_A33 kconfig entry sunxi: Add DRAM_SUN8I_A83T kconfig entry
arch/arm/mach-sunxi/Kconfig | 81 ++++++++++++++++++++++++++++++++++++++++++++ arch/arm/mach-sunxi/Makefile | 30 ++++++---------- drivers/power/Kconfig | 5 +++ 3 files changed, 96 insertions(+), 20 deletions(-)
Add simple and meaningful kconfig option for prcm.c instead of using MACH type on Makefile.
PRCM (Power/Reset/Clock Management) is considered as a Multi-Functional Device, so used the same on Kconfig definition.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index dc48eefdef..f336c208e4 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -6,6 +6,12 @@ config SPL_LDSCRIPT config IDENT_STRING default " Allwinner Technology"
+config MFD_SUN6I_PRCM + bool + help + Support for the PRCM (Power/Reset/Clock Management) unit available + in A31 SoC. + config SUNXI_HIGH_SRAM bool default n @@ -87,6 +93,7 @@ config MACH_SUN6I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select MFD_SUN6I_PRCM select SUNXI_GEN_SUN6I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 6ddf682764..d45b015964 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -16,7 +16,7 @@ obj-y += pinmux.o ifndef CONFIG_MACH_SUN9I obj-y += usb_phy.o endif -obj-$(CONFIG_MACH_SUN6I) += prcm.o +obj-$(CONFIG_MFD_SUN6I_PRCM) += prcm.o obj-$(CONFIG_MACH_SUN8I) += prcm.o obj-$(CONFIG_MACH_SUN9I) += prcm.o obj-$(CONFIG_MACH_SUN6I) += p2wi.o
On Wed, Mar 14, 2018 at 06:29:44PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for prcm.c instead of using MACH type on Makefile.
PRCM (Power/Reset/Clock Management) is considered as a Multi-Functional Device, so used the same on Kconfig definition.
MFD in U-Boot doesn't make much sense, does it?
Why not just CONFIG_SUN6I_PRCM?
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Once fixed, Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add simple and meaningful kconfig option for p2wi.c instead of using MACH type on Makefile.
p2wi is an I2C controller, so used the same on kconfig definition.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 12 ++++++++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index f336c208e4..b9b7340af9 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -6,6 +6,17 @@ config SPL_LDSCRIPT config IDENT_STRING default " Allwinner Technology"
+config I2C_SUN6I_P2WI + bool "Allwinner sun6i internal P2WI controller" + help + If you say yes to this option, support will be included for the + P2WI (Push/Pull 2 Wire Interface) controller embedded in some sunxi + SOCs. + The P2WI looks like an SMBus controller (which supports only byte + accesses), except that it only supports one slave device. + This interface is used to connect to specific PMIC devices (like the + AXP221). + config MFD_SUN6I_PRCM bool help @@ -93,6 +104,7 @@ config MACH_SUN6I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select I2C_SUN6I_P2WI select MFD_SUN6I_PRCM select SUNXI_GEN_SUN6I select SUPPORT_SPL diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index d45b015964..0dd85b41cb 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -16,10 +16,10 @@ obj-y += pinmux.o ifndef CONFIG_MACH_SUN9I obj-y += usb_phy.o endif +obj-$(CONFIG_I2C_SUN6I_P2WI) += p2wi.o obj-$(CONFIG_MFD_SUN6I_PRCM) += prcm.o obj-$(CONFIG_MACH_SUN8I) += prcm.o obj-$(CONFIG_MACH_SUN9I) += prcm.o -obj-$(CONFIG_MACH_SUN6I) += p2wi.o obj-$(CONFIG_MACH_SUN8I) += rsb.o obj-$(CONFIG_MACH_SUN9I) += rsb.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o
On Wed, Mar 14, 2018 at 06:29:45PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for p2wi.c instead of using MACH type on Makefile.
p2wi is an I2C controller, so used the same on kconfig definition.
It's not an I2C controller, the bus is different, as you have shown in the Kconfig option.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
On Wed, Mar 14, 2018 at 6:52 PM, Maxime Ripard maxime.ripard@bootlin.com wrote:
On Wed, Mar 14, 2018 at 06:29:45PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for p2wi.c instead of using MACH type on Makefile.
p2wi is an I2C controller, so used the same on kconfig definition.
It's not an I2C controller, the bus is different, as you have shown in the Kconfig option.
Since it's two-wire bus which considered as I2C Linux I've reused similar naming convention.
Hi,
On Wed, Mar 14, 2018 at 07:14:08PM +0530, Jagan Teki wrote:
On Wed, Mar 14, 2018 at 6:52 PM, Maxime Ripard maxime.ripard@bootlin.com wrote:
On Wed, Mar 14, 2018 at 06:29:45PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for p2wi.c instead of using MACH type on Makefile.
p2wi is an I2C controller, so used the same on kconfig definition.
It's not an I2C controller, the bus is different, as you have shown in the Kconfig option.
Since it's two-wire bus which considered as I2C Linux I've reused similar naming convention.
Right, but we're not in Linux, this is not an I2C driver in U-Boot (and if it was to be done again, it shouldn't be an I2C driver in Linux either, but that's a different story), and it's not an I2C bus either. So I guess we can also drop the I2C part from the Kconfig help and symbol.
Maxime
MFD_SUN6I_PRCM is also used for SUN8I and SUN9I, so select the same on respective MACH types.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 2 ++ arch/arm/mach-sunxi/Makefile | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index b9b7340af9..fa558e8be1 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -182,6 +182,7 @@ config MACH_SUN8I_V3S config MACH_SUN9I bool "sun9i (Allwinner A80)" select CPU_V7 + select MFD_SUN6I_PRCM select SUNXI_HIGH_SRAM select SUNXI_GEN_SUN6I select SUPPORT_SPL @@ -212,6 +213,7 @@ endchoice # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33" config MACH_SUN8I bool + select MFD_SUN6I_PRCM default y if MACH_SUN8I_A23 default y if MACH_SUN8I_A33 default y if MACH_SUN8I_A83T diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 0dd85b41cb..e17a3a1a5a 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -18,8 +18,6 @@ obj-y += usb_phy.o endif obj-$(CONFIG_I2C_SUN6I_P2WI) += p2wi.o obj-$(CONFIG_MFD_SUN6I_PRCM) += prcm.o -obj-$(CONFIG_MACH_SUN8I) += prcm.o -obj-$(CONFIG_MACH_SUN9I) += prcm.o obj-$(CONFIG_MACH_SUN8I) += rsb.o obj-$(CONFIG_MACH_SUN9I) += rsb.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o
On Wed, Mar 14, 2018 at 06:29:46PM +0530, Jagan Teki wrote:
MFD_SUN6I_PRCM is also used for SUN8I and SUN9I, so select the same on respective MACH types.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Using CONFIG_SUN6I_PRCM,
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add simple and meaningful kconfig option for rsb.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 10 ++++++++++ arch/arm/mach-sunxi/Makefile | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index fa558e8be1..601036c67f 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -23,6 +23,14 @@ config MFD_SUN6I_PRCM Support for the PRCM (Power/Reset/Clock Management) unit available in A31 SoC.
+config SUN8I_RSB + bool "Allwinner sunXi Reduced Serial Bus Driver" + help + Say y here to enable support for Allwinner's Reduced Serial Bus + (RSB) support. This controller is responsible for communicating + with various RSB based devices, such as AXP223, AXP8XX PMICs, + and AC100/AC200 ICs. + config SUNXI_HIGH_SRAM bool default n @@ -185,6 +193,7 @@ config MACH_SUN9I select MFD_SUN6I_PRCM select SUNXI_HIGH_SRAM select SUNXI_GEN_SUN6I + select SUN8I_RSB select SUPPORT_SPL
config MACH_SUN50I @@ -213,6 +222,7 @@ endchoice # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33" config MACH_SUN8I bool + select SUN8I_RSB select MFD_SUN6I_PRCM default y if MACH_SUN8I_A23 default y if MACH_SUN8I_A33 diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index e17a3a1a5a..9480787e3d 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -18,8 +18,7 @@ obj-y += usb_phy.o endif obj-$(CONFIG_I2C_SUN6I_P2WI) += p2wi.o obj-$(CONFIG_MFD_SUN6I_PRCM) += prcm.o -obj-$(CONFIG_MACH_SUN8I) += rsb.o -obj-$(CONFIG_MACH_SUN9I) += rsb.o +obj-$(CONFIG_SUN8I_RSB) += rsb.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN5I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN6I) += clock_sun6i.o
On Wed, Mar 14, 2018 at 06:29:47PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for rsb.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
maxime
Add simple and meaningful kconfig option for pmic_bus.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 6 ++++++ arch/arm/mach-sunxi/Makefile | 7 +------ drivers/power/Kconfig | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 601036c67f..4776337aaf 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -23,6 +23,12 @@ config MFD_SUN6I_PRCM Support for the PRCM (Power/Reset/Clock Management) unit available in A31 SoC.
+config PMIC_AXP + bool "Sunxi AXP PMIC bus access helpers" + help + Select this PMIC bus access helpers for Sunxi platform PRCM or other + AXP family PMIC devices. + config SUN8I_RSB bool "Allwinner sunXi Reduced Serial Bus Driver" help diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 9480787e3d..5c2276db3f 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -18,6 +18,7 @@ obj-y += usb_phy.o endif obj-$(CONFIG_I2C_SUN6I_P2WI) += p2wi.o obj-$(CONFIG_MFD_SUN6I_PRCM) += prcm.o +obj-$(CONFIG_PMIC_AXP) += pmic_bus.o obj-$(CONFIG_SUN8I_RSB) += rsb.o obj-$(CONFIG_MACH_SUN4I) += clock_sun4i.o obj-$(CONFIG_MACH_SUN5I) += clock_sun4i.o @@ -31,12 +32,6 @@ obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o
-obj-$(CONFIG_AXP152_POWER) += pmic_bus.o -obj-$(CONFIG_AXP209_POWER) += pmic_bus.o -obj-$(CONFIG_AXP221_POWER) += pmic_bus.o -obj-$(CONFIG_AXP809_POWER) += pmic_bus.o -obj-$(CONFIG_AXP818_POWER) += pmic_bus.o - ifdef CONFIG_SPL_BUILD obj-$(CONFIG_MACH_SUN4I) += dram_sun4i.o obj-$(CONFIG_MACH_SUN5I) += dram_sun4i.o diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index d8c107e206..c004f5a9c3 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -22,6 +22,7 @@ config SUNXI_NO_PMIC config AXP152_POWER bool "axp152 pmic support" depends on MACH_SUN5I + select PMIC_AXP select CMD_POWEROFF ---help--- Select this to enable support for the axp152 pmic found on most @@ -30,6 +31,7 @@ config AXP152_POWER config AXP209_POWER bool "axp209 pmic support" depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I + select PMIC_AXP select CMD_POWEROFF ---help--- Select this to enable support for the axp209 pmic found on most @@ -38,6 +40,7 @@ config AXP209_POWER config AXP221_POWER bool "axp221 / axp223 pmic support" depends on MACH_SUN6I || MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_R40 + select PMIC_AXP select CMD_POWEROFF ---help--- Select this to enable support for the axp221/axp223 pmic found on most @@ -46,6 +49,7 @@ config AXP221_POWER config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I + select PMIC_AXP select CMD_POWEROFF ---help--- Say y here to enable support for the axp809 pmic found on A80 boards. @@ -53,6 +57,7 @@ config AXP809_POWER config AXP818_POWER bool "axp818 pmic support" depends on MACH_SUN8I_A83T + select PMIC_AXP select CMD_POWEROFF ---help--- Say y here to enable support for the axp818 pmic found on
On Wed, Mar 14, 2018 at 06:29:48PM +0530, Jagan Teki wrote:
Add simple and meaningful kconfig option for pmic_bus.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
arch/arm/mach-sunxi/Kconfig | 6 ++++++ arch/arm/mach-sunxi/Makefile | 7 +------ drivers/power/Kconfig | 5 +++++ 3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 601036c67f..4776337aaf 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -23,6 +23,12 @@ config MFD_SUN6I_PRCM Support for the PRCM (Power/Reset/Clock Management) unit available in A31 SoC.
+config PMIC_AXP
- bool "Sunxi AXP PMIC bus access helpers"
- help
Select this PMIC bus access helpers for Sunxi platform PRCM or otherAXP family PMIC devices.
What about something like AXP_PMIC_BUS. It would make it clear that it's about the bus itself, and not the PMIC.
Maxime
Add proper and simple kconfig option for dram_sun6i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 4776337aaf..72a72d41ce 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -6,6 +6,12 @@ config SPL_LDSCRIPT config IDENT_STRING default " Allwinner Technology"
+config DRAM_SUN6I + bool + help + Select this dram controller driver for Sun6i platforms, + like A31/A31s. + config I2C_SUN6I_P2WI bool "Allwinner sun6i internal P2WI controller" help @@ -118,6 +124,7 @@ config MACH_SUN6I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DRAM_SUN6I select I2C_SUN6I_P2WI select MFD_SUN6I_PRCM select SUNXI_GEN_SUN6I diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 5c2276db3f..c0b7e4d2ad 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -33,9 +33,9 @@ endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o
ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o obj-$(CONFIG_MACH_SUN4I) += dram_sun4i.o obj-$(CONFIG_MACH_SUN5I) += dram_sun4i.o -obj-$(CONFIG_MACH_SUN6I) += dram_sun6i.o obj-$(CONFIG_MACH_SUN7I) += dram_sun4i.o obj-$(CONFIG_MACH_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o
On Wed, Mar 14, 2018 at 06:29:49PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun6i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add proper and simple kconfig option for dram_sun4i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 9 +++++++++ arch/arm/mach-sunxi/Makefile | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 72a72d41ce..b390d13a8c 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -6,6 +6,12 @@ config SPL_LDSCRIPT config IDENT_STRING default " Allwinner Technology"
+config DRAM_SUN4I + bool + help + Select this dram controller driver for Sun4/5/7i platforms, + like A10/A13/A20. + config DRAM_SUN6I bool help @@ -108,6 +114,7 @@ config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7 select ARM_CORTEX_CPU_IS_UP + select DRAM_SUN4I select SUNXI_GEN_SUN4I select SUPPORT_SPL
@@ -115,6 +122,7 @@ config MACH_SUN5I bool "sun5i (Allwinner A13)" select CPU_V7 select ARM_CORTEX_CPU_IS_UP + select DRAM_SUN4I select SUNXI_GEN_SUN4I select SUPPORT_SPL
@@ -137,6 +145,7 @@ config MACH_SUN7I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DRAM_SUN4I select SUNXI_GEN_SUN4I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index c0b7e4d2ad..2aee3c942d 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -33,10 +33,8 @@ endif obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o
ifdef CONFIG_SPL_BUILD +obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o -obj-$(CONFIG_MACH_SUN4I) += dram_sun4i.o -obj-$(CONFIG_MACH_SUN5I) += dram_sun4i.o -obj-$(CONFIG_MACH_SUN7I) += dram_sun4i.o obj-$(CONFIG_MACH_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o obj-$(CONFIG_MACH_SUN8I_A83T) += dram_sun8i_a83t.o
On Wed, Mar 14, 2018 at 06:29:50PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun4i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add proper and simple kconfig option for dram_sun9i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index b390d13a8c..8302ea000d 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -18,6 +18,12 @@ config DRAM_SUN6I Select this dram controller driver for Sun6i platforms, like A31/A31s.
+config DRAM_SUN9I + bool + help + Select this dram controller driver for Sun9i platforms, + like A80. + config I2C_SUN6I_P2WI bool "Allwinner sun6i internal P2WI controller" help @@ -212,6 +218,7 @@ config MACH_SUN8I_V3S config MACH_SUN9I bool "sun9i (Allwinner A80)" select CPU_V7 + select DRAM_SUN9I select MFD_SUN6I_PRCM select SUNXI_HIGH_SRAM select SUNXI_GEN_SUN6I diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 2aee3c942d..bb609f75a1 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -35,11 +35,11 @@ obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o +obj-$(CONFIG_DRAM_SUN9I) += dram_sun9i.o obj-$(CONFIG_MACH_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o obj-$(CONFIG_MACH_SUN8I_A83T) += dram_sun8i_a83t.o obj-$(CONFIG_SPL_SPI_SUNXI) += spl_spi_sunxi.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/ -obj-$(CONFIG_MACH_SUN9I) += dram_sun9i.o endif
On Wed, Mar 14, 2018 at 06:29:51PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun9i.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add proper and simple kconfig option for dram_sun8i_a23.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 8302ea000d..61436cd83f 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -18,6 +18,12 @@ config DRAM_SUN6I Select this dram controller driver for Sun6i platforms, like A31/A31s.
+config DRAM_SUN8I_A23 + bool + help + Select this dram controller driver for Sun8i platforms, + for A23 SOC. + config DRAM_SUN9I bool help @@ -162,6 +168,7 @@ config MACH_SUN8I_A23 select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DRAM_SUN8I_A23 select SUNXI_GEN_SUN6I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index bb609f75a1..e5a4a158f6 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -35,8 +35,8 @@ obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o gtbus_sun9i.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o +obj-$(CONFIG_DRAM_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_DRAM_SUN9I) += dram_sun9i.o -obj-$(CONFIG_MACH_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o obj-$(CONFIG_MACH_SUN8I_A83T) += dram_sun8i_a83t.o obj-$(CONFIG_SPL_SPI_SUNXI) += spl_spi_sunxi.o
On Wed, Mar 14, 2018 at 06:29:52PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun8i_a23.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add proper and simple kconfig option for dram_sun8i_a33.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 61436cd83f..6e33bd138f 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -24,6 +24,12 @@ config DRAM_SUN8I_A23 Select this dram controller driver for Sun8i platforms, for A23 SOC.
+config DRAM_SUN8I_A33 + bool + help + Select this dram controller driver for Sun8i platforms, + for A33 SOC. + config DRAM_SUN9I bool help @@ -179,6 +185,7 @@ config MACH_SUN8I_A33 select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI + select DRAM_SUN8I_A33 select SUNXI_GEN_SUN6I select SUPPORT_SPL select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index e5a4a158f6..00a9c0a459 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -36,8 +36,8 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o obj-$(CONFIG_DRAM_SUN8I_A23) += dram_sun8i_a23.o +obj-$(CONFIG_DRAM_SUN8I_A33) += dram_sun8i_a33.o obj-$(CONFIG_DRAM_SUN9I) += dram_sun9i.o -obj-$(CONFIG_MACH_SUN8I_A33) += dram_sun8i_a33.o obj-$(CONFIG_MACH_SUN8I_A83T) += dram_sun8i_a83t.o obj-$(CONFIG_SPL_SPI_SUNXI) += spl_spi_sunxi.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o
On Wed, Mar 14, 2018 at 06:29:53PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun8i_a33.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
Add proper and simple kconfig option for dram_sun8i_a83t.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- arch/arm/mach-sunxi/Kconfig | 7 +++++++ arch/arm/mach-sunxi/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 6e33bd138f..797c599df7 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -30,6 +30,12 @@ config DRAM_SUN8I_A33 Select this dram controller driver for Sun8i platforms, for A33 SOC.
+config DRAM_SUN8I_A83T + bool + help + Select this dram controller driver for Sun8i platforms, + for A83T SOC. + config DRAM_SUN9I bool help @@ -193,6 +199,7 @@ config MACH_SUN8I_A33 config MACH_SUN8I_A83T bool "sun8i (Allwinner A83T)" select CPU_V7 + select DRAM_SUN8I_A83T select SUNXI_GEN_SUN6I select MMC_SUNXI_HAS_NEW_MODE select SUPPORT_SPL diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 00a9c0a459..6e7552a010 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -37,8 +37,8 @@ obj-$(CONFIG_DRAM_SUN4I) += dram_sun4i.o obj-$(CONFIG_DRAM_SUN6I) += dram_sun6i.o obj-$(CONFIG_DRAM_SUN8I_A23) += dram_sun8i_a23.o obj-$(CONFIG_DRAM_SUN8I_A33) += dram_sun8i_a33.o +obj-$(CONFIG_DRAM_SUN8I_A83T) += dram_sun8i_a83t.o obj-$(CONFIG_DRAM_SUN9I) += dram_sun9i.o -obj-$(CONFIG_MACH_SUN8I_A83T) += dram_sun8i_a83t.o obj-$(CONFIG_SPL_SPI_SUNXI) += spl_spi_sunxi.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_sunxi_dw.o obj-$(CONFIG_SUNXI_DRAM_DW) += dram_timings/
On Wed, Mar 14, 2018 at 06:29:54PM +0530, Jagan Teki wrote:
Add proper and simple kconfig option for dram_sun8i_a83t.c instead of using MACH type on Makefile.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Acked-by: Maxime Ripard maxime.ripard@bootlin.com
Maxime
participants (3)
-
Jagan Teki -
Jagan Teki -
Maxime Ripard