Skip to contentSkip to conversation

mach-snapdragon/mach-ipq40xx: fix, merge and refactoring

PATCH In review Andrey Volkov 3 participants 12 messages Oct 25, 2022 – Nov 12, 2022

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mach-snapdragon/mach-ipq40xx: fix, merge and refactoring

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV <[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

---
 arch/arm/Kconfig                              |    1 - arch/arm/mach-snapdragon/Kconfig              |   23 +++++++++++++++++-- arch/arm/mach-snapdragon/Makefile             |   31 ++++++++++++++----------- arch/arm/mach-snapdragon/pinctrl-snapdragon.c |    2 +- drivers/reset/reset-qcom.c                    |    2 +-

 5 files changed, 40 insertions(+), 19 deletions(-)
arch/arm/Kconfig +0 -0
index 2e83394052..a25b7f6d99 100644
@@ -1098,7 +1098,6 @@ config ARCH_RMOBILE


 config ARCH_SNAPDRAGON
     bool "Qualcomm Snapdragon SoCs"
-    select ARM64
     select DM
     select DM_GPIO
     select DM_SERIAL

arch/arm/mach-snapdragon/Kconfig +0 -0
index 0927333306..83dd2c07a1 100644
@@ -9,10 +9,27 @@ config SYS_MALLOC_F_LEN

 config SPL_SYS_MALLOC_F_LEN
     default 0x2000

+config APQ8016
+    bool
+    select ARM64
+    default n
+
+config APQ8096
+    bool
+    select ARM64
+    default n
+
 config SDM845
-    bool "Qualcomm Snapdragon 845 SoC"
+    bool
+    select ARM64
+    select LINUX_KERNEL_IMAGE_HEADER
     default n
+
+config QCS40X
+    bool
+    select ARM64
     select LINUX_KERNEL_IMAGE_HEADER
+    default n

 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
     default 0x80000000
@@ -23,6 +40,7 @@ choice
 config TARGET_DRAGONBOARD410C
     bool "96Boards Dragonboard 410C"
     select BOARD_LATE_INIT
+    select APQ8016
     select ENABLE_ARM_SOC_BOOT0_HOOK
     help
       Support for 96Boards Dragonboard 410C. This board complies with @@ -37,6 +55,7 @@ config TARGET_DRAGONBOARD410C

 config TARGET_DRAGONBOARD820C
     bool "96Boards Dragonboard 820C"
+    select APQ8096
     help
       Support for 96Boards Dragonboard 820C. This board complies with 96Board Open Platform Specifications. Features:
@@ -71,7 +90,7 @@ config TARGET_STARQLTECHN

 config TARGET_QCS404EVB
     bool "Qualcomm Technologies, Inc. QCS404 EVB"
-    select LINUX_KERNEL_IMAGE_HEADER
+    select QCS40X
     help
       Support for Qualcomm Technologies, Inc. QCS404 evaluation board. Features:

arch/arm/mach-snapdragon/Makefile +0 -0
index cbaaf23f6b..00997196ab 100644
@@ -2,20 +2,23 @@

 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
+obj-y += clock-snapdragon.o
+obj-y += pinctrl-snapdragon.o
+
 obj-$(CONFIG_SDM845) += clock-sdm845.o
 obj-$(CONFIG_SDM845) += sysmap-sdm845.o obj-$(CONFIG_SDM845) += init_sdm845.o -obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o -obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o -obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o -obj-y += misc.o
-obj-y += clock-snapdragon.o
-obj-y += dram.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-apq8016.o
-obj-y += pinctrl-apq8096.o
-obj-y += pinctrl-qcs404.o
-obj-y += pinctrl-sdm845.o
-obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o -obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o +obj-$(CONFIG_SDM845) += pinctrl-sdm845.o
+
+obj-$(CONFIG_APQ8096) += clock-apq8096.o +obj-$(CONFIG_APQ8096) += sysmap-apq8096.o +obj-$(CONFIG_APQ8096) += pinctrl-apq8096.o
+
+obj-$(CONFIG_APQ8016) += clock-apq8016.o +obj-$(CONFIG_APQ8016) += sysmap-apq8016.o +obj-$(CONFIG_APQ8016) += pinctrl-apq8016.o +obj-$(CONFIG_APQ8016) += misc.o dram.o
+
+obj-$(CONFIG_QCS40X) += clock-qcs404.o +obj-$(CONFIG_QCS40X) += sysmap-qcs404.o +obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o

arch/arm/mach-snapdragon/pinctrl-snapdragon.c +0 -0
index ab884ab6bf..4ed4ab4d4c 100644
@@ -149,7 +149,7 @@ static const struct udevice_id msm_pinctrl_ids[] = {

     { }
 };

-U_BOOT_DRIVER(pinctrl_snapdraon) = {
+U_BOOT_DRIVER(pinctrl_snapdragon) = {
     .name        = "pinctrl_msm",
     .id        = UCLASS_PINCTRL,
     .of_match    = msm_pinctrl_ids,

drivers/reset/reset-qcom.c +0 -0
index 94315e76d5..2c61d6a6dc 100644
@@ -102,7 +102,7 @@ static const struct qcom_reset_map gcc_qcom_resets[] = {

 };
 #endif

-#ifdef CONFIG_TARGET_QCS404EVB
+#ifdef CONFIG_QCS40X
 #include <dt-bindings/clock/qcom,gcc-qcs404.h> static const struct qcom_reset_map gcc_qcom_resets[] = { [GCC_GENI_IR_BCR] = { 0x0F000 },

#1 lore raw
Quoted 11 lines · Andrey Volkov

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV <[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

I like this cleanup effort, however, can you rebase this to apply on the master? I would like to use this as a base of moving IPQ40xx to use Linux DTS and keep it in sync.

Regards,
Robert

Quoted 146 lines
---
 arch/arm/Kconfig                              |    1 -
 arch/arm/mach-snapdragon/Kconfig              |   23 +++++++++++++++++--
 arch/arm/mach-snapdragon/Makefile             |   31 ++++++++++++++-----------
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |    2 +-
 drivers/reset/reset-qcom.c                    |    2 +-
 5 files changed, 40 insertions(+), 19 deletions(-)
arch/arm/Kconfig +0 -1
index 2e83394052..a25b7f6d99 100644
@@ -1098,7 +1098,6 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
     bool "Qualcomm Snapdragon SoCs"
-    select ARM64
     select DM
     select DM_GPIO
     select DM_SERIAL
arch/arm/mach-snapdragon/Kconfig +21 -2
index 0927333306..83dd2c07a1 100644
@@ -9,10 +9,27 @@ config SYS_MALLOC_F_LEN
 config SPL_SYS_MALLOC_F_LEN
     default 0x2000
 
+config APQ8016
+    bool
+    select ARM64
+    default n
+
+config APQ8096
+    bool
+    select ARM64
+    default n
+
 config SDM845
-    bool "Qualcomm Snapdragon 845 SoC"
+    bool
+    select ARM64
+    select LINUX_KERNEL_IMAGE_HEADER
     default n
+
+config QCS40X
+    bool
+    select ARM64
     select LINUX_KERNEL_IMAGE_HEADER
+    default n
 
 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
     default 0x80000000
@@ -23,6 +40,7 @@ choice
 config TARGET_DRAGONBOARD410C
     bool "96Boards Dragonboard 410C"
     select BOARD_LATE_INIT
+    select APQ8016
     select ENABLE_ARM_SOC_BOOT0_HOOK
     help
       Support for 96Boards Dragonboard 410C. This board complies with
@@ -37,6 +55,7 @@ config TARGET_DRAGONBOARD410C
 
 config TARGET_DRAGONBOARD820C
     bool "96Boards Dragonboard 820C"
+    select APQ8096
     help
       Support for 96Boards Dragonboard 820C. This board complies with
       96Board Open Platform Specifications. Features:
@@ -71,7 +90,7 @@ config TARGET_STARQLTECHN
 
 config TARGET_QCS404EVB
     bool "Qualcomm Technologies, Inc. QCS404 EVB"
-    select LINUX_KERNEL_IMAGE_HEADER
+    select QCS40X
     help
       Support for Qualcomm Technologies, Inc. QCS404 evaluation board.
       Features:
arch/arm/mach-snapdragon/Makefile +17 -14
index cbaaf23f6b..00997196ab 100644
@@ -2,20 +2,23 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
+obj-y += clock-snapdragon.o
+obj-y += pinctrl-snapdragon.o
+
 obj-$(CONFIG_SDM845) += clock-sdm845.o
 obj-$(CONFIG_SDM845) += sysmap-sdm845.o
 obj-$(CONFIG_SDM845) += init_sdm845.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o
-obj-y += misc.o
-obj-y += clock-snapdragon.o
-obj-y += dram.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-apq8016.o
-obj-y += pinctrl-apq8096.o
-obj-y += pinctrl-qcs404.o
-obj-y += pinctrl-sdm845.o
-obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o
-obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o
+obj-$(CONFIG_SDM845) += pinctrl-sdm845.o
+
+obj-$(CONFIG_APQ8096) += clock-apq8096.o
+obj-$(CONFIG_APQ8096) += sysmap-apq8096.o
+obj-$(CONFIG_APQ8096) += pinctrl-apq8096.o
+
+obj-$(CONFIG_APQ8016) += clock-apq8016.o
+obj-$(CONFIG_APQ8016) += sysmap-apq8016.o
+obj-$(CONFIG_APQ8016) += pinctrl-apq8016.o
+obj-$(CONFIG_APQ8016) += misc.o dram.o
+
+obj-$(CONFIG_QCS40X) += clock-qcs404.o
+obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
+obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +1 -1
index ab884ab6bf..4ed4ab4d4c 100644
@@ -149,7 +149,7 @@ static const struct udevice_id msm_pinctrl_ids[] = {
     { }
 };
 
-U_BOOT_DRIVER(pinctrl_snapdraon) = {
+U_BOOT_DRIVER(pinctrl_snapdragon) = {
     .name        = "pinctrl_msm",
     .id        = UCLASS_PINCTRL,
     .of_match    = msm_pinctrl_ids,
drivers/reset/reset-qcom.c +1 -1
index 94315e76d5..2c61d6a6dc 100644
@@ -102,7 +102,7 @@ static const struct qcom_reset_map gcc_qcom_resets[] = {
 };
 #endif
 
-#ifdef CONFIG_TARGET_QCS404EVB
+#ifdef CONFIG_QCS40X
 #include <dt-bindings/clock/qcom,gcc-qcs404.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
     [GCC_GENI_IR_BCR] = { 0x0F000 },
Signature · 7 lines
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: [email protected]
Web: www.sartura.hr
#2 lore raw

Hi Robert, Tom,

Updated patches are following, could you review/accept them?

Quoted 8 lines · Robert Marko
Quoted 7 lines · Andrey Volkov

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV<[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Quoted 6 lines
Quoted 3 lines

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

I like this cleanup effort, however, can you rebase this to apply on the master? I would like to use this as a base of moving IPQ40xx to use Linux DTS and keep it in sync.

It's nice idea, except that full blown DTS is huge enough (+some KiB at least), and i'm afraid it's an old, old story about failing to make it :(. Probably will be better if we will have some option that allowed to import and reuse DTS files directly from the kernel.
Something like CONFIG_DTS_FILE_PATH/CONFIG_DTS_INCLUDES/...

@Tom, any additional comments/objections?

Btw As far as I remember, this topic (reuse kernel's DTS) has been discussed repeatedly since the mid-2000s, but I don't remember why it was not implemented yet.

Quoted 3 lines

Regards,
Robert

Regards
Andrey

---
Andrey VOLKOV (2):
SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig ipq40xx/snapdragon: Merge the two, more than 90% overlapping
Qualcomm's Snapdrgon based arches, into one: "mach-snapdragon".

 arch/arm/Kconfig                              |  20 +--
 arch/arm/Makefile                             |   1 -
 arch/arm/mach-ipq40xx/Kconfig                 |  15 --
 arch/arm/mach-ipq40xx/Makefile                |   9 -
 arch/arm/mach-ipq40xx/include/mach/gpio.h     |  10 --
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    | 166 ------------------
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h    |  30 ----
 arch/arm/mach-snapdragon/Kconfig              |  62 ++++++-
 arch/arm/mach-snapdragon/Makefile             |  34 ++--
 .../clock-ipq4019.c                           |   0
 .../pinctrl-ipq4019.c                         |   0
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  48 +++--
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |   1 +
 drivers/phy/qcom/Kconfig                      |   2 +-
 drivers/reset/Kconfig                         |   2 +-
 drivers/reset/reset-qcom.c                    |   4 +-
 drivers/smem/Kconfig                          |   2 +-
 drivers/spi/Kconfig                           |   2 +-
 18 files changed, 123 insertions(+), 285 deletions(-)
 delete mode 100644 arch/arm/mach-ipq40xx/Kconfig
 delete mode 100644 arch/arm/mach-ipq40xx/Makefile
 delete mode 100644 arch/arm/mach-ipq40xx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/clock-ipq4019.c (100%)
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/pinctrl-ipq4019.c (100%)
Signature · 1 line
2.34.1
#3 lore raw
Quoted 26 lines · Andrey VOLKOV

Hi Robert, Tom,

Updated patches are following, could you review/accept them?

Quoted 8 lines · Robert Marko
Quoted 7 lines · Andrey Volkov

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV<[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Quoted 6 lines
Quoted 3 lines

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

I like this cleanup effort, however, can you rebase this to apply on the master? I would like to use this as a base of moving IPQ40xx to use Linux DTS and keep it in sync.

It's nice idea, except that full blown DTS is huge enough (+some KiB at least), and i'm afraid it's an old, old story about failing to make it :(. Probably will be better if we will have some option that allowed to import and reuse DTS files directly from the kernel.
Something like CONFIG_DTS_FILE_PATH/CONFIG_DTS_INCLUDES/...

Quoted 4 lines

@Tom, any additional comments/objections?

Btw As far as I remember, this topic (reuse kernel's DTS) has been discussed repeatedly since the mid-2000s, but I don't remember why it was not implemented yet.

Is the problem that the full DTS would make the resulting binary too large to fit in some restricted and can't be changed easily space? Generally we do want to keep the DTS files in-sync with the kernel.

Signature · 1 line
Tom
#4 lore raw
Quoted 28 lines · Tom Rini
Quoted 26 lines · Andrey VOLKOV

Hi Robert, Tom,

Updated patches are following, could you review/accept them?

Quoted 8 lines · Robert Marko
Quoted 7 lines · Andrey Volkov

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV<[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Quoted 6 lines
Quoted 3 lines

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

I like this cleanup effort, however, can you rebase this to apply on the master? I would like to use this as a base of moving IPQ40xx to use Linux DTS and keep it in sync.

It's nice idea, except that full blown DTS is huge enough (+some KiB at least), and i'm afraid it's an old, old story about failing to make it :(. Probably will be better if we will have some option that allowed to import and reuse DTS files directly from the kernel.
Something like CONFIG_DTS_FILE_PATH/CONFIG_DTS_INCLUDES/...

Quoted 8 lines
Quoted 4 lines

@Tom, any additional comments/objections?

Btw As far as I remember, this topic (reuse kernel's DTS) has been discussed repeatedly since the mid-2000s, but I don't remember why it was not implemented yet.

Is the problem that the full DTS would make the resulting binary too large to fit in some restricted and can't be changed easily space? Generally we do want to keep the DTS files in-sync with the kernel.

Most IPQ40xx devices have a slot of 512kB left for the bootloader which cannot be easily
expanded, however, that should still be enough for synced DTS anyway.

I am now more familiar with U-boot and really dont like the IPQ40xx target as it is and
would like to rework it, including using upstream DTS.

Regards,
Robert

Quoted 3 lines

--
Tom

Signature · 7 lines
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: [email protected]
Web: www.sartura.hr
#5 lore raw
Quoted 34 lines · Robert Marko
Quoted 33 lines · Tom Rini
Quoted 30 lines · Andrey VOLKOV

Hi Robert, Tom,

Updated patches are following, could you review/accept them?

Quoted 8 lines · Robert Marko
Quoted 7 lines · Andrey Volkov

SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

From: Andrey VOLKOV<[email protected]>

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Quoted 6 lines
Quoted 3 lines

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

I like this cleanup effort, however, can you rebase this to apply on the master? I would like to use this as a base of moving IPQ40xx to use Linux DTS and keep it in sync.

It's nice idea, except that full blown DTS is huge enough (+some KiB at least), and i'm afraid it's an old, old story about failing to make it :(. Probably will be better if we will have some option that allowed to import and reuse DTS files directly from the kernel.
Something like CONFIG_DTS_FILE_PATH/CONFIG_DTS_INCLUDES/...

@Tom, any additional comments/objections?

Btw As far as I remember, this topic (reuse kernel's DTS) has been discussed repeatedly since the mid-2000s, but I don't remember why it was not implemented yet.

Quoted 7 lines
Quoted 3 lines

Is the problem that the full DTS would make the resulting binary too large to fit in some restricted and can't be changed easily space? Generally we do want to keep the DTS files in-sync with the kernel.

Most IPQ40xx devices have a slot of 512kB left for the bootloader which cannot be easily
expanded, however, that should still be enough for synced DTS anyway.

This is about what I was expecting. And if we need to develop more tooling to better support this, that's a problem we should solve. We do have for example MULTI_DTB_FIT_GZIP (or LZO) but it might need a bit more tweaking to be available / usable in all cases?

Signature · 1 line
Tom
#6 lore raw

PATCH v2 1/2 SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

In reply to Robert Marko

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

---
 arch/arm/Kconfig                              |  1 -
 arch/arm/mach-snapdragon/Kconfig              | 23 ++++++++++++--
 arch/arm/mach-snapdragon/Makefile             | 31 ++++++++++---------
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 10 +++++-
 drivers/reset/reset-qcom.c                    |  2 +-
 5 files changed, 48 insertions(+), 19 deletions(-)
arch/arm/Kconfig +0 -1
index 453bef900e..cdc8d4aeb4 100644
@@ -1076,7 +1076,6 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
 	bool "Qualcomm Snapdragon SoCs"
-	select ARM64
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
arch/arm/mach-snapdragon/Kconfig +21 -2
index 0927333306..83dd2c07a1 100644
@@ -9,10 +9,27 @@ config SYS_MALLOC_F_LEN
 config SPL_SYS_MALLOC_F_LEN
 	default 0x2000
 
+config APQ8016
+	bool
+	select ARM64
+	default n
+
+config APQ8096
+	bool
+	select ARM64
+	default n
+
 config SDM845
-	bool "Qualcomm Snapdragon 845 SoC"
+	bool
+	select ARM64
+	select LINUX_KERNEL_IMAGE_HEADER
 	default n
+
+config QCS40X
+	bool
+	select ARM64
 	select LINUX_KERNEL_IMAGE_HEADER
+	default n
 
 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 	default 0x80000000
@@ -23,6 +40,7 @@ choice
 config TARGET_DRAGONBOARD410C
 	bool "96Boards Dragonboard 410C"
 	select BOARD_LATE_INIT
+	select APQ8016
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	help
 	  Support for 96Boards Dragonboard 410C. This board complies with
@@ -37,6 +55,7 @@ config TARGET_DRAGONBOARD410C
 
 config TARGET_DRAGONBOARD820C
 	bool "96Boards Dragonboard 820C"
+	select APQ8096
 	help
 	  Support for 96Boards Dragonboard 820C. This board complies with
 	  96Board Open Platform Specifications. Features:
@@ -71,7 +90,7 @@ config TARGET_STARQLTECHN
 
 config TARGET_QCS404EVB
 	bool "Qualcomm Technologies, Inc. QCS404 EVB"
-	select LINUX_KERNEL_IMAGE_HEADER
+	select QCS40X
 	help
 	  Support for Qualcomm Technologies, Inc. QCS404 evaluation board.
 	  Features:
arch/arm/mach-snapdragon/Makefile +17 -14
index cbaaf23f6b..00997196ab 100644
@@ -2,20 +2,23 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
+obj-y += clock-snapdragon.o
+obj-y += pinctrl-snapdragon.o
+
 obj-$(CONFIG_SDM845) += clock-sdm845.o
 obj-$(CONFIG_SDM845) += sysmap-sdm845.o
 obj-$(CONFIG_SDM845) += init_sdm845.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o
-obj-y += misc.o
-obj-y += clock-snapdragon.o
-obj-y += dram.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-apq8016.o
-obj-y += pinctrl-apq8096.o
-obj-y += pinctrl-qcs404.o
-obj-y += pinctrl-sdm845.o
-obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o
-obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o
+obj-$(CONFIG_SDM845) += pinctrl-sdm845.o
+
+obj-$(CONFIG_APQ8096) += clock-apq8096.o
+obj-$(CONFIG_APQ8096) += sysmap-apq8096.o
+obj-$(CONFIG_APQ8096) += pinctrl-apq8096.o
+
+obj-$(CONFIG_APQ8016) += clock-apq8016.o
+obj-$(CONFIG_APQ8016) += sysmap-apq8016.o
+obj-$(CONFIG_APQ8016) += pinctrl-apq8016.o
+obj-$(CONFIG_APQ8016) += misc.o dram.o
+
+obj-$(CONFIG_QCS40X) += clock-qcs404.o
+obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
+obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +9 -1
index ab884ab6bf..0740993b61 100644
@@ -142,14 +142,22 @@ static int msm_pinctrl_bind(struct udevice *dev)
 }
 
 static const struct udevice_id msm_pinctrl_ids[] = {
+#ifdef CONFIG_APQ8016
 	{ .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
+#endif
+#ifdef CONFIG_APQ8096
 	{ .compatible = "qcom,msm8996-pinctrl", .data = (ulong)&apq8096_data },
+#endif
+#ifdef CONFIG_SDM845
 	{ .compatible = "qcom,sdm845-pinctrl", .data = (ulong)&sdm845_data },
+#endif
+#ifdef CONFIG_QCS40X
 	{ .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
 	{ }
 };
 
-U_BOOT_DRIVER(pinctrl_snapdraon) = {
+U_BOOT_DRIVER(pinctrl_snapdragon) = {
 	.name		= "pinctrl_msm",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= msm_pinctrl_ids,
drivers/reset/reset-qcom.c +1 -1
index 94315e76d5..2c61d6a6dc 100644
@@ -102,7 +102,7 @@ static const struct qcom_reset_map gcc_qcom_resets[] = {
 };
 #endif
 
-#ifdef CONFIG_TARGET_QCS404EVB
+#ifdef CONFIG_QCS40X
 #include <dt-bindings/clock/qcom,gcc-qcs404.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
 	[GCC_GENI_IR_BCR] = { 0x0F000 },
Signature · 1 line
2.34.1
#7 lore raw

PATCH v2 2/2 ipq40xx/snapdragon: Merge the two, more than 90% overlapping Qualcomm's Snapdrgon based arches, into one: "mach-snapdragon".

In reply to Robert Marko
---
 arch/arm/Kconfig                              |  19 +-
 arch/arm/Makefile                             |   1 -
 arch/arm/mach-ipq40xx/Kconfig                 |  15 --
 arch/arm/mach-ipq40xx/Makefile                |   9 -
 arch/arm/mach-ipq40xx/include/mach/gpio.h     |  10 --
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    | 166 ------------------
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h    |  30 ----
 arch/arm/mach-snapdragon/Kconfig              |  47 ++++-
 arch/arm/mach-snapdragon/Makefile             |   5 +-
 .../clock-ipq4019.c                           |   0
 .../pinctrl-ipq4019.c                         |   0
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  38 ++--
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |   1 +
 drivers/phy/qcom/Kconfig                      |   2 +-
 drivers/reset/Kconfig                         |   2 +-
 drivers/reset/reset-qcom.c                    |   2 +-
 drivers/smem/Kconfig                          |   2 +-
 drivers/spi/Kconfig                           |   2 +-
 18 files changed, 80 insertions(+), 271 deletions(-)
 delete mode 100644 arch/arm/mach-ipq40xx/Kconfig
 delete mode 100644 arch/arm/mach-ipq40xx/Makefile
 delete mode 100644 arch/arm/mach-ipq40xx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/clock-ipq4019.c (100%)
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/pinctrl-ipq4019.c (100%)
arch/arm/Kconfig +2 -17
index cdc8d4aeb4..d94ca7dcf9 100644
@@ -781,21 +781,6 @@ config ARCH_INTEGRATOR
 	select PL01X_SERIAL
 	imply CMD_DM
 
-config ARCH_IPQ40XX
-	bool "Qualcomm IPQ40xx SoCs"
-	select CPU_V7A
-	select DM
-	select DM_GPIO
-	select DM_SERIAL
-	select DM_RESET
-	select GPIO_EXTRA_HEADER
-	select MSM_SMEM
-	select PINCTRL
-	select CLK
-	select SMEM
-	select OF_CONTROL
-	imply CMD_DM
-
 config ARCH_KEYSTONE
 	bool "TI Keystone"
 	select CMD_POWEROFF
@@ -1076,6 +1061,7 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
 	bool "Qualcomm Snapdragon SoCs"
+	select CLK
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
@@ -1083,6 +1069,7 @@ config ARCH_SNAPDRAGON
 	select MSM_SMEM
 	select OF_CONTROL
 	select OF_SEPARATE
+	select PINCTRL
 	select SMEM
 	select SPMI
 	imply CMD_DM
@@ -2203,8 +2190,6 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
-source "arch/arm/mach-ipq40xx/Kconfig"
-
 source "arch/arm/mach-k3/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
arch/arm/Makefile +0 -1
index ac602aed9c..ceee6a02d0 100644
@@ -61,7 +61,6 @@ machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
 machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_GXP)		+= hpe
 machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
-machine-$(CONFIG_ARCH_IPQ40XX)		+= ipq40xx
 machine-$(CONFIG_ARCH_K3)		+= k3
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 machine-$(CONFIG_ARCH_KIRKWOOD)		+= kirkwood
arch/arm/mach-ipq40xx/Kconfig deleted +0 -15
deleted file mode 100644
index f9db55c42a..0000000000
@@ -1,15 +0,0 @@
-if ARCH_IPQ40XX
-
-config SYS_SOC
-	default "ipq40xx"
-
-config SYS_MALLOC_F_LEN
-	default 0x2000
-
-config TEXT_BASE
-	default 0x87300000
-
-config NR_DRAM_BANKS
-	default 1
-
-endif
arch/arm/mach-ipq40xx/Makefile deleted +0 -9
deleted file mode 100644
index 08a65b8854..0000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2019 Sartura Ltd.
-#
-# Author: Robert Marko <[email protected]>
-
-obj-y += clock-ipq4019.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-ipq4019.o
arch/arm/mach-ipq40xx/include/mach/gpio.h deleted +0 -10
deleted file mode 100644
index a45747c0fe..0000000000
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Empty gpio.h
- *
- * This file must stay as arch/arm/include/asm/gpio.h requires it.
- *
- * Copyright (c) 2019 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- */
arch/arm/mach-ipq40xx/pinctrl-snapdragon.c deleted +0 -166

166 lines not on this page · raw message

arch/arm/mach-ipq40xx/pinctrl-snapdragon.h deleted +0 -30
deleted file mode 100644
index 2341a71349..0000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Qualcomm Pin control
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- */
-#ifndef _PINCTRL_SNAPDRAGON_H
-#define _PINCTRL_SNAPDRAGON_H
-
-#include <common.h>
-
-struct msm_pinctrl_data {
-	int pin_count;
-	int functions_count;
-	const char *(*get_function_name)(struct udevice *dev,
-					 unsigned int selector);
-	unsigned int (*get_function_mux)(unsigned int selector);
-	const char *(*get_pin_name)(struct udevice *dev,
-				    unsigned int selector);
-};
-
-struct pinctrl_function {
-	const char *name;
-	int val;
-};
-
-extern struct msm_pinctrl_data ipq4019_data;
-
-#endif
arch/arm/mach-snapdragon/Kconfig +43 -4

77 lines not on this page · raw message

arch/arm/mach-snapdragon/Makefile +4 -1
index 00997196ab..89e5a49780 100644
@@ -2,7 +2,7 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
-obj-y += clock-snapdragon.o
+obj-$(CONFIG_COMMON_SNAPDRAGON) += clock-snapdragon.o
 obj-y += pinctrl-snapdragon.o
 
 obj-$(CONFIG_SDM845) += clock-sdm845.o
@@ -22,3 +22,6 @@ obj-$(CONFIG_APQ8016) += misc.o dram.o
 obj-$(CONFIG_QCS40X) += clock-qcs404.o
 obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
 obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
+
+obj-$(CONFIG_IPQ40XX) += clock-ipq4019.o
+obj-$(CONFIG_IPQ40XX) += pinctrl-ipq4019.o
arch/arm/mach-snapdragon/clock-ipq4019.c renamed from arch/arm/mach-ipq40xx/clock-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/clock-ipq4019.c
rename to arch/arm/mach-snapdragon/clock-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-ipq4019.c renamed from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c
rename to arch/arm/mach-snapdragon/pinctrl-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +25 -13
index 0740993b61..8d7cb1944f 100644
@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * TLMM driver for Qualcomm APQ8016, APQ8096
+ * TLMM driver for Qualcomm Snapdragon SOCs
  *
  * (C) Copyright 2018 Ramon Fried <[email protected]>
  *
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <[email protected]>
+ *
  */
 
 #include <common.h>
@@ -30,6 +34,7 @@ struct msm_pinctrl_priv {
 static const struct pinconf_param msm_conf_params[] = {
 	{ "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 3 },
 	{ "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
+	{ "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
 };
 
 static int msm_get_functions_count(struct udevice *dev)
@@ -96,6 +101,10 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
 		clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
 			     TLMM_GPIO_PULL_MASK);
 		break;
+	case PIN_CONFIG_BIAS_PULL_UP:
+		clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
+			     TLMM_GPIO_PULL_MASK, argument);
+		break;
 	default:
 		return 0;
 	}
@@ -103,18 +112,6 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
 	return 0;
 }
 
-static struct pinctrl_ops msm_pinctrl_ops = {
-	.get_pins_count = msm_get_pins_count,
-	.get_pin_name = msm_get_pin_name,
-	.set_state = pinctrl_generic_set_state,
-	.pinmux_set = msm_pinmux_set,
-	.pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-	.pinconf_params = msm_conf_params,
-	.pinconf_set = msm_pinconf_set,
-	.get_functions_count = msm_get_functions_count,
-	.get_function_name = msm_get_function_name,
-};
-
 static int msm_pinctrl_bind(struct udevice *dev)
 {
 	ofnode node = dev_ofnode(dev);
@@ -141,6 +138,18 @@ static int msm_pinctrl_bind(struct udevice *dev)
 	return 0;
 }
 
+static struct pinctrl_ops msm_pinctrl_ops = {
+	.get_pins_count = msm_get_pins_count,
+	.get_pin_name = msm_get_pin_name,
+	.set_state = pinctrl_generic_set_state,
+	.pinmux_set = msm_pinmux_set,
+	.pinconf_num_params = ARRAY_SIZE(msm_conf_params),
+	.pinconf_params = msm_conf_params,
+	.pinconf_set = msm_pinconf_set,
+	.get_functions_count = msm_get_functions_count,
+	.get_function_name = msm_get_function_name,
+};
+
 static const struct udevice_id msm_pinctrl_ids[] = {
 #ifdef CONFIG_APQ8016
 	{ .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
@@ -153,6 +162,9 @@ static const struct udevice_id msm_pinctrl_ids[] = {
 #endif
 #ifdef CONFIG_QCS40X
 	{ .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
+#ifdef CONFIG_IPQ40XX
+	{ .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
 #endif
 	{ }
 };
arch/arm/mach-snapdragon/pinctrl-snapdragon.h +1 -0
index 178ee01a41..2ba61a45b3 100644
@@ -29,5 +29,6 @@ extern struct msm_pinctrl_data apq8016_data;
 extern struct msm_pinctrl_data apq8096_data;
 extern struct msm_pinctrl_data sdm845_data;
 extern struct msm_pinctrl_data qcs404_data;
+extern struct msm_pinctrl_data ipq4019_data;
 
 #endif
drivers/phy/qcom/Kconfig +1 -1
index f4ca174805..cdc73d46b4 100644
@@ -8,7 +8,7 @@ config MSM8916_USB_PHY
 
 config PHY_QCOM_IPQ4019_USB
 	tristate "Qualcomm IPQ4019 USB PHY driver"
-	depends on PHY && ARCH_IPQ40XX
+	depends on PHY && IPQ40XX
 	help
 	  Support for the USB PHY-s on Qualcomm IPQ40xx SoC-s.
 
drivers/reset/Kconfig +1 -1
index 4cb0ba0850..a3d5fe8872 100644
@@ -158,7 +158,7 @@ config RESET_IMX7
 
 config RESET_QCOM
 	bool "Reset driver for Qualcomm SoCs"
-	depends on DM_RESET && (ARCH_SNAPDRAGON || ARCH_IPQ40XX)
+	depends on DM_RESET && ARCH_SNAPDRAGON
 	default y
 	help
 	  Support for reset controller on Qualcomm SoCs.
drivers/reset/reset-qcom.c +1 -1
index 2c61d6a6dc..7e5eae190d 100644
@@ -25,7 +25,7 @@ struct qcom_reset_map {
 	u8 bit;
 };
 
-#ifdef CONFIG_ARCH_IPQ40XX
+#ifdef CONFIG_IPQ40XX
 #include <dt-bindings/reset/qcom,ipq4019-reset.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
 	[WIFI0_CPU_INIT_RESET] = { 0x1f008, 5 },
drivers/smem/Kconfig +1 -1
index 73d51b3a7a..7169d0f205 100644
@@ -15,7 +15,7 @@ config SANDBOX_SMEM
 config MSM_SMEM
     bool "Qualcomm Shared Memory Manager (SMEM)"
     depends on DM
-    depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
+    depends on ARCH_SNAPDRAGON
     help
       Enable support for the Qualcomm Shared Memory Manager.
       The driver provides an interface to items in a heap shared among all
drivers/spi/Kconfig +1 -1
index c6900f449d..d9f8a1c196 100644
@@ -371,7 +371,7 @@ config PL022_SPI
 
 config SPI_QUP
 	bool "Qualcomm SPI controller with QUP interface"
-	depends on ARCH_IPQ40XX
+	depends on ARCH_SNAPDRAGON
 	help
 	  Qualcomm Universal Peripheral (QUP) core is an AHB slave that
 	  provides a common data path (an output FIFO and an input FIFO)
Signature · 1 line
2.34.1
#8 lore raw

Re: [PATCH v2 2/2] ipq40xx/snapdragon: Merge the two, more than 90% overlapping Qualcomm's Snapdrgon based arches, into one: "mach-snapdragon".

Quoted 400 lines · Andrey VOLKOV
---
 arch/arm/Kconfig                              |  19 +-
 arch/arm/Makefile                             |   1 -
 arch/arm/mach-ipq40xx/Kconfig                 |  15 --
 arch/arm/mach-ipq40xx/Makefile                |   9 -
 arch/arm/mach-ipq40xx/include/mach/gpio.h     |  10 --
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    | 166 ------------------
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h    |  30 ----
 arch/arm/mach-snapdragon/Kconfig              |  47 ++++-
 arch/arm/mach-snapdragon/Makefile             |   5 +-
 .../clock-ipq4019.c                           |   0
 .../pinctrl-ipq4019.c                         |   0
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  38 ++--
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |   1 +
 drivers/phy/qcom/Kconfig                      |   2 +-
 drivers/reset/Kconfig                         |   2 +-
 drivers/reset/reset-qcom.c                    |   2 +-
 drivers/smem/Kconfig                          |   2 +-
 drivers/spi/Kconfig                           |   2 +-
 18 files changed, 80 insertions(+), 271 deletions(-)
 delete mode 100644 arch/arm/mach-ipq40xx/Kconfig
 delete mode 100644 arch/arm/mach-ipq40xx/Makefile
 delete mode 100644 arch/arm/mach-ipq40xx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/clock-ipq4019.c (100%)
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/pinctrl-ipq4019.c (100%)
arch/arm/Kconfig +2 -17
index cdc8d4aeb4..d94ca7dcf9 100644
@@ -781,21 +781,6 @@ config ARCH_INTEGRATOR
        select PL01X_SERIAL
        imply CMD_DM
 
-config ARCH_IPQ40XX
-       bool "Qualcomm IPQ40xx SoCs"
-       select CPU_V7A
-       select DM
-       select DM_GPIO
-       select DM_SERIAL
-       select DM_RESET
-       select GPIO_EXTRA_HEADER
-       select MSM_SMEM
-       select PINCTRL
-       select CLK
-       select SMEM
-       select OF_CONTROL
-       imply CMD_DM
-
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CMD_POWEROFF
@@ -1076,6 +1061,7 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
        bool "Qualcomm Snapdragon SoCs"
+       select CLK
        select DM
        select DM_GPIO
        select DM_SERIAL
@@ -1083,6 +1069,7 @@ config ARCH_SNAPDRAGON
        select MSM_SMEM
        select OF_CONTROL
        select OF_SEPARATE
+       select PINCTRL
        select SMEM
        select SPMI
        imply CMD_DM
@@ -2203,8 +2190,6 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
-source "arch/arm/mach-ipq40xx/Kconfig"
-
 source "arch/arm/mach-k3/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
arch/arm/Makefile +0 -1
index ac602aed9c..ceee6a02d0 100644
@@ -61,7 +61,6 @@ machine-$(CONFIG_ARCH_DAVINCI)                += davinci
 machine-$(CONFIG_ARCH_EXYNOS)          += exynos
 machine-$(CONFIG_ARCH_GXP)             += hpe
 machine-$(CONFIG_ARCH_HIGHBANK)                += highbank
-machine-$(CONFIG_ARCH_IPQ40XX)         += ipq40xx
 machine-$(CONFIG_ARCH_K3)              += k3
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 machine-$(CONFIG_ARCH_KIRKWOOD)                += kirkwood
arch/arm/mach-ipq40xx/Kconfig deleted +0 -15
deleted file mode 100644
index f9db55c42a..0000000000
@@ -1,15 +0,0 @@
-if ARCH_IPQ40XX
-
-config SYS_SOC
-       default "ipq40xx"
-
-config SYS_MALLOC_F_LEN
-       default 0x2000
-
-config TEXT_BASE
-       default 0x87300000
-
-config NR_DRAM_BANKS
-       default 1
-
-endif
arch/arm/mach-ipq40xx/Makefile deleted +0 -9
deleted file mode 100644
index 08a65b8854..0000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2019 Sartura Ltd.
-#
-# Author: Robert Marko <[email protected]>
-
-obj-y += clock-ipq4019.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-ipq4019.o
arch/arm/mach-ipq40xx/include/mach/gpio.h deleted +0 -10
deleted file mode 100644
index a45747c0fe..0000000000
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Empty gpio.h
- *
- * This file must stay as arch/arm/include/asm/gpio.h requires it.
- *
- * Copyright (c) 2019 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- */
arch/arm/mach-ipq40xx/pinctrl-snapdragon.c deleted +0 -166
deleted file mode 100644
index 036fec93d7..0000000000
@@ -1,166 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * TLMM driver for Qualcomm IPQ40xx
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- * Copyright (c) 2020 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- *
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <dm/device_compat.h>
-#include <dm/lists.h>
-#include <dm/pinctrl.h>
-#include <linux/bitops.h>
-#include "pinctrl-snapdragon.h"
-
-struct msm_pinctrl_priv {
-       phys_addr_t base;
-       struct msm_pinctrl_data *data;
-};
-
-#define GPIO_CONFIG_OFFSET(x)         ((x) * 0x1000)
-#define TLMM_GPIO_PULL_MASK GENMASK(1, 0)
-#define TLMM_FUNC_SEL_MASK GENMASK(5, 2)
-#define TLMM_DRV_STRENGTH_MASK GENMASK(8, 6)
-#define TLMM_GPIO_DISABLE BIT(9)
-
-static const struct pinconf_param msm_conf_params[] = {
-       { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 2 },
-       { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
-       { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
-};
-
-static int msm_get_functions_count(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->functions_count;
-}
-
-static int msm_get_pins_count(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->pin_count;
-}
-
-static const char *msm_get_function_name(struct udevice *dev,
-                                        unsigned int selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->get_function_name(dev, selector);
-}
-
-static int msm_pinctrl_probe(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       priv->base = devfdt_get_addr(dev);
-       priv->data = (struct msm_pinctrl_data *)dev->driver_data;
-
-       return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
-}
-
-static const char *msm_get_pin_name(struct udevice *dev, unsigned int selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->get_pin_name(dev, selector);
-}
-
-static int msm_pinmux_set(struct udevice *dev, unsigned int pin_selector,
-                         unsigned int func_selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                       TLMM_FUNC_SEL_MASK | TLMM_GPIO_DISABLE,
-                       priv->data->get_function_mux(func_selector) << 2);
-       return 0;
-}
-
-static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
-                          unsigned int param, unsigned int argument)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       switch (param) {
-       case PIN_CONFIG_DRIVE_STRENGTH:
-               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                               TLMM_DRV_STRENGTH_MASK, argument << 6);
-               break;
-       case PIN_CONFIG_BIAS_DISABLE:
-               clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                            TLMM_GPIO_PULL_MASK);
-               break;
-       case PIN_CONFIG_BIAS_PULL_UP:
-               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                            TLMM_GPIO_PULL_MASK, argument);
-               break;
-       default:
-               return 0;
-       }
-
-       return 0;
-}
-
-static int msm_pinctrl_bind(struct udevice *dev)
-{
-       ofnode node = dev_ofnode(dev);
-       const char *name;
-       int ret;
-
-       ofnode_get_property(node, "gpio-controller", &ret);
-       if (ret < 0)
-               return 0;
-
-       /* Get the name of gpio node */
-       name = ofnode_get_name(node);
-       if (!name)
-               return -EINVAL;
-
-       /* Bind gpio node */
-       ret = device_bind_driver_to_node(dev, "gpio_msm",
-                                        name, node, NULL);
-       if (ret)
-               return ret;
-
-       dev_dbg(dev, "bind %s\n", name);
-
-       return 0;
-}
-
-static struct pinctrl_ops msm_pinctrl_ops = {
-       .get_pins_count = msm_get_pins_count,
-       .get_pin_name = msm_get_pin_name,
-       .set_state = pinctrl_generic_set_state,
-       .pinmux_set = msm_pinmux_set,
-       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-       .pinconf_params = msm_conf_params,
-       .pinconf_set = msm_pinconf_set,
-       .get_functions_count = msm_get_functions_count,
-       .get_function_name = msm_get_function_name,
-};
-
-static const struct udevice_id msm_pinctrl_ids[] = {
-       { .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
-       { }
-};
-
-U_BOOT_DRIVER(pinctrl_snapdraon) = {
-       .name           = "pinctrl_msm",
-       .id             = UCLASS_PINCTRL,
-       .of_match       = msm_pinctrl_ids,
-       .priv_auto      = sizeof(struct msm_pinctrl_priv),
-       .ops            = &msm_pinctrl_ops,
-       .probe          = msm_pinctrl_probe,
-       .bind           = msm_pinctrl_bind,
-};
arch/arm/mach-ipq40xx/pinctrl-snapdragon.h deleted +0 -30
deleted file mode 100644
index 2341a71349..0000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Qualcomm Pin control
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- */
-#ifndef _PINCTRL_SNAPDRAGON_H
-#define _PINCTRL_SNAPDRAGON_H
-
-#include <common.h>
-
-struct msm_pinctrl_data {
-       int pin_count;
-       int functions_count;
-       const char *(*get_function_name)(struct udevice *dev,
-                                        unsigned int selector);
-       unsigned int (*get_function_mux)(unsigned int selector);
-       const char *(*get_pin_name)(struct udevice *dev,
-                                   unsigned int selector);
-};
-
-struct pinctrl_function {
-       const char *name;
-       int val;
-};
-
-extern struct msm_pinctrl_data ipq4019_data;
-
-#endif
arch/arm/mach-snapdragon/Kconfig +19 -4
index 83dd2c07a1..6600120248 100644
@@ -9,28 +9,61 @@ config SYS_MALLOC_F_LEN
 config SPL_SYS_MALLOC_F_LEN
        default 0x2000
 
-config APQ8016
+config COMMON_SNAPDRAGON
+       bool
+       default n
+
+config SNAPDRAGON_ARMV8
        bool
        select ARM64
+       select COMMON_SNAPDRAGON
+       default n
+
+config SNAPDRAGON_ARMV7A
+       bool
+       select CPU_V7A
+       default n
+
+config APQ8016
+       bool
+       select SNAPDRAGON_ARMV8
        default n
 
 config APQ8096
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        default n
 
 config SDM845
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        select LINUX_KERNEL_IMAGE_HEADER
        default n
 
 config QCS40X
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        select LINUX_KERNEL_IMAGE_HEADER

arch/arm/mach-snapdragon/Kconfig config SYS_MALLOC_F_LEN · line 56

Quoted 10 lines
arch/arm/mach-snapdragon/Kconfig +8 -0
        default n
 
+config IPQ40XX
+       bool
+       select SNAPDRAGON_ARMV7A
+       select DM_RESET
+       default n
+
+config SYS_LOAD_ADDR
+       default 0x80000000 if (IPQ40XX || SDM845 || QCS40X)

This is not correct for IPQ40xx, it uses 0x84000000 as the default load address.

Regards,
Robert

Quoted 219 lines
arch/arm/mach-snapdragon/Kconfig +16 -0
+       default 0x80080000 if (APQ8096 || APQ8016)
+
+config SYS_TEXT_BASE
+       default 0x8f600000 if APQ8016
+       default 0x87300000 if IPQ40XX
+
+config NR_DRAM_BANKS
+       default 1 if (IPQ40XX || APQ8016)
+       default 2 if APQ8096
+
 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
        default 0x80000000
 
@@ -98,6 +131,12 @@ config TARGET_QCS404EVB
          - 1GiB RAM
          - 8GiB eMMC, uSD slot
 
+config TARGET_IPQ4019
+       bool "Generic IPQ4019 based board"
+       select IPQ40XX
+       help
+         Support for the generic Qualcomm IPQ4019 based board
+
 endchoice
 
 source "board/qualcomm/dragonboard410c/Kconfig"
arch/arm/mach-snapdragon/Makefile +4 -1
index 00997196ab..89e5a49780 100644
@@ -2,7 +2,7 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
-obj-y += clock-snapdragon.o
+obj-$(CONFIG_COMMON_SNAPDRAGON) += clock-snapdragon.o
 obj-y += pinctrl-snapdragon.o
 
 obj-$(CONFIG_SDM845) += clock-sdm845.o
@@ -22,3 +22,6 @@ obj-$(CONFIG_APQ8016) += misc.o dram.o
 obj-$(CONFIG_QCS40X) += clock-qcs404.o
 obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
 obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
+
+obj-$(CONFIG_IPQ40XX) += clock-ipq4019.o
+obj-$(CONFIG_IPQ40XX) += pinctrl-ipq4019.o
arch/arm/mach-snapdragon/clock-ipq4019.c renamed from arch/arm/mach-ipq40xx/clock-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/clock-ipq4019.c
rename to arch/arm/mach-snapdragon/clock-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-ipq4019.c renamed from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c
rename to arch/arm/mach-snapdragon/pinctrl-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +25 -13
index 0740993b61..8d7cb1944f 100644
@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * TLMM driver for Qualcomm APQ8016, APQ8096
+ * TLMM driver for Qualcomm Snapdragon SOCs
  *
  * (C) Copyright 2018 Ramon Fried <[email protected]>
  *
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <[email protected]>
+ *
  */
 
 #include <common.h>
@@ -30,6 +34,7 @@ struct msm_pinctrl_priv {
 static const struct pinconf_param msm_conf_params[] = {
        { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 3 },
        { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
+       { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
 };
 
 static int msm_get_functions_count(struct udevice *dev)
@@ -96,6 +101,10 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
                clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
                             TLMM_GPIO_PULL_MASK);
                break;
+       case PIN_CONFIG_BIAS_PULL_UP:
+               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
+                            TLMM_GPIO_PULL_MASK, argument);
+               break;
        default:
                return 0;
        }
@@ -103,18 +112,6 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
        return 0;
 }
 
-static struct pinctrl_ops msm_pinctrl_ops = {
-       .get_pins_count = msm_get_pins_count,
-       .get_pin_name = msm_get_pin_name,
-       .set_state = pinctrl_generic_set_state,
-       .pinmux_set = msm_pinmux_set,
-       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-       .pinconf_params = msm_conf_params,
-       .pinconf_set = msm_pinconf_set,
-       .get_functions_count = msm_get_functions_count,
-       .get_function_name = msm_get_function_name,
-};
-
 static int msm_pinctrl_bind(struct udevice *dev)
 {
        ofnode node = dev_ofnode(dev);
@@ -141,6 +138,18 @@ static int msm_pinctrl_bind(struct udevice *dev)
        return 0;
 }
 
+static struct pinctrl_ops msm_pinctrl_ops = {
+       .get_pins_count = msm_get_pins_count,
+       .get_pin_name = msm_get_pin_name,
+       .set_state = pinctrl_generic_set_state,
+       .pinmux_set = msm_pinmux_set,
+       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
+       .pinconf_params = msm_conf_params,
+       .pinconf_set = msm_pinconf_set,
+       .get_functions_count = msm_get_functions_count,
+       .get_function_name = msm_get_function_name,
+};
+
 static const struct udevice_id msm_pinctrl_ids[] = {
 #ifdef CONFIG_APQ8016
        { .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
@@ -153,6 +162,9 @@ static const struct udevice_id msm_pinctrl_ids[] = {
 #endif
 #ifdef CONFIG_QCS40X
        { .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
+#ifdef CONFIG_IPQ40XX
+       { .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
 #endif
        { }
 };
arch/arm/mach-snapdragon/pinctrl-snapdragon.h +1 -0
index 178ee01a41..2ba61a45b3 100644
@@ -29,5 +29,6 @@ extern struct msm_pinctrl_data apq8016_data;
 extern struct msm_pinctrl_data apq8096_data;
 extern struct msm_pinctrl_data sdm845_data;
 extern struct msm_pinctrl_data qcs404_data;
+extern struct msm_pinctrl_data ipq4019_data;
 
 #endif
drivers/phy/qcom/Kconfig +1 -1
index f4ca174805..cdc73d46b4 100644
@@ -8,7 +8,7 @@ config MSM8916_USB_PHY
 
 config PHY_QCOM_IPQ4019_USB
        tristate "Qualcomm IPQ4019 USB PHY driver"
-       depends on PHY && ARCH_IPQ40XX
+       depends on PHY && IPQ40XX
        help
          Support for the USB PHY-s on Qualcomm IPQ40xx SoC-s.
 
drivers/reset/Kconfig +1 -1
index 4cb0ba0850..a3d5fe8872 100644
@@ -158,7 +158,7 @@ config RESET_IMX7
 
 config RESET_QCOM
        bool "Reset driver for Qualcomm SoCs"
-       depends on DM_RESET && (ARCH_SNAPDRAGON || ARCH_IPQ40XX)
+       depends on DM_RESET && ARCH_SNAPDRAGON
        default y
        help
          Support for reset controller on Qualcomm SoCs.
drivers/reset/reset-qcom.c +1 -1
index 2c61d6a6dc..7e5eae190d 100644
@@ -25,7 +25,7 @@ struct qcom_reset_map {
        u8 bit;
 };
 
-#ifdef CONFIG_ARCH_IPQ40XX
+#ifdef CONFIG_IPQ40XX
 #include <dt-bindings/reset/qcom,ipq4019-reset.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
        [WIFI0_CPU_INIT_RESET] = { 0x1f008, 5 },
drivers/smem/Kconfig +1 -1
index 73d51b3a7a..7169d0f205 100644
@@ -15,7 +15,7 @@ config SANDBOX_SMEM
 config MSM_SMEM
     bool "Qualcomm Shared Memory Manager (SMEM)"
     depends on DM
-    depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
+    depends on ARCH_SNAPDRAGON
     help
       Enable support for the Qualcomm Shared Memory Manager.
       The driver provides an interface to items in a heap shared among all
drivers/spi/Kconfig +1 -2
index c6900f449d..d9f8a1c196 100644
@@ -371,7 +371,7 @@ config PL022_SPI
 
 config SPI_QUP
        bool "Qualcomm SPI controller with QUP interface"
-       depends on ARCH_IPQ40XX
+       depends on ARCH_SNAPDRAGON
        help
          Qualcomm Universal Peripheral (QUP) core is an AHB slave that
          provides a common data path (an output FIFO and an input FIFO)
--

2.34.1

Signature · 7 lines
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: [email protected]
Web: www.sartura.hr
#9 lore raw

PATCH v3 1/2 SoC: qcom: Add missing Qualcomm's SOCs definitions to the arch KConfig

Add APQ8016/APQ8096/QCS40X decls to the KConfig, convert SDM845 declaration to the hidden one (selected by target), and update mach-snapdragon/Makefile accordingly.

Also move 'CONFIG_ARM64' choice to the new declarations, since 'Snapdragon' contains Cortex A7A members too.

---
 arch/arm/Kconfig                              |  1 -
 arch/arm/mach-snapdragon/Kconfig              | 23 ++++++++++++--
 arch/arm/mach-snapdragon/Makefile             | 31 ++++++++++---------
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 10 +++++-
 drivers/reset/reset-qcom.c                    |  2 +-
 5 files changed, 48 insertions(+), 19 deletions(-)
arch/arm/Kconfig +0 -1
index 7866e8f3c4..d575014aaf 100644
@@ -1076,7 +1076,6 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
 	bool "Qualcomm Snapdragon SoCs"
-	select ARM64
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
arch/arm/mach-snapdragon/Kconfig +21 -2
index 0927333306..83dd2c07a1 100644
@@ -9,10 +9,27 @@ config SYS_MALLOC_F_LEN
 config SPL_SYS_MALLOC_F_LEN
 	default 0x2000
 
+config APQ8016
+	bool
+	select ARM64
+	default n
+
+config APQ8096
+	bool
+	select ARM64
+	default n
+
 config SDM845
-	bool "Qualcomm Snapdragon 845 SoC"
+	bool
+	select ARM64
+	select LINUX_KERNEL_IMAGE_HEADER
 	default n
+
+config QCS40X
+	bool
+	select ARM64
 	select LINUX_KERNEL_IMAGE_HEADER
+	default n
 
 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
 	default 0x80000000
@@ -23,6 +40,7 @@ choice
 config TARGET_DRAGONBOARD410C
 	bool "96Boards Dragonboard 410C"
 	select BOARD_LATE_INIT
+	select APQ8016
 	select ENABLE_ARM_SOC_BOOT0_HOOK
 	help
 	  Support for 96Boards Dragonboard 410C. This board complies with
@@ -37,6 +55,7 @@ config TARGET_DRAGONBOARD410C
 
 config TARGET_DRAGONBOARD820C
 	bool "96Boards Dragonboard 820C"
+	select APQ8096
 	help
 	  Support for 96Boards Dragonboard 820C. This board complies with
 	  96Board Open Platform Specifications. Features:
@@ -71,7 +90,7 @@ config TARGET_STARQLTECHN
 
 config TARGET_QCS404EVB
 	bool "Qualcomm Technologies, Inc. QCS404 EVB"
-	select LINUX_KERNEL_IMAGE_HEADER
+	select QCS40X
 	help
 	  Support for Qualcomm Technologies, Inc. QCS404 evaluation board.
 	  Features:
arch/arm/mach-snapdragon/Makefile +17 -14
index cbaaf23f6b..00997196ab 100644
@@ -2,20 +2,23 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
+obj-y += clock-snapdragon.o
+obj-y += pinctrl-snapdragon.o
+
 obj-$(CONFIG_SDM845) += clock-sdm845.o
 obj-$(CONFIG_SDM845) += sysmap-sdm845.o
 obj-$(CONFIG_SDM845) += init_sdm845.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += clock-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD820C) += sysmap-apq8096.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += clock-apq8016.o
-obj-$(CONFIG_TARGET_DRAGONBOARD410C) += sysmap-apq8016.o
-obj-y += misc.o
-obj-y += clock-snapdragon.o
-obj-y += dram.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-apq8016.o
-obj-y += pinctrl-apq8096.o
-obj-y += pinctrl-qcs404.o
-obj-y += pinctrl-sdm845.o
-obj-$(CONFIG_TARGET_QCS404EVB) += clock-qcs404.o
-obj-$(CONFIG_TARGET_QCS404EVB) += sysmap-qcs404.o
+obj-$(CONFIG_SDM845) += pinctrl-sdm845.o
+
+obj-$(CONFIG_APQ8096) += clock-apq8096.o
+obj-$(CONFIG_APQ8096) += sysmap-apq8096.o
+obj-$(CONFIG_APQ8096) += pinctrl-apq8096.o
+
+obj-$(CONFIG_APQ8016) += clock-apq8016.o
+obj-$(CONFIG_APQ8016) += sysmap-apq8016.o
+obj-$(CONFIG_APQ8016) += pinctrl-apq8016.o
+obj-$(CONFIG_APQ8016) += misc.o dram.o
+
+obj-$(CONFIG_QCS40X) += clock-qcs404.o
+obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
+obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +9 -1
index ab884ab6bf..0740993b61 100644
@@ -142,14 +142,22 @@ static int msm_pinctrl_bind(struct udevice *dev)
 }
 
 static const struct udevice_id msm_pinctrl_ids[] = {
+#ifdef CONFIG_APQ8016
 	{ .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
+#endif
+#ifdef CONFIG_APQ8096
 	{ .compatible = "qcom,msm8996-pinctrl", .data = (ulong)&apq8096_data },
+#endif
+#ifdef CONFIG_SDM845
 	{ .compatible = "qcom,sdm845-pinctrl", .data = (ulong)&sdm845_data },
+#endif
+#ifdef CONFIG_QCS40X
 	{ .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
 	{ }
 };
 
-U_BOOT_DRIVER(pinctrl_snapdraon) = {
+U_BOOT_DRIVER(pinctrl_snapdragon) = {
 	.name		= "pinctrl_msm",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= msm_pinctrl_ids,
drivers/reset/reset-qcom.c +1 -1
index 94315e76d5..2c61d6a6dc 100644
@@ -102,7 +102,7 @@ static const struct qcom_reset_map gcc_qcom_resets[] = {
 };
 #endif
 
-#ifdef CONFIG_TARGET_QCS404EVB
+#ifdef CONFIG_QCS40X
 #include <dt-bindings/clock/qcom,gcc-qcs404.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
 	[GCC_GENI_IR_BCR] = { 0x0F000 },
Signature · 1 line
2.34.1
#10 lore raw

PATCH v3 2/2 ipq40xx/snapdragon: Merge the two, more than 90% overlapping Qualcomm's Snapdrgon based arches, into one: "mach-snapdragon".

In reply to Robert Marko
---
 arch/arm/Kconfig                              |  19 +-
 arch/arm/Makefile                             |   1 -
 arch/arm/mach-ipq40xx/Kconfig                 |  15 --
 arch/arm/mach-ipq40xx/Makefile                |   9 -
 arch/arm/mach-ipq40xx/include/mach/gpio.h     |  10 --
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    | 166 ------------------
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h    |  30 ----
 arch/arm/mach-snapdragon/Kconfig              |  48 ++++-
 arch/arm/mach-snapdragon/Makefile             |   5 +-
 .../clock-ipq4019.c                           |   0
 .../pinctrl-ipq4019.c                         |   0
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  38 ++--
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |   1 +
 drivers/phy/qcom/Kconfig                      |   2 +-
 drivers/reset/Kconfig                         |   2 +-
 drivers/reset/reset-qcom.c                    |   2 +-
 drivers/smem/Kconfig                          |   2 +-
 drivers/spi/Kconfig                           |   2 +-
 18 files changed, 81 insertions(+), 271 deletions(-)
 delete mode 100644 arch/arm/mach-ipq40xx/Kconfig
 delete mode 100644 arch/arm/mach-ipq40xx/Makefile
 delete mode 100644 arch/arm/mach-ipq40xx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/clock-ipq4019.c (100%)
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/pinctrl-ipq4019.c (100%)
arch/arm/Kconfig +2 -17
index d575014aaf..51c4678b74 100644
@@ -781,21 +781,6 @@ config ARCH_INTEGRATOR
 	select PL01X_SERIAL
 	imply CMD_DM
 
-config ARCH_IPQ40XX
-	bool "Qualcomm IPQ40xx SoCs"
-	select CPU_V7A
-	select DM
-	select DM_GPIO
-	select DM_SERIAL
-	select DM_RESET
-	select GPIO_EXTRA_HEADER
-	select MSM_SMEM
-	select PINCTRL
-	select CLK
-	select SMEM
-	select OF_CONTROL
-	imply CMD_DM
-
 config ARCH_KEYSTONE
 	bool "TI Keystone"
 	select CMD_POWEROFF
@@ -1076,6 +1061,7 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
 	bool "Qualcomm Snapdragon SoCs"
+	select CLK
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
@@ -1083,6 +1069,7 @@ config ARCH_SNAPDRAGON
 	select MSM_SMEM
 	select OF_CONTROL
 	select OF_SEPARATE
+	select PINCTRL
 	select SMEM
 	select SPMI
 	imply CMD_DM
@@ -2203,8 +2190,6 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
-source "arch/arm/mach-ipq40xx/Kconfig"
-
 source "arch/arm/mach-k3/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
arch/arm/Makefile +0 -1
index ac602aed9c..ceee6a02d0 100644
@@ -61,7 +61,6 @@ machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
 machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_GXP)		+= hpe
 machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
-machine-$(CONFIG_ARCH_IPQ40XX)		+= ipq40xx
 machine-$(CONFIG_ARCH_K3)		+= k3
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 machine-$(CONFIG_ARCH_KIRKWOOD)		+= kirkwood
arch/arm/mach-ipq40xx/Kconfig deleted +0 -15
deleted file mode 100644
index f9db55c42a..0000000000
@@ -1,15 +0,0 @@
-if ARCH_IPQ40XX
-
-config SYS_SOC
-	default "ipq40xx"
-
-config SYS_MALLOC_F_LEN
-	default 0x2000
-
-config TEXT_BASE
-	default 0x87300000
-
-config NR_DRAM_BANKS
-	default 1
-
-endif
arch/arm/mach-ipq40xx/Makefile deleted +0 -9
deleted file mode 100644
index 08a65b8854..0000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2019 Sartura Ltd.
-#
-# Author: Robert Marko <[email protected]>
-
-obj-y += clock-ipq4019.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-ipq4019.o
arch/arm/mach-ipq40xx/include/mach/gpio.h deleted +0 -10
deleted file mode 100644
index a45747c0fe..0000000000
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Empty gpio.h
- *
- * This file must stay as arch/arm/include/asm/gpio.h requires it.
- *
- * Copyright (c) 2019 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- */
arch/arm/mach-ipq40xx/pinctrl-snapdragon.c deleted +0 -166

166 lines not on this page · raw message

arch/arm/mach-ipq40xx/pinctrl-snapdragon.h deleted +0 -30
deleted file mode 100644
index 2341a71349..0000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Qualcomm Pin control
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- */
-#ifndef _PINCTRL_SNAPDRAGON_H
-#define _PINCTRL_SNAPDRAGON_H
-
-#include <common.h>
-
-struct msm_pinctrl_data {
-	int pin_count;
-	int functions_count;
-	const char *(*get_function_name)(struct udevice *dev,
-					 unsigned int selector);
-	unsigned int (*get_function_mux)(unsigned int selector);
-	const char *(*get_pin_name)(struct udevice *dev,
-				    unsigned int selector);
-};
-
-struct pinctrl_function {
-	const char *name;
-	int val;
-};
-
-extern struct msm_pinctrl_data ipq4019_data;
-
-#endif
arch/arm/mach-snapdragon/Kconfig +44 -4

78 lines not on this page · raw message

arch/arm/mach-snapdragon/Makefile +4 -1
index 00997196ab..89e5a49780 100644
@@ -2,7 +2,7 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
-obj-y += clock-snapdragon.o
+obj-$(CONFIG_COMMON_SNAPDRAGON) += clock-snapdragon.o
 obj-y += pinctrl-snapdragon.o
 
 obj-$(CONFIG_SDM845) += clock-sdm845.o
@@ -22,3 +22,6 @@ obj-$(CONFIG_APQ8016) += misc.o dram.o
 obj-$(CONFIG_QCS40X) += clock-qcs404.o
 obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
 obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
+
+obj-$(CONFIG_IPQ40XX) += clock-ipq4019.o
+obj-$(CONFIG_IPQ40XX) += pinctrl-ipq4019.o
arch/arm/mach-snapdragon/clock-ipq4019.c renamed from arch/arm/mach-ipq40xx/clock-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/clock-ipq4019.c
rename to arch/arm/mach-snapdragon/clock-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-ipq4019.c renamed from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c
rename to arch/arm/mach-snapdragon/pinctrl-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +25 -13
index 0740993b61..8d7cb1944f 100644
@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * TLMM driver for Qualcomm APQ8016, APQ8096
+ * TLMM driver for Qualcomm Snapdragon SOCs
  *
  * (C) Copyright 2018 Ramon Fried <[email protected]>
  *
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <[email protected]>
+ *
  */
 
 #include <common.h>
@@ -30,6 +34,7 @@ struct msm_pinctrl_priv {
 static const struct pinconf_param msm_conf_params[] = {
 	{ "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 3 },
 	{ "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
+	{ "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
 };
 
 static int msm_get_functions_count(struct udevice *dev)
@@ -96,6 +101,10 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
 		clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
 			     TLMM_GPIO_PULL_MASK);
 		break;
+	case PIN_CONFIG_BIAS_PULL_UP:
+		clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
+			     TLMM_GPIO_PULL_MASK, argument);
+		break;
 	default:
 		return 0;
 	}
@@ -103,18 +112,6 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
 	return 0;
 }
 
-static struct pinctrl_ops msm_pinctrl_ops = {
-	.get_pins_count = msm_get_pins_count,
-	.get_pin_name = msm_get_pin_name,
-	.set_state = pinctrl_generic_set_state,
-	.pinmux_set = msm_pinmux_set,
-	.pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-	.pinconf_params = msm_conf_params,
-	.pinconf_set = msm_pinconf_set,
-	.get_functions_count = msm_get_functions_count,
-	.get_function_name = msm_get_function_name,
-};
-
 static int msm_pinctrl_bind(struct udevice *dev)
 {
 	ofnode node = dev_ofnode(dev);
@@ -141,6 +138,18 @@ static int msm_pinctrl_bind(struct udevice *dev)
 	return 0;
 }
 
+static struct pinctrl_ops msm_pinctrl_ops = {
+	.get_pins_count = msm_get_pins_count,
+	.get_pin_name = msm_get_pin_name,
+	.set_state = pinctrl_generic_set_state,
+	.pinmux_set = msm_pinmux_set,
+	.pinconf_num_params = ARRAY_SIZE(msm_conf_params),
+	.pinconf_params = msm_conf_params,
+	.pinconf_set = msm_pinconf_set,
+	.get_functions_count = msm_get_functions_count,
+	.get_function_name = msm_get_function_name,
+};
+
 static const struct udevice_id msm_pinctrl_ids[] = {
 #ifdef CONFIG_APQ8016
 	{ .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
@@ -153,6 +162,9 @@ static const struct udevice_id msm_pinctrl_ids[] = {
 #endif
 #ifdef CONFIG_QCS40X
 	{ .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
+#ifdef CONFIG_IPQ40XX
+	{ .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
 #endif
 	{ }
 };
arch/arm/mach-snapdragon/pinctrl-snapdragon.h +1 -0
index 178ee01a41..2ba61a45b3 100644
@@ -29,5 +29,6 @@ extern struct msm_pinctrl_data apq8016_data;
 extern struct msm_pinctrl_data apq8096_data;
 extern struct msm_pinctrl_data sdm845_data;
 extern struct msm_pinctrl_data qcs404_data;
+extern struct msm_pinctrl_data ipq4019_data;
 
 #endif
drivers/phy/qcom/Kconfig +1 -1
index f4ca174805..cdc73d46b4 100644
@@ -8,7 +8,7 @@ config MSM8916_USB_PHY
 
 config PHY_QCOM_IPQ4019_USB
 	tristate "Qualcomm IPQ4019 USB PHY driver"
-	depends on PHY && ARCH_IPQ40XX
+	depends on PHY && IPQ40XX
 	help
 	  Support for the USB PHY-s on Qualcomm IPQ40xx SoC-s.
 
drivers/reset/Kconfig +1 -1
index 4cb0ba0850..a3d5fe8872 100644
@@ -158,7 +158,7 @@ config RESET_IMX7
 
 config RESET_QCOM
 	bool "Reset driver for Qualcomm SoCs"
-	depends on DM_RESET && (ARCH_SNAPDRAGON || ARCH_IPQ40XX)
+	depends on DM_RESET && ARCH_SNAPDRAGON
 	default y
 	help
 	  Support for reset controller on Qualcomm SoCs.
drivers/reset/reset-qcom.c +1 -1
index 2c61d6a6dc..7e5eae190d 100644
@@ -25,7 +25,7 @@ struct qcom_reset_map {
 	u8 bit;
 };
 
-#ifdef CONFIG_ARCH_IPQ40XX
+#ifdef CONFIG_IPQ40XX
 #include <dt-bindings/reset/qcom,ipq4019-reset.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
 	[WIFI0_CPU_INIT_RESET] = { 0x1f008, 5 },
drivers/smem/Kconfig +1 -1
index 73d51b3a7a..7169d0f205 100644
@@ -15,7 +15,7 @@ config SANDBOX_SMEM
 config MSM_SMEM
     bool "Qualcomm Shared Memory Manager (SMEM)"
     depends on DM
-    depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
+    depends on ARCH_SNAPDRAGON
     help
       Enable support for the Qualcomm Shared Memory Manager.
       The driver provides an interface to items in a heap shared among all
drivers/spi/Kconfig +1 -1
index c6900f449d..d9f8a1c196 100644
@@ -371,7 +371,7 @@ config PL022_SPI
 
 config SPI_QUP
 	bool "Qualcomm SPI controller with QUP interface"
-	depends on ARCH_IPQ40XX
+	depends on ARCH_SNAPDRAGON
 	help
 	  Qualcomm Universal Peripheral (QUP) core is an AHB slave that
 	  provides a common data path (an output FIFO and an input FIFO)
Signature · 1 line
2.34.1
#11 lore raw

Re: [PATCH v2 2/2] ipq40xx/snapdragon: Merge the two, more than 90% overlapping Qualcomm's Snapdrgon based arches, into one: "mach-snapdragon".

In reply to Robert Marko

Hi Marco, Tom,

SYS_LOAD_ADDR has been fixed in the following patches. Could you check/validate?

--
Regards
Andrey VOLKOV

Quoted 639 lines · Robert Marko
Quoted 400 lines · Andrey VOLKOV
---
 arch/arm/Kconfig                              |  19 +-
 arch/arm/Makefile                             |   1 -
 arch/arm/mach-ipq40xx/Kconfig                 |  15 --
 arch/arm/mach-ipq40xx/Makefile                |   9 -
 arch/arm/mach-ipq40xx/include/mach/gpio.h     |  10 --
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c    | 166 ------------------
 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h    |  30 ----
 arch/arm/mach-snapdragon/Kconfig              |  47 ++++-
 arch/arm/mach-snapdragon/Makefile             |   5 +-
 .../clock-ipq4019.c                           |   0
 .../pinctrl-ipq4019.c                         |   0
 arch/arm/mach-snapdragon/pinctrl-snapdragon.c |  38 ++--
 arch/arm/mach-snapdragon/pinctrl-snapdragon.h |   1 +
 drivers/phy/qcom/Kconfig                      |   2 +-
 drivers/reset/Kconfig                         |   2 +-
 drivers/reset/reset-qcom.c                    |   2 +-
 drivers/smem/Kconfig                          |   2 +-
 drivers/spi/Kconfig                           |   2 +-
 18 files changed, 80 insertions(+), 271 deletions(-)
 delete mode 100644 arch/arm/mach-ipq40xx/Kconfig
 delete mode 100644 arch/arm/mach-ipq40xx/Makefile
 delete mode 100644 arch/arm/mach-ipq40xx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.c
 delete mode 100644 arch/arm/mach-ipq40xx/pinctrl-snapdragon.h
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/clock-ipq4019.c (100%)
 rename arch/arm/{mach-ipq40xx => mach-snapdragon}/pinctrl-ipq4019.c (100%)
arch/arm/Kconfig +2 -17
index cdc8d4aeb4..d94ca7dcf9 100644
@@ -781,21 +781,6 @@ config ARCH_INTEGRATOR
        select PL01X_SERIAL
        imply CMD_DM
 
-config ARCH_IPQ40XX
-       bool "Qualcomm IPQ40xx SoCs"
-       select CPU_V7A
-       select DM
-       select DM_GPIO
-       select DM_SERIAL
-       select DM_RESET
-       select GPIO_EXTRA_HEADER
-       select MSM_SMEM
-       select PINCTRL
-       select CLK
-       select SMEM
-       select OF_CONTROL
-       imply CMD_DM
-
 config ARCH_KEYSTONE
        bool "TI Keystone"
        select CMD_POWEROFF
@@ -1076,6 +1061,7 @@ config ARCH_RMOBILE
 
 config ARCH_SNAPDRAGON
        bool "Qualcomm Snapdragon SoCs"
+       select CLK
        select DM
        select DM_GPIO
        select DM_SERIAL
@@ -1083,6 +1069,7 @@ config ARCH_SNAPDRAGON
        select MSM_SMEM
        select OF_CONTROL
        select OF_SEPARATE
+       select PINCTRL
        select SMEM
        select SPMI
        imply CMD_DM
@@ -2203,8 +2190,6 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
-source "arch/arm/mach-ipq40xx/Kconfig"
-
 source "arch/arm/mach-k3/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
arch/arm/Makefile +0 -1
index ac602aed9c..ceee6a02d0 100644
@@ -61,7 +61,6 @@ machine-$(CONFIG_ARCH_DAVINCI)                += davinci
 machine-$(CONFIG_ARCH_EXYNOS)          += exynos
 machine-$(CONFIG_ARCH_GXP)             += hpe
 machine-$(CONFIG_ARCH_HIGHBANK)                += highbank
-machine-$(CONFIG_ARCH_IPQ40XX)         += ipq40xx
 machine-$(CONFIG_ARCH_K3)              += k3
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 machine-$(CONFIG_ARCH_KIRKWOOD)                += kirkwood
arch/arm/mach-ipq40xx/Kconfig deleted +0 -15
deleted file mode 100644
index f9db55c42a..0000000000
@@ -1,15 +0,0 @@
-if ARCH_IPQ40XX
-
-config SYS_SOC
-       default "ipq40xx"
-
-config SYS_MALLOC_F_LEN
-       default 0x2000
-
-config TEXT_BASE
-       default 0x87300000
-
-config NR_DRAM_BANKS
-       default 1
-
-endif
arch/arm/mach-ipq40xx/Makefile deleted +0 -9
deleted file mode 100644
index 08a65b8854..0000000000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2019 Sartura Ltd.
-#
-# Author: Robert Marko <[email protected]>
-
-obj-y += clock-ipq4019.o
-obj-y += pinctrl-snapdragon.o
-obj-y += pinctrl-ipq4019.o
arch/arm/mach-ipq40xx/include/mach/gpio.h deleted +0 -10
deleted file mode 100644
index a45747c0fe..0000000000
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Empty gpio.h
- *
- * This file must stay as arch/arm/include/asm/gpio.h requires it.
- *
- * Copyright (c) 2019 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- */
arch/arm/mach-ipq40xx/pinctrl-snapdragon.c deleted +0 -166
deleted file mode 100644
index 036fec93d7..0000000000
@@ -1,166 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * TLMM driver for Qualcomm IPQ40xx
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- * Copyright (c) 2020 Sartura Ltd.
- *
- * Author: Robert Marko <[email protected]>
- *
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <dm/device_compat.h>
-#include <dm/lists.h>
-#include <dm/pinctrl.h>
-#include <linux/bitops.h>
-#include "pinctrl-snapdragon.h"
-
-struct msm_pinctrl_priv {
-       phys_addr_t base;
-       struct msm_pinctrl_data *data;
-};
-
-#define GPIO_CONFIG_OFFSET(x)         ((x) * 0x1000)
-#define TLMM_GPIO_PULL_MASK GENMASK(1, 0)
-#define TLMM_FUNC_SEL_MASK GENMASK(5, 2)
-#define TLMM_DRV_STRENGTH_MASK GENMASK(8, 6)
-#define TLMM_GPIO_DISABLE BIT(9)
-
-static const struct pinconf_param msm_conf_params[] = {
-       { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 2 },
-       { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
-       { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
-};
-
-static int msm_get_functions_count(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->functions_count;
-}
-
-static int msm_get_pins_count(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->pin_count;
-}
-
-static const char *msm_get_function_name(struct udevice *dev,
-                                        unsigned int selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->get_function_name(dev, selector);
-}
-
-static int msm_pinctrl_probe(struct udevice *dev)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       priv->base = devfdt_get_addr(dev);
-       priv->data = (struct msm_pinctrl_data *)dev->driver_data;
-
-       return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;
-}
-
-static const char *msm_get_pin_name(struct udevice *dev, unsigned int selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       return priv->data->get_pin_name(dev, selector);
-}
-
-static int msm_pinmux_set(struct udevice *dev, unsigned int pin_selector,
-                         unsigned int func_selector)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                       TLMM_FUNC_SEL_MASK | TLMM_GPIO_DISABLE,
-                       priv->data->get_function_mux(func_selector) << 2);
-       return 0;
-}
-
-static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
-                          unsigned int param, unsigned int argument)
-{
-       struct msm_pinctrl_priv *priv = dev_get_priv(dev);
-
-       switch (param) {
-       case PIN_CONFIG_DRIVE_STRENGTH:
-               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                               TLMM_DRV_STRENGTH_MASK, argument << 6);
-               break;
-       case PIN_CONFIG_BIAS_DISABLE:
-               clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                            TLMM_GPIO_PULL_MASK);
-               break;
-       case PIN_CONFIG_BIAS_PULL_UP:
-               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
-                            TLMM_GPIO_PULL_MASK, argument);
-               break;
-       default:
-               return 0;
-       }
-
-       return 0;
-}
-
-static int msm_pinctrl_bind(struct udevice *dev)
-{
-       ofnode node = dev_ofnode(dev);
-       const char *name;
-       int ret;
-
-       ofnode_get_property(node, "gpio-controller", &ret);
-       if (ret < 0)
-               return 0;
-
-       /* Get the name of gpio node */
-       name = ofnode_get_name(node);
-       if (!name)
-               return -EINVAL;
-
-       /* Bind gpio node */
-       ret = device_bind_driver_to_node(dev, "gpio_msm",
-                                        name, node, NULL);
-       if (ret)
-               return ret;
-
-       dev_dbg(dev, "bind %s\n", name);
-
-       return 0;
-}
-
-static struct pinctrl_ops msm_pinctrl_ops = {
-       .get_pins_count = msm_get_pins_count,
-       .get_pin_name = msm_get_pin_name,
-       .set_state = pinctrl_generic_set_state,
-       .pinmux_set = msm_pinmux_set,
-       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-       .pinconf_params = msm_conf_params,
-       .pinconf_set = msm_pinconf_set,
-       .get_functions_count = msm_get_functions_count,
-       .get_function_name = msm_get_function_name,
-};
-
-static const struct udevice_id msm_pinctrl_ids[] = {
-       { .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
-       { }
-};
-
-U_BOOT_DRIVER(pinctrl_snapdraon) = {
-       .name           = "pinctrl_msm",
-       .id             = UCLASS_PINCTRL,
-       .of_match       = msm_pinctrl_ids,
-       .priv_auto      = sizeof(struct msm_pinctrl_priv),
-       .ops            = &msm_pinctrl_ops,
-       .probe          = msm_pinctrl_probe,
-       .bind           = msm_pinctrl_bind,
-};
arch/arm/mach-ipq40xx/pinctrl-snapdragon.h deleted +0 -30
deleted file mode 100644
index 2341a71349..0000000000
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Qualcomm Pin control
- *
- * (C) Copyright 2018 Ramon Fried <[email protected]>
- *
- */
-#ifndef _PINCTRL_SNAPDRAGON_H
-#define _PINCTRL_SNAPDRAGON_H
-
-#include <common.h>
-
-struct msm_pinctrl_data {
-       int pin_count;
-       int functions_count;
-       const char *(*get_function_name)(struct udevice *dev,
-                                        unsigned int selector);
-       unsigned int (*get_function_mux)(unsigned int selector);
-       const char *(*get_pin_name)(struct udevice *dev,
-                                   unsigned int selector);
-};
-
-struct pinctrl_function {
-       const char *name;
-       int val;
-};
-
-extern struct msm_pinctrl_data ipq4019_data;
-
-#endif
arch/arm/mach-snapdragon/Kconfig +19 -4
index 83dd2c07a1..6600120248 100644
@@ -9,28 +9,61 @@ config SYS_MALLOC_F_LEN
 config SPL_SYS_MALLOC_F_LEN
        default 0x2000
 
-config APQ8016
+config COMMON_SNAPDRAGON
+       bool
+       default n
+
+config SNAPDRAGON_ARMV8
        bool
        select ARM64
+       select COMMON_SNAPDRAGON
+       default n
+
+config SNAPDRAGON_ARMV7A
+       bool
+       select CPU_V7A
+       default n
+
+config APQ8016
+       bool
+       select SNAPDRAGON_ARMV8
        default n
 
 config APQ8096
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        default n
 
 config SDM845
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        select LINUX_KERNEL_IMAGE_HEADER
        default n
 
 config QCS40X
        bool
-       select ARM64
+       select SNAPDRAGON_ARMV8
        select LINUX_KERNEL_IMAGE_HEADER

arch/arm/mach-snapdragon/Kconfig config SYS_MALLOC_F_LEN · line 56

Quoted 10 lines
arch/arm/mach-snapdragon/Kconfig +8 -0
        default n
 
+config IPQ40XX
+       bool
+       select SNAPDRAGON_ARMV7A
+       select DM_RESET
+       default n
+
+config SYS_LOAD_ADDR
+       default 0x80000000 if (IPQ40XX || SDM845 || QCS40X)

This is not correct for IPQ40xx, it uses 0x84000000 as the default load address.

Regards,
Robert

Quoted 219 lines
arch/arm/mach-snapdragon/Kconfig +16 -0
+       default 0x80080000 if (APQ8096 || APQ8016)
+
+config SYS_TEXT_BASE
+       default 0x8f600000 if APQ8016
+       default 0x87300000 if IPQ40XX
+
+config NR_DRAM_BANKS
+       default 1 if (IPQ40XX || APQ8016)
+       default 2 if APQ8096
+
 config LNX_KRNL_IMG_TEXT_OFFSET_BASE
        default 0x80000000
 
@@ -98,6 +131,12 @@ config TARGET_QCS404EVB
          - 1GiB RAM
          - 8GiB eMMC, uSD slot
 
+config TARGET_IPQ4019
+       bool "Generic IPQ4019 based board"
+       select IPQ40XX
+       help
+         Support for the generic Qualcomm IPQ4019 based board
+
 endchoice
 
 source "board/qualcomm/dragonboard410c/Kconfig"
arch/arm/mach-snapdragon/Makefile +4 -1
index 00997196ab..89e5a49780 100644
@@ -2,7 +2,7 @@
 #
 # (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
 
-obj-y += clock-snapdragon.o
+obj-$(CONFIG_COMMON_SNAPDRAGON) += clock-snapdragon.o
 obj-y += pinctrl-snapdragon.o
 
 obj-$(CONFIG_SDM845) += clock-sdm845.o
@@ -22,3 +22,6 @@ obj-$(CONFIG_APQ8016) += misc.o dram.o
 obj-$(CONFIG_QCS40X) += clock-qcs404.o
 obj-$(CONFIG_QCS40X) += sysmap-qcs404.o
 obj-$(CONFIG_QCS40X) += pinctrl-qcs404.o
+
+obj-$(CONFIG_IPQ40XX) += clock-ipq4019.o
+obj-$(CONFIG_IPQ40XX) += pinctrl-ipq4019.o
arch/arm/mach-snapdragon/clock-ipq4019.c renamed from arch/arm/mach-ipq40xx/clock-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/clock-ipq4019.c
rename to arch/arm/mach-snapdragon/clock-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-ipq4019.c renamed from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c +0 -0
similarity index 100%
rename from arch/arm/mach-ipq40xx/pinctrl-ipq4019.c
rename to arch/arm/mach-snapdragon/pinctrl-ipq4019.c
arch/arm/mach-snapdragon/pinctrl-snapdragon.c +25 -13
index 0740993b61..8d7cb1944f 100644
@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- * TLMM driver for Qualcomm APQ8016, APQ8096
+ * TLMM driver for Qualcomm Snapdragon SOCs
  *
  * (C) Copyright 2018 Ramon Fried <[email protected]>
  *
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <[email protected]>
+ *
  */
 
 #include <common.h>
@@ -30,6 +34,7 @@ struct msm_pinctrl_priv {
 static const struct pinconf_param msm_conf_params[] = {
        { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 3 },
        { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
+       { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 2 },
 };
 
 static int msm_get_functions_count(struct udevice *dev)
@@ -96,6 +101,10 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
                clrbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
                             TLMM_GPIO_PULL_MASK);
                break;
+       case PIN_CONFIG_BIAS_PULL_UP:
+               clrsetbits_le32(priv->base + GPIO_CONFIG_OFFSET(pin_selector),
+                            TLMM_GPIO_PULL_MASK, argument);
+               break;
        default:
                return 0;
        }
@@ -103,18 +112,6 @@ static int msm_pinconf_set(struct udevice *dev, unsigned int pin_selector,
        return 0;
 }
 
-static struct pinctrl_ops msm_pinctrl_ops = {
-       .get_pins_count = msm_get_pins_count,
-       .get_pin_name = msm_get_pin_name,
-       .set_state = pinctrl_generic_set_state,
-       .pinmux_set = msm_pinmux_set,
-       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
-       .pinconf_params = msm_conf_params,
-       .pinconf_set = msm_pinconf_set,
-       .get_functions_count = msm_get_functions_count,
-       .get_function_name = msm_get_function_name,
-};
-
 static int msm_pinctrl_bind(struct udevice *dev)
 {
        ofnode node = dev_ofnode(dev);
@@ -141,6 +138,18 @@ static int msm_pinctrl_bind(struct udevice *dev)
        return 0;
 }
 
+static struct pinctrl_ops msm_pinctrl_ops = {
+       .get_pins_count = msm_get_pins_count,
+       .get_pin_name = msm_get_pin_name,
+       .set_state = pinctrl_generic_set_state,
+       .pinmux_set = msm_pinmux_set,
+       .pinconf_num_params = ARRAY_SIZE(msm_conf_params),
+       .pinconf_params = msm_conf_params,
+       .pinconf_set = msm_pinconf_set,
+       .get_functions_count = msm_get_functions_count,
+       .get_function_name = msm_get_function_name,
+};
+
 static const struct udevice_id msm_pinctrl_ids[] = {
 #ifdef CONFIG_APQ8016
        { .compatible = "qcom,msm8916-pinctrl", .data = (ulong)&apq8016_data },
@@ -153,6 +162,9 @@ static const struct udevice_id msm_pinctrl_ids[] = {
 #endif
 #ifdef CONFIG_QCS40X
        { .compatible = "qcom,qcs404-pinctrl", .data = (ulong)&qcs404_data },
+#endif
+#ifdef CONFIG_IPQ40XX
+       { .compatible = "qcom,ipq4019-pinctrl", .data = (ulong)&ipq4019_data },
 #endif
        { }
 };
arch/arm/mach-snapdragon/pinctrl-snapdragon.h +1 -0
index 178ee01a41..2ba61a45b3 100644
@@ -29,5 +29,6 @@ extern struct msm_pinctrl_data apq8016_data;
 extern struct msm_pinctrl_data apq8096_data;
 extern struct msm_pinctrl_data sdm845_data;
 extern struct msm_pinctrl_data qcs404_data;
+extern struct msm_pinctrl_data ipq4019_data;
 
 #endif
drivers/phy/qcom/Kconfig +1 -1
index f4ca174805..cdc73d46b4 100644
@@ -8,7 +8,7 @@ config MSM8916_USB_PHY
 
 config PHY_QCOM_IPQ4019_USB
        tristate "Qualcomm IPQ4019 USB PHY driver"
-       depends on PHY && ARCH_IPQ40XX
+       depends on PHY && IPQ40XX
        help
          Support for the USB PHY-s on Qualcomm IPQ40xx SoC-s.
 
drivers/reset/Kconfig +1 -1
index 4cb0ba0850..a3d5fe8872 100644
@@ -158,7 +158,7 @@ config RESET_IMX7
 
 config RESET_QCOM
        bool "Reset driver for Qualcomm SoCs"
-       depends on DM_RESET && (ARCH_SNAPDRAGON || ARCH_IPQ40XX)
+       depends on DM_RESET && ARCH_SNAPDRAGON
        default y
        help
          Support for reset controller on Qualcomm SoCs.
drivers/reset/reset-qcom.c +1 -1
index 2c61d6a6dc..7e5eae190d 100644
@@ -25,7 +25,7 @@ struct qcom_reset_map {
        u8 bit;
 };
 
-#ifdef CONFIG_ARCH_IPQ40XX
+#ifdef CONFIG_IPQ40XX
 #include <dt-bindings/reset/qcom,ipq4019-reset.h>
 static const struct qcom_reset_map gcc_qcom_resets[] = {
        [WIFI0_CPU_INIT_RESET] = { 0x1f008, 5 },
drivers/smem/Kconfig +1 -1
index 73d51b3a7a..7169d0f205 100644
@@ -15,7 +15,7 @@ config SANDBOX_SMEM
 config MSM_SMEM
     bool "Qualcomm Shared Memory Manager (SMEM)"
     depends on DM
-    depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
+    depends on ARCH_SNAPDRAGON
     help
       Enable support for the Qualcomm Shared Memory Manager.
       The driver provides an interface to items in a heap shared among all
drivers/spi/Kconfig +1 -2
index c6900f449d..d9f8a1c196 100644
@@ -371,7 +371,7 @@ config PL022_SPI
 
 config SPI_QUP
        bool "Qualcomm SPI controller with QUP interface"
-       depends on ARCH_IPQ40XX
+       depends on ARCH_SNAPDRAGON
        help
          Qualcomm Universal Peripheral (QUP) core is an AHB slave that
          provides a common data path (an output FIFO and an input FIFO)
--

2.34.1