Over the past few years, the ARM msm SoC tree has picked up support
for a handfull of SoCs. Each of these targets had a brief period of
activity, and has since only received trivial fixes. Support has only
been minimal, generally serial console, and possibly storage. None of
these saw conversion to device tree, and they contain a lot of headers
and other aspects that prevent use in the ARM multi-platform kernel.
Current activity on MSM seems to be focused on newer SoCs. These
devices have the advantage of having dev-boards available, so
hopefully there will be more community activity. There also seems to
be effort into better DT and multi-platform support on these targets,
but not the older ones.
This patch series removes support for the three older Qualcomm SoC
families: 7x00, 7x30, and 8x50.
If there is a serious desire to support any of these SoCs, patches
that make them properly support DT, and multi-platform can begin by
adding the necessary files back.
Note that because these patches remove a lot of lines of code, and the
lengths exceed the size typically allowed on the mailing lists, I've
generated the patches with the '-D' option to format-patch. I can
send full patches on request, and I've also made the patches available
at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
David Brown (4):
ARM: msm: Remove unused board files
ARM: msm: Remove 7x00 support
ARM: msm: Remove 7x30 support
ARM: msm: Remove 8x50 support
arch/arm/mach-msm/Kconfig | 104 ---
arch/arm/mach-msm/Makefile | 20 -
arch/arm/mach-msm/board-halibut.c | 110 ---
arch/arm/mach-msm/board-mahimahi.c | 88 --
arch/arm/mach-msm/board-msm7x30.c | 157 ----
arch/arm/mach-msm/board-qsd8x50.c | 213 -----
arch/arm/mach-msm/board-sapphire.c | 117 ---
arch/arm/mach-msm/board-trout-gpio.c | 233 -----
arch/arm/mach-msm/board-trout-mmc.c | 185 ----
arch/arm/mach-msm/board-trout-panel.c | 292 -------
arch/arm/mach-msm/board-trout.c | 113 ---
arch/arm/mach-msm/board-trout.h | 162 ----
arch/arm/mach-msm/clock-pcom.c | 177 ----
arch/arm/mach-msm/clock-pcom.h | 145 ----
arch/arm/mach-msm/devices-msm7x00.c | 480 -----------
arch/arm/mach-msm/devices-msm7x30.c | 246 ------
arch/arm/mach-msm/devices-qsd8x50.c | 388 ---------
arch/arm/mach-msm/devices.h | 53 --
arch/arm/mach-msm/dma.c | 295 -------
arch/arm/mach-msm/gpiomux-8x50.c | 51 --
arch/arm/mach-msm/gpiomux-v1.h | 67 --
arch/arm/mach-msm/gpiomux.c | 111 ---
arch/arm/mach-msm/gpiomux.h | 84 --
arch/arm/mach-msm/include/mach/entry-macro.S | 36 -
arch/arm/mach-msm/include/mach/hardware.h | 18 -
arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 --
arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 ----
arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 --
arch/arm/mach-msm/include/mach/irqs.h | 37 -
arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 ---
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 ---
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 ---
arch/arm/mach-msm/include/mach/msm_iomap.h | 53 --
arch/arm/mach-msm/include/mach/msm_smd.h | 109 ---
arch/arm/mach-msm/include/mach/sirc.h | 98 ---
arch/arm/mach-msm/include/mach/vreg.h | 29 -
arch/arm/mach-msm/io.c | 161 ----
arch/arm/mach-msm/irq-vic.c | 363 --------
arch/arm/mach-msm/irq.c | 151 ----
arch/arm/mach-msm/last_radio_log.c | 71 --
arch/arm/mach-msm/proc_comm.c | 129 ---
arch/arm/mach-msm/proc_comm.h | 258 ------
arch/arm/mach-msm/sirc.c | 172 ----
arch/arm/mach-msm/smd.c | 1035 -----------------------
arch/arm/mach-msm/smd_debug.c | 311 -------
arch/arm/mach-msm/smd_private.h | 403 ---------
arch/arm/mach-msm/vreg.c | 220 -----
48 files changed, 8235 deletions(-)
delete mode 100644 arch/arm/mach-msm/board-halibut.c
delete mode 100644 arch/arm/mach-msm/board-mahimahi.c
delete mode 100644 arch/arm/mach-msm/board-msm7x30.c
delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/board-sapphire.c
delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
delete mode 100644 arch/arm/mach-msm/board-trout.c
delete mode 100644 arch/arm/mach-msm/board-trout.h
delete mode 100644 arch/arm/mach-msm/clock-pcom.c
delete mode 100644 arch/arm/mach-msm/clock-pcom.h
delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c
delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/devices.h
delete mode 100644 arch/arm/mach-msm/dma.c
delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h
delete mode 100644 arch/arm/mach-msm/gpiomux.c
delete mode 100644 arch/arm/mach-msm/gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h
delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h
delete mode 100644 arch/arm/mach-msm/io.c
delete mode 100644 arch/arm/mach-msm/irq-vic.c
delete mode 100644 arch/arm/mach-msm/irq.c
delete mode 100644 arch/arm/mach-msm/last_radio_log.c
delete mode 100644 arch/arm/mach-msm/proc_comm.c
delete mode 100644 arch/arm/mach-msm/proc_comm.h
delete mode 100644 arch/arm/mach-msm/sirc.c
delete mode 100644 arch/arm/mach-msm/smd.c
delete mode 100644 arch/arm/mach-msm/smd_debug.c
delete mode 100644 arch/arm/mach-msm/smd_private.h
delete mode 100644 arch/arm/mach-msm/vreg.c
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
Support for the MSM7x00 SoCs was added starting in 2008 based on code
from Google's Android kernels. Platform support is fairly minimal,
and there have primarily been trivial and cleanup changes to this
code.
This code has not been converted to device tree, and is hindering
supporting multi-platform on ARM. If someone wishes to continue
support for this target, patches that provide devicetree and
multi-platform support can start by re-adding these files.
Signed-off-by: David Brown <[email protected]>
---
Note that this patch was made with -D. I can send the full patch on
request, and have also made the tree available at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
arch/arm/mach-msm/Kconfig | 32 +-
arch/arm/mach-msm/Makefile | 4 -
arch/arm/mach-msm/board-halibut.c | 110 ------
arch/arm/mach-msm/board-trout-gpio.c | 233 ------------
arch/arm/mach-msm/board-trout-mmc.c | 185 ---------
arch/arm/mach-msm/board-trout-panel.c | 292 --------------
arch/arm/mach-msm/board-trout.c | 113 ------
arch/arm/mach-msm/board-trout.h | 162 --------
arch/arm/mach-msm/devices-msm7x00.c | 480 ------------------------
arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 ----
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 ------
arch/arm/mach-msm/irq.c | 151 --------
12 files changed, 1 insertion(+), 1944 deletions(-)
delete mode 100644 arch/arm/mach-msm/board-halibut.c
delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
delete mode 100644 arch/arm/mach-msm/board-trout.c
delete mode 100644 arch/arm/mach-msm/board-trout.h
delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
delete mode 100644 arch/arm/mach-msm/irq.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c28..d43d20c 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -5,19 +5,9 @@ comment "Qualcomm MSM SoC Type"
choice
prompt "Qualcomm MSM SoC Type"
- default ARCH_MSM7X00A
+ default ARCH_MSM7X30
depends on !ARCH_MSM_DT
-config ARCH_MSM7X00A
- bool "MSM7x00A / MSM7x01A"
- select ARCH_MSM_ARM11
- select CPU_V6
- select GPIO_MSM_V1
- select MACH_TROUT if !MACH_HALIBUT
- select MSM_PROC_COMM
- select MSM_SMD
- select MSM_SMD_PKG3
-
config ARCH_MSM7X30
bool "MSM7x30"
select ARCH_MSM_SCORPION
@@ -70,9 +60,6 @@ config MSM_HAS_DEBUG_UART_HS
config MSM_SOC_REV_A
bool
-config ARCH_MSM_ARM11
- bool
-
config ARCH_MSM_SCORPION
bool
@@ -82,20 +69,6 @@ config MSM_VIC
menu "Qualcomm MSM Board Type"
depends on !ARCH_MSM_DT
-config MACH_HALIBUT
- depends on ARCH_MSM
- depends on ARCH_MSM7X00A
- bool "Halibut Board (QCT SURF7201A)"
- help
- Support for the Qualcomm SURF7201A eval board.
-
-config MACH_TROUT
- depends on ARCH_MSM
- depends on ARCH_MSM7X00A
- bool "HTC Dream (aka trout)"
- help
- Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
-
config MACH_MSM7X30_SURF
depends on ARCH_MSM7X30
bool "MSM7x30 SURF"
@@ -117,9 +90,6 @@ config MACH_QSD8X50A_ST1_5
endmenu
-config MSM_SMD_PKG3
- bool
-
config MSM_PROC_COMM
bool
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 7ed4c1b..c7a5b53 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -3,7 +3,6 @@ obj-y += clock.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
-obj-$(CONFIG_ARCH_MSM7X00A) += irq.o
obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
@@ -21,9 +20,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
-obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
-obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o
-obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
deleted file mode 100644
index a775298..0000000
diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
deleted file mode 100644
index 87e1d01..0000000
diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
deleted file mode 100644
index 3723e55..0000000
diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c
deleted file mode 100644
index 77b0a26..0000000
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
deleted file mode 100644
index ccf6621..0000000
diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
deleted file mode 100644
index b2379ed..0000000
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
deleted file mode 100644
index d83404d..0000000
diff --git a/arch/arm/mach-msm/include/mach/irqs-7x00.h b/arch/arm/mach-msm/include/mach/irqs-7x00.h
deleted file mode 100644
index f1fe706..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
deleted file mode 100644
index 67dc0e9..0000000
diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
deleted file mode 100644
index ea514be..0000000
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
The MSM7x30 SoC support was added in 2009 based on code from Google's
Android kernels. Platform support is fairly minimal, and the only
changes that have been made have been trivial and cleanup changes.
This code has not been converted to device tree, and is hindering
supporting multiple-platform on ARM. If someone wishes to continue
support for this target, patches that provide devicetree and
multi-platform support can start by re-adding these files.
Signed-off-by: David Brown <[email protected]>
---
Note that this patch was made with -D. I can send the full patch on
request, and have also made the tree available at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
arch/arm/mach-msm/Kconfig | 19 +-
arch/arm/mach-msm/Makefile | 2 -
arch/arm/mach-msm/board-msm7x30.c | 157 ---------------
arch/arm/mach-msm/devices-msm7x30.c | 246 ------------------------
arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 ---------------
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 ----------
6 files changed, 1 insertion(+), 679 deletions(-)
delete mode 100644 arch/arm/mach-msm/board-msm7x30.c
delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index d43d20c..c9c113d 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -5,20 +5,9 @@ comment "Qualcomm MSM SoC Type"
choice
prompt "Qualcomm MSM SoC Type"
- default ARCH_MSM7X30
+ default ARCH_QSD8X50
depends on !ARCH_MSM_DT
-config ARCH_MSM7X30
- bool "MSM7x30"
- select ARCH_MSM_SCORPION
- select CPU_V7
- select GPIO_MSM_V1
- select MACH_MSM7X30_SURF # if !
- select MSM_GPIOMUX
- select MSM_PROC_COMM
- select MSM_SMD
- select MSM_VIC
-
config ARCH_QSD8X50
bool "QSD8X50"
select ARCH_MSM_SCORPION
@@ -69,12 +58,6 @@ config MSM_VIC
menu "Qualcomm MSM Board Type"
depends on !ARCH_MSM_DT
-config MACH_MSM7X30_SURF
- depends on ARCH_MSM7X30
- bool "MSM7x30 SURF"
- help
- Support for the Qualcomm MSM7x30 SURF eval board.
-
config MACH_QSD8X50_SURF
depends on ARCH_QSD8X50
bool "QSD8x50 SURF"
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index c7a5b53..4bc7ee4 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o
-obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o
obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o
obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
@@ -20,7 +19,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
-obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
deleted file mode 100644
index f9af5a4..0000000
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
deleted file mode 100644
index c15ea8a..0000000
diff --git a/arch/arm/mach-msm/include/mach/irqs-7x30.h b/arch/arm/mach-msm/include/mach/irqs-7x30.h
deleted file mode 100644
index 1f15902..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
deleted file mode 100644
index 198202c..0000000
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
The MSM8x50 SoC support was added in 2010 based on code from Google's
Android kernels. Platform support is fairly minimal, and the only
changes that have been made have been trivial and cleanup changes.
This code has not been converted to device tree, and is hindering
support for the multi-platform kernel on ARM. If someone wishes to
continue support for this target, patches that provide devicetree and
multi-platform support can start by re-adding these files.
Signed-off-by: David Brown <[email protected]>
---
Note that this patch was made with -D. I can send the full patch on
request, and have also made the tree available at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
arch/arm/mach-msm/Kconfig | 57 --
arch/arm/mach-msm/Makefile | 14 -
arch/arm/mach-msm/board-qsd8x50.c | 213 -----
arch/arm/mach-msm/clock-pcom.c | 177 ----
arch/arm/mach-msm/clock-pcom.h | 145 ----
arch/arm/mach-msm/devices-qsd8x50.c | 388 ---------
arch/arm/mach-msm/devices.h | 53 --
arch/arm/mach-msm/dma.c | 295 -------
arch/arm/mach-msm/gpiomux-8x50.c | 51 --
arch/arm/mach-msm/gpiomux-v1.h | 67 --
arch/arm/mach-msm/gpiomux.c | 111 ---
arch/arm/mach-msm/gpiomux.h | 84 --
arch/arm/mach-msm/include/mach/entry-macro.S | 36 -
arch/arm/mach-msm/include/mach/hardware.h | 18 -
arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 --
arch/arm/mach-msm/include/mach/irqs.h | 37 -
arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 -
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 ---
arch/arm/mach-msm/include/mach/msm_iomap.h | 53 --
arch/arm/mach-msm/include/mach/msm_smd.h | 109 ---
arch/arm/mach-msm/include/mach/sirc.h | 98 ---
arch/arm/mach-msm/include/mach/vreg.h | 29 -
arch/arm/mach-msm/io.c | 161 ----
arch/arm/mach-msm/irq-vic.c | 363 --------
arch/arm/mach-msm/last_radio_log.c | 71 --
arch/arm/mach-msm/proc_comm.c | 129 ---
arch/arm/mach-msm/proc_comm.h | 258 ------
arch/arm/mach-msm/sirc.c | 172 ----
arch/arm/mach-msm/smd.c | 1035 -----------------------
arch/arm/mach-msm/smd_debug.c | 311 -------
arch/arm/mach-msm/smd_private.h | 403 ---------
arch/arm/mach-msm/vreg.c | 220 -----
32 files changed, 5409 deletions(-)
delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/clock-pcom.c
delete mode 100644 arch/arm/mach-msm/clock-pcom.h
delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
delete mode 100644 arch/arm/mach-msm/devices.h
delete mode 100644 arch/arm/mach-msm/dma.c
delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c
delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h
delete mode 100644 arch/arm/mach-msm/gpiomux.c
delete mode 100644 arch/arm/mach-msm/gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h
delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h
delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h
delete mode 100644 arch/arm/mach-msm/io.c
delete mode 100644 arch/arm/mach-msm/irq-vic.c
delete mode 100644 arch/arm/mach-msm/last_radio_log.c
delete mode 100644 arch/arm/mach-msm/proc_comm.c
delete mode 100644 arch/arm/mach-msm/proc_comm.h
delete mode 100644 arch/arm/mach-msm/sirc.c
delete mode 100644 arch/arm/mach-msm/smd.c
delete mode 100644 arch/arm/mach-msm/smd_debug.c
delete mode 100644 arch/arm/mach-msm/smd_private.h
delete mode 100644 arch/arm/mach-msm/vreg.c
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index c9c113d..cb239ca 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -3,24 +3,6 @@ if ARCH_MSM
comment "Qualcomm MSM SoC Type"
depends on ARCH_MSM_DT
-choice
- prompt "Qualcomm MSM SoC Type"
- default ARCH_QSD8X50
- depends on !ARCH_MSM_DT
-
-config ARCH_QSD8X50
- bool "QSD8X50"
- select ARCH_MSM_SCORPION
- select CPU_V7
- select GPIO_MSM_V1
- select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
- select MSM_GPIOMUX
- select MSM_PROC_COMM
- select MSM_SMD
- select MSM_VIC
-
-endchoice
-
config ARCH_MSM8X60
bool "MSM8X60"
select ARM_GIC
@@ -46,45 +28,6 @@ config ARCH_MSM_DT
config MSM_HAS_DEBUG_UART_HS
bool
-config MSM_SOC_REV_A
- bool
-
-config ARCH_MSM_SCORPION
- bool
-
-config MSM_VIC
- bool
-
-menu "Qualcomm MSM Board Type"
- depends on !ARCH_MSM_DT
-
-config MACH_QSD8X50_SURF
- depends on ARCH_QSD8X50
- bool "QSD8x50 SURF"
- help
- Support for the Qualcomm QSD8x50 SURF eval board.
-
-config MACH_QSD8X50A_ST1_5
- depends on ARCH_QSD8X50
- bool "QSD8x50A ST1.5"
- select MSM_SOC_REV_A
- help
- Support for the Qualcomm ST1.5.
-
-endmenu
-
-config MSM_PROC_COMM
- bool
-
-config MSM_SMD
- bool
-
-config MSM_GPIOMUX
- bool
- depends on !ARCH_MSM_DT
- help
- Support for MSM V1 TLMM GPIOMUX architecture.
-
config MSM_SCM
bool
endif
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 4bc7ee4..0fa24f9 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,17 +1,6 @@
obj-y += timer.o
obj-y += clock.o
-obj-$(CONFIG_MSM_VIC) += irq-vic.o
-
-obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
-
-obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
-
-obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o
-obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o
-
-obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
-obj-$(CONFIG_MSM_SMD) += last_radio_log.o
obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
@@ -19,7 +8,4 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
-obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
-obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
-obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
deleted file mode 100644
index 5f933bc..0000000
diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c
deleted file mode 100644
index 9a80449..0000000
diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h
deleted file mode 100644
index 5bb164f..0000000
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
deleted file mode 100644
index 9e1e9ce..0000000
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
deleted file mode 100644
index dccefad..0000000
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
deleted file mode 100644
index f8f6adf..0000000
diff --git a/arch/arm/mach-msm/gpiomux-8x50.c b/arch/arm/mach-msm/gpiomux-8x50.c
deleted file mode 100644
index f7a4ea5..0000000
diff --git a/arch/arm/mach-msm/gpiomux-v1.h b/arch/arm/mach-msm/gpiomux-v1.h
deleted file mode 100644
index 71d86fe..0000000
diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c
deleted file mode 100644
index 2b8e2d2..0000000
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
deleted file mode 100644
index 4410d77..0000000
diff --git a/arch/arm/mach-msm/include/mach/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S
deleted file mode 100644
index f2ae908..0000000
diff --git a/arch/arm/mach-msm/include/mach/hardware.h b/arch/arm/mach-msm/include/mach/hardware.h
deleted file mode 100644
index 2d12609..0000000
diff --git a/arch/arm/mach-msm/include/mach/irqs-8x50.h b/arch/arm/mach-msm/include/mach/irqs-8x50.h
deleted file mode 100644
index 26adbe0..0000000
diff --git a/arch/arm/mach-msm/include/mach/irqs.h b/arch/arm/mach-msm/include/mach/irqs.h
deleted file mode 100644
index 164d355..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_gpiomux.h b/arch/arm/mach-msm/include/mach/msm_gpiomux.h
deleted file mode 100644
index 0c7d393..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
deleted file mode 100644
index 0faa894..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
deleted file mode 100644
index 0e4f491..0000000
diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/arch/arm/mach-msm/include/mach/msm_smd.h
deleted file mode 100644
index 029463e..0000000
diff --git a/arch/arm/mach-msm/include/mach/sirc.h b/arch/arm/mach-msm/include/mach/sirc.h
deleted file mode 100644
index ef55868..0000000
diff --git a/arch/arm/mach-msm/include/mach/vreg.h b/arch/arm/mach-msm/include/mach/vreg.h
deleted file mode 100644
index 6626e78..0000000
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
deleted file mode 100644
index adc8971..0000000
diff --git a/arch/arm/mach-msm/irq-vic.c b/arch/arm/mach-msm/irq-vic.c
deleted file mode 100644
index 1b54f80..0000000
diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c
deleted file mode 100644
index 9c392a2..0000000
diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c
deleted file mode 100644
index 507f5ca..0000000
diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
deleted file mode 100644
index e8d043a..0000000
diff --git a/arch/arm/mach-msm/sirc.c b/arch/arm/mach-msm/sirc.c
deleted file mode 100644
index 689e78c..0000000
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
deleted file mode 100644
index b1588a1..0000000
diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c
deleted file mode 100644
index 8056b3e..0000000
diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h
deleted file mode 100644
index 727bfe6..0000000
diff --git a/arch/arm/mach-msm/vreg.c b/arch/arm/mach-msm/vreg.c
deleted file mode 100644
index bd66ed0..0000000
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
These board files were added in 2010, and have never been compiled in
the tree. If these targets were to be included, at this point, they
would need to be done using device tree, so there is no reason to keep
these files around.
Signed-off-by: David Brown <[email protected]>
---
Note that this patch was made with -D. I can send the full patch on
request, and have also made the tree available at:
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
arch/arm/mach-msm/board-mahimahi.c | 88 ----------------------------
arch/arm/mach-msm/board-sapphire.c | 117 -------------------------------------
2 files changed, 205 deletions(-)
delete mode 100644 arch/arm/mach-msm/board-mahimahi.c
delete mode 100644 arch/arm/mach-msm/board-sapphire.c
diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c
deleted file mode 100644
index 7d9981c..0000000
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c
deleted file mode 100644
index 3276051..0000000
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
That's not very nice .. You know there is a device connect with this
that several of us have..
On Mon, Oct 28, 2013 at 01:43:24PM -0700, David Brown wrote:
> Support for the MSM7x00 SoCs was added starting in 2008 based on code
> from Google's Android kernels. Platform support is fairly minimal,
> and there have primarily been trivial and cleanup changes to this
> code.
>
> This code has not been converted to device tree, and is hindering
> supporting multi-platform on ARM. If someone wishes to continue
> support for this target, patches that provide devicetree and
> multi-platform support can start by re-adding these files.
>
> Signed-off-by: David Brown <[email protected]>
> ---
> Note that this patch was made with -D. I can send the full patch on
> request, and have also made the tree available at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
>
> arch/arm/mach-msm/Kconfig | 32 +-
> arch/arm/mach-msm/Makefile | 4 -
> arch/arm/mach-msm/board-halibut.c | 110 ------
> arch/arm/mach-msm/board-trout-gpio.c | 233 ------------
> arch/arm/mach-msm/board-trout-mmc.c | 185 ---------
> arch/arm/mach-msm/board-trout-panel.c | 292 --------------
> arch/arm/mach-msm/board-trout.c | 113 ------
> arch/arm/mach-msm/board-trout.h | 162 --------
> arch/arm/mach-msm/devices-msm7x00.c | 480 ------------------------
> arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 ----
> arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 ------
> arch/arm/mach-msm/irq.c | 151 --------
> 12 files changed, 1 insertion(+), 1944 deletions(-)
> delete mode 100644 arch/arm/mach-msm/board-halibut.c
> delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
> delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
> delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
> delete mode 100644 arch/arm/mach-msm/board-trout.c
> delete mode 100644 arch/arm/mach-msm/board-trout.h
> delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
> delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
> delete mode 100644 arch/arm/mach-msm/irq.c
>
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index 2586c28..d43d20c 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -5,19 +5,9 @@ comment "Qualcomm MSM SoC Type"
>
> choice
> prompt "Qualcomm MSM SoC Type"
> - default ARCH_MSM7X00A
> + default ARCH_MSM7X30
> depends on !ARCH_MSM_DT
>
> -config ARCH_MSM7X00A
> - bool "MSM7x00A / MSM7x01A"
> - select ARCH_MSM_ARM11
> - select CPU_V6
> - select GPIO_MSM_V1
> - select MACH_TROUT if !MACH_HALIBUT
> - select MSM_PROC_COMM
> - select MSM_SMD
> - select MSM_SMD_PKG3
> -
> config ARCH_MSM7X30
> bool "MSM7x30"
> select ARCH_MSM_SCORPION
> @@ -70,9 +60,6 @@ config MSM_HAS_DEBUG_UART_HS
> config MSM_SOC_REV_A
> bool
>
> -config ARCH_MSM_ARM11
> - bool
> -
> config ARCH_MSM_SCORPION
> bool
>
> @@ -82,20 +69,6 @@ config MSM_VIC
> menu "Qualcomm MSM Board Type"
> depends on !ARCH_MSM_DT
>
> -config MACH_HALIBUT
> - depends on ARCH_MSM
> - depends on ARCH_MSM7X00A
> - bool "Halibut Board (QCT SURF7201A)"
> - help
> - Support for the Qualcomm SURF7201A eval board.
> -
> -config MACH_TROUT
> - depends on ARCH_MSM
> - depends on ARCH_MSM7X00A
> - bool "HTC Dream (aka trout)"
> - help
> - Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
> -
> config MACH_MSM7X30_SURF
> depends on ARCH_MSM7X30
> bool "MSM7x30 SURF"
> @@ -117,9 +90,6 @@ config MACH_QSD8X50A_ST1_5
>
> endmenu
>
> -config MSM_SMD_PKG3
> - bool
> -
> config MSM_PROC_COMM
> bool
>
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index 7ed4c1b..c7a5b53 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -3,7 +3,6 @@ obj-y += clock.o
>
> obj-$(CONFIG_MSM_VIC) += irq-vic.o
>
> -obj-$(CONFIG_ARCH_MSM7X00A) += irq.o
> obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
>
> obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
> @@ -21,9 +20,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
> obj-$(CONFIG_SMP) += headsmp.o platsmp.o
>
> -obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
> -obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o
> -obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
> obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
> obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
> obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
> diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
> deleted file mode 100644
> index a775298..0000000
> diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
> deleted file mode 100644
> index 87e1d01..0000000
> diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
> deleted file mode 100644
> index 3723e55..0000000
> diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c
> deleted file mode 100644
> index 77b0a26..0000000
> diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
> deleted file mode 100644
> index ccf6621..0000000
> diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
> deleted file mode 100644
> index b2379ed..0000000
> diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
> deleted file mode 100644
> index d83404d..0000000
> diff --git a/arch/arm/mach-msm/include/mach/irqs-7x00.h b/arch/arm/mach-msm/include/mach/irqs-7x00.h
> deleted file mode 100644
> index f1fe706..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
> deleted file mode 100644
> index 67dc0e9..0000000
> diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
> deleted file mode 100644
> index ea514be..0000000
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
Daniel,
I would be very happy to take more code for the older Qualcomm chipset
to enable full functionality for them, but it's been my impression
that far from all that is needed to make it a useful platform is in
the upstream kernel, and there's been no signs of more of it showing
up at least in the last two years.
So we have a bit of a stalemate here -- the current Qualcomm team
wants to avoid having to deal too much with the legacy platforms --
they are technically quite different from the current platforms and
the divergence makes it hard to deal with supporting it all in a
modern way without risking regressions. I tend to agree with them.
Just like omap split between omap1 and omap2plus, I think it's a time
to create a mach-qcom instead, and move the modern (v7, most likely)
platforms there -- enable them with device tree, modern framework
infrastructure, etc. That way you can keep older platforms in mach-msm
without risk of regressions, and they have a clean base to start on
with their later platforms.
-Olof
On Tue, Oct 29, 2013 at 6:21 AM, Daniel Walker <[email protected]> wrote:
>
> That's not very nice .. You know there is a device connect with this
> that several of us have..
>
>
> On Mon, Oct 28, 2013 at 01:43:24PM -0700, David Brown wrote:
>> Support for the MSM7x00 SoCs was added starting in 2008 based on code
>> from Google's Android kernels. Platform support is fairly minimal,
>> and there have primarily been trivial and cleanup changes to this
>> code.
>>
>> This code has not been converted to device tree, and is hindering
>> supporting multi-platform on ARM. If someone wishes to continue
>> support for this target, patches that provide devicetree and
>> multi-platform support can start by re-adding these files.
>>
>> Signed-off-by: David Brown <[email protected]>
>> ---
>> Note that this patch was made with -D. I can send the full patch on
>> request, and have also made the tree available at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
>>
>> arch/arm/mach-msm/Kconfig | 32 +-
>> arch/arm/mach-msm/Makefile | 4 -
>> arch/arm/mach-msm/board-halibut.c | 110 ------
>> arch/arm/mach-msm/board-trout-gpio.c | 233 ------------
>> arch/arm/mach-msm/board-trout-mmc.c | 185 ---------
>> arch/arm/mach-msm/board-trout-panel.c | 292 --------------
>> arch/arm/mach-msm/board-trout.c | 113 ------
>> arch/arm/mach-msm/board-trout.h | 162 --------
>> arch/arm/mach-msm/devices-msm7x00.c | 480 ------------------------
>> arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 ----
>> arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 108 ------
>> arch/arm/mach-msm/irq.c | 151 --------
>> 12 files changed, 1 insertion(+), 1944 deletions(-)
>> delete mode 100644 arch/arm/mach-msm/board-halibut.c
>> delete mode 100644 arch/arm/mach-msm/board-trout-gpio.c
>> delete mode 100644 arch/arm/mach-msm/board-trout-mmc.c
>> delete mode 100644 arch/arm/mach-msm/board-trout-panel.c
>> delete mode 100644 arch/arm/mach-msm/board-trout.c
>> delete mode 100644 arch/arm/mach-msm/board-trout.h
>> delete mode 100644 arch/arm/mach-msm/devices-msm7x00.c
>> delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
>> delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
>> delete mode 100644 arch/arm/mach-msm/irq.c
>>
>> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
>> index 2586c28..d43d20c 100644
>> --- a/arch/arm/mach-msm/Kconfig
>> +++ b/arch/arm/mach-msm/Kconfig
>> @@ -5,19 +5,9 @@ comment "Qualcomm MSM SoC Type"
>>
>> choice
>> prompt "Qualcomm MSM SoC Type"
>> - default ARCH_MSM7X00A
>> + default ARCH_MSM7X30
>> depends on !ARCH_MSM_DT
>>
>> -config ARCH_MSM7X00A
>> - bool "MSM7x00A / MSM7x01A"
>> - select ARCH_MSM_ARM11
>> - select CPU_V6
>> - select GPIO_MSM_V1
>> - select MACH_TROUT if !MACH_HALIBUT
>> - select MSM_PROC_COMM
>> - select MSM_SMD
>> - select MSM_SMD_PKG3
>> -
>> config ARCH_MSM7X30
>> bool "MSM7x30"
>> select ARCH_MSM_SCORPION
>> @@ -70,9 +60,6 @@ config MSM_HAS_DEBUG_UART_HS
>> config MSM_SOC_REV_A
>> bool
>>
>> -config ARCH_MSM_ARM11
>> - bool
>> -
>> config ARCH_MSM_SCORPION
>> bool
>>
>> @@ -82,20 +69,6 @@ config MSM_VIC
>> menu "Qualcomm MSM Board Type"
>> depends on !ARCH_MSM_DT
>>
>> -config MACH_HALIBUT
>> - depends on ARCH_MSM
>> - depends on ARCH_MSM7X00A
>> - bool "Halibut Board (QCT SURF7201A)"
>> - help
>> - Support for the Qualcomm SURF7201A eval board.
>> -
>> -config MACH_TROUT
>> - depends on ARCH_MSM
>> - depends on ARCH_MSM7X00A
>> - bool "HTC Dream (aka trout)"
>> - help
>> - Support for the HTC Dream, T-Mobile G1, Android ADP1 devices.
>> -
>> config MACH_MSM7X30_SURF
>> depends on ARCH_MSM7X30
>> bool "MSM7x30 SURF"
>> @@ -117,9 +90,6 @@ config MACH_QSD8X50A_ST1_5
>>
>> endmenu
>>
>> -config MSM_SMD_PKG3
>> - bool
>> -
>> config MSM_PROC_COMM
>> bool
>>
>> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
>> index 7ed4c1b..c7a5b53 100644
>> --- a/arch/arm/mach-msm/Makefile
>> +++ b/arch/arm/mach-msm/Makefile
>> @@ -3,7 +3,6 @@ obj-y += clock.o
>>
>> obj-$(CONFIG_MSM_VIC) += irq-vic.o
>>
>> -obj-$(CONFIG_ARCH_MSM7X00A) += irq.o
>> obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
>>
>> obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
>> @@ -21,9 +20,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
>> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
>> obj-$(CONFIG_SMP) += headsmp.o platsmp.o
>>
>> -obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o
>> -obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o
>> -obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
>> obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
>> obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
>> obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
>> diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
>> deleted file mode 100644
>> index a775298..0000000
>> diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
>> deleted file mode 100644
>> index 87e1d01..0000000
>> diff --git a/arch/arm/mach-msm/board-trout-mmc.c b/arch/arm/mach-msm/board-trout-mmc.c
>> deleted file mode 100644
>> index 3723e55..0000000
>> diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c
>> deleted file mode 100644
>> index 77b0a26..0000000
>> diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
>> deleted file mode 100644
>> index ccf6621..0000000
>> diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
>> deleted file mode 100644
>> index b2379ed..0000000
>> diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
>> deleted file mode 100644
>> index d83404d..0000000
>> diff --git a/arch/arm/mach-msm/include/mach/irqs-7x00.h b/arch/arm/mach-msm/include/mach/irqs-7x00.h
>> deleted file mode 100644
>> index f1fe706..0000000
>> diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
>> deleted file mode 100644
>> index 67dc0e9..0000000
>> diff --git a/arch/arm/mach-msm/irq.c b/arch/arm/mach-msm/irq.c
>> deleted file mode 100644
>> index ea514be..0000000
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
>> hosted by The Linux Foundation
>>
On Tue, Oct 29, 2013 at 08:37:28AM -0700, Olof Johansson wrote:
> Daniel,
>
> I would be very happy to take more code for the older Qualcomm chipset
> to enable full functionality for them, but it's been my impression
> that far from all that is needed to make it a useful platform is in
> the upstream kernel, and there's been no signs of more of it showing
> up at least in the last two years.
Some of the platform code he's removing is not compiled right now. I
would have liked to make it compile, but I don't care that much (and
they don't either) ..
> So we have a bit of a stalemate here -- the current Qualcomm team
> wants to avoid having to deal too much with the legacy platforms --
> they are technically quite different from the current platforms and
> the divergence makes it hard to deal with supporting it all in a
> modern way without risking regressions. I tend to agree with them.
Oh what a sob story .. They can't claim to maintain msm except for the
parts they don't like that much, thats not how it works. If you
have a technical reason why you think hard to maintain code is
"hard to deal with", please put that forth .
If they want they can start submitting their patches to me, and I can
deal with their "hard to deal with" stuff..
> Just like omap split between omap1 and omap2plus, I think it's a time
> to create a mach-qcom instead, and move the modern (v7, most likely)
> platforms there -- enable them with device tree, modern framework
> infrastructure, etc. That way you can keep older platforms in mach-msm
> without risk of regressions, and they have a clean base to start on
> with their later platforms.
Personally I think splitting mach- stuff isn't very useful or
interesting.. There's just no technical reason for it, for example x86
and x86_64 was a win from my perspective , there's a lot more reason to
keep similar things together than to split things up.
The whole risking regressions, do you have proof of why you think that's
happening ? The inverse seems more likely..
Daniel
On Tue, Oct 29, 2013 at 10:08 AM, Daniel Walker <[email protected]> wrote:
> Personally I think splitting mach- stuff isn't very useful or
> interesting.. There's just no technical reason for it, for example x86
> and x86_64 was a win from my perspective , there's a lot more reason to
> keep similar things together than to split things up.
There are definitely valid technical reasons for it; the old and new
platforms share no code, and the legacy platforms are unlikely to be
updated to modern infrastructure anytime soon. Other platforms are
managed in similar manners, such as OMAP, imx/mxs, etc.
-Olof
* Olof Johansson <[email protected]> [131029 10:40]:
> On Tue, Oct 29, 2013 at 10:08 AM, Daniel Walker <[email protected]> wrote:
>
> > Personally I think splitting mach- stuff isn't very useful or
> > interesting.. There's just no technical reason for it, for example x86
> > and x86_64 was a win from my perspective , there's a lot more reason to
> > keep similar things together than to split things up.
>
> There are definitely valid technical reasons for it; the old and new
> platforms share no code, and the legacy platforms are unlikely to be
> updated to modern infrastructure anytime soon. Other platforms are
> managed in similar manners, such as OMAP, imx/mxs, etc.
Yeah there are still few valid reasons to have separate mach directories.
The main reason why mach-omap2 was originally set up separately from
mach-omap1 was because the IO space was different. And we could not
properly deal with that until CONFIG_ARM_PATCH_PHYS_VIRT few years ago.
So we placed the shared code into plat-omap, which worked OK but is
not really needed any longer with device tree. We have only dmtimer
and legacy DMA code left in plat-omap pretty much. And those will be
moved to live under drivers/.
Even with most issues fixed, it still does not not make sense to merge
mach-omap1 and mach-omap2. For example, even if somebody wanted to do it
as a hobby project, we'd have to compile things with v4 or v5 flags,
which won't work properly for SMP cores at least :)
Regards,
Tony
On Tue, Oct 29, 2013 at 10:39:45AM -0700, Olof Johansson wrote:
> On Tue, Oct 29, 2013 at 10:08 AM, Daniel Walker <[email protected]> wrote:
>
> > Personally I think splitting mach- stuff isn't very useful or
> > interesting.. There's just no technical reason for it, for example x86
> > and x86_64 was a win from my perspective , there's a lot more reason to
> > keep similar things together than to split things up.
>
> There are definitely valid technical reasons for it; the old and new
> platforms share no code, and the legacy platforms are unlikely to be
> updated to modern infrastructure anytime soon. Other platforms are
> managed in similar manners, such as OMAP, imx/mxs, etc.
Are you speaking from a meta perspective , or you have specific example
in msm code ?
Daniel
Why wouldn't you just update it to use the device tree ? There are lots
of phones our there using 7x30 ..
This is one that Qualcomm specifically upstreamed, so what was the point
of upstreaming it ?
On Mon, Oct 28, 2013 at 01:43:25PM -0700, David Brown wrote:
> The MSM7x30 SoC support was added in 2009 based on code from Google's
> Android kernels. Platform support is fairly minimal, and the only
> changes that have been made have been trivial and cleanup changes.
>
> This code has not been converted to device tree, and is hindering
> supporting multiple-platform on ARM. If someone wishes to continue
> support for this target, patches that provide devicetree and
> multi-platform support can start by re-adding these files.
>
> Signed-off-by: David Brown <[email protected]>
> ---
> Note that this patch was made with -D. I can send the full patch on
> request, and have also made the tree available at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
>
> arch/arm/mach-msm/Kconfig | 19 +-
> arch/arm/mach-msm/Makefile | 2 -
> arch/arm/mach-msm/board-msm7x30.c | 157 ---------------
> arch/arm/mach-msm/devices-msm7x30.c | 246 ------------------------
> arch/arm/mach-msm/include/mach/irqs-7x30.h | 153 ---------------
> arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 103 ----------
> 6 files changed, 1 insertion(+), 679 deletions(-)
> delete mode 100644 arch/arm/mach-msm/board-msm7x30.c
> delete mode 100644 arch/arm/mach-msm/devices-msm7x30.c
> delete mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
>
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index d43d20c..c9c113d 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -5,20 +5,9 @@ comment "Qualcomm MSM SoC Type"
>
> choice
> prompt "Qualcomm MSM SoC Type"
> - default ARCH_MSM7X30
> + default ARCH_QSD8X50
> depends on !ARCH_MSM_DT
>
> -config ARCH_MSM7X30
> - bool "MSM7x30"
> - select ARCH_MSM_SCORPION
> - select CPU_V7
> - select GPIO_MSM_V1
> - select MACH_MSM7X30_SURF # if !
> - select MSM_GPIOMUX
> - select MSM_PROC_COMM
> - select MSM_SMD
> - select MSM_VIC
> -
> config ARCH_QSD8X50
> bool "QSD8X50"
> select ARCH_MSM_SCORPION
> @@ -69,12 +58,6 @@ config MSM_VIC
> menu "Qualcomm MSM Board Type"
> depends on !ARCH_MSM_DT
>
> -config MACH_MSM7X30_SURF
> - depends on ARCH_MSM7X30
> - bool "MSM7x30 SURF"
> - help
> - Support for the Qualcomm MSM7x30 SURF eval board.
> -
> config MACH_QSD8X50_SURF
> depends on ARCH_QSD8X50
> bool "QSD8x50 SURF"
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index c7a5b53..4bc7ee4 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -8,7 +8,6 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
> obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
>
> obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o
> -obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o
> obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o
>
> obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
> @@ -20,7 +19,6 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
> obj-$(CONFIG_SMP) += headsmp.o platsmp.o
>
> -obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
> obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
> obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
> obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
> diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
> deleted file mode 100644
> index f9af5a4..0000000
> diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
> deleted file mode 100644
> index c15ea8a..0000000
> diff --git a/arch/arm/mach-msm/include/mach/irqs-7x30.h b/arch/arm/mach-msm/include/mach/irqs-7x30.h
> deleted file mode 100644
> index 1f15902..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
> deleted file mode 100644
> index 198202c..0000000
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
Isn't this the Nexus one platform ? Same as the last one , why don't you
just update it to use the device tree? This doesn't seem like it would
be all that difficult.
On Mon, Oct 28, 2013 at 01:43:26PM -0700, David Brown wrote:
> The MSM8x50 SoC support was added in 2010 based on code from Google's
> Android kernels. Platform support is fairly minimal, and the only
> changes that have been made have been trivial and cleanup changes.
>
> This code has not been converted to device tree, and is hindering
> support for the multi-platform kernel on ARM. If someone wishes to
> continue support for this target, patches that provide devicetree and
> multi-platform support can start by re-adding these files.
>
> Signed-off-by: David Brown <[email protected]>
> ---
> Note that this patch was made with -D. I can send the full patch on
> request, and have also made the tree available at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git for-3.14/big-cleanup
>
> arch/arm/mach-msm/Kconfig | 57 --
> arch/arm/mach-msm/Makefile | 14 -
> arch/arm/mach-msm/board-qsd8x50.c | 213 -----
> arch/arm/mach-msm/clock-pcom.c | 177 ----
> arch/arm/mach-msm/clock-pcom.h | 145 ----
> arch/arm/mach-msm/devices-qsd8x50.c | 388 ---------
> arch/arm/mach-msm/devices.h | 53 --
> arch/arm/mach-msm/dma.c | 295 -------
> arch/arm/mach-msm/gpiomux-8x50.c | 51 --
> arch/arm/mach-msm/gpiomux-v1.h | 67 --
> arch/arm/mach-msm/gpiomux.c | 111 ---
> arch/arm/mach-msm/gpiomux.h | 84 --
> arch/arm/mach-msm/include/mach/entry-macro.S | 36 -
> arch/arm/mach-msm/include/mach/hardware.h | 18 -
> arch/arm/mach-msm/include/mach/irqs-8x50.h | 88 --
> arch/arm/mach-msm/include/mach/irqs.h | 37 -
> arch/arm/mach-msm/include/mach/msm_gpiomux.h | 38 -
> arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 125 ---
> arch/arm/mach-msm/include/mach/msm_iomap.h | 53 --
> arch/arm/mach-msm/include/mach/msm_smd.h | 109 ---
> arch/arm/mach-msm/include/mach/sirc.h | 98 ---
> arch/arm/mach-msm/include/mach/vreg.h | 29 -
> arch/arm/mach-msm/io.c | 161 ----
> arch/arm/mach-msm/irq-vic.c | 363 --------
> arch/arm/mach-msm/last_radio_log.c | 71 --
> arch/arm/mach-msm/proc_comm.c | 129 ---
> arch/arm/mach-msm/proc_comm.h | 258 ------
> arch/arm/mach-msm/sirc.c | 172 ----
> arch/arm/mach-msm/smd.c | 1035 -----------------------
> arch/arm/mach-msm/smd_debug.c | 311 -------
> arch/arm/mach-msm/smd_private.h | 403 ---------
> arch/arm/mach-msm/vreg.c | 220 -----
> 32 files changed, 5409 deletions(-)
> delete mode 100644 arch/arm/mach-msm/board-qsd8x50.c
> delete mode 100644 arch/arm/mach-msm/clock-pcom.c
> delete mode 100644 arch/arm/mach-msm/clock-pcom.h
> delete mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
> delete mode 100644 arch/arm/mach-msm/devices.h
> delete mode 100644 arch/arm/mach-msm/dma.c
> delete mode 100644 arch/arm/mach-msm/gpiomux-8x50.c
> delete mode 100644 arch/arm/mach-msm/gpiomux-v1.h
> delete mode 100644 arch/arm/mach-msm/gpiomux.c
> delete mode 100644 arch/arm/mach-msm/gpiomux.h
> delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro.S
> delete mode 100644 arch/arm/mach-msm/include/mach/hardware.h
> delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
> delete mode 100644 arch/arm/mach-msm/include/mach/irqs.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_gpiomux.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_iomap.h
> delete mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
> delete mode 100644 arch/arm/mach-msm/include/mach/sirc.h
> delete mode 100644 arch/arm/mach-msm/include/mach/vreg.h
> delete mode 100644 arch/arm/mach-msm/io.c
> delete mode 100644 arch/arm/mach-msm/irq-vic.c
> delete mode 100644 arch/arm/mach-msm/last_radio_log.c
> delete mode 100644 arch/arm/mach-msm/proc_comm.c
> delete mode 100644 arch/arm/mach-msm/proc_comm.h
> delete mode 100644 arch/arm/mach-msm/sirc.c
> delete mode 100644 arch/arm/mach-msm/smd.c
> delete mode 100644 arch/arm/mach-msm/smd_debug.c
> delete mode 100644 arch/arm/mach-msm/smd_private.h
> delete mode 100644 arch/arm/mach-msm/vreg.c
>
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index c9c113d..cb239ca 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -3,24 +3,6 @@ if ARCH_MSM
> comment "Qualcomm MSM SoC Type"
> depends on ARCH_MSM_DT
>
> -choice
> - prompt "Qualcomm MSM SoC Type"
> - default ARCH_QSD8X50
> - depends on !ARCH_MSM_DT
> -
> -config ARCH_QSD8X50
> - bool "QSD8X50"
> - select ARCH_MSM_SCORPION
> - select CPU_V7
> - select GPIO_MSM_V1
> - select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5
> - select MSM_GPIOMUX
> - select MSM_PROC_COMM
> - select MSM_SMD
> - select MSM_VIC
> -
> -endchoice
> -
> config ARCH_MSM8X60
> bool "MSM8X60"
> select ARM_GIC
> @@ -46,45 +28,6 @@ config ARCH_MSM_DT
> config MSM_HAS_DEBUG_UART_HS
> bool
>
> -config MSM_SOC_REV_A
> - bool
> -
> -config ARCH_MSM_SCORPION
> - bool
> -
> -config MSM_VIC
> - bool
> -
> -menu "Qualcomm MSM Board Type"
> - depends on !ARCH_MSM_DT
> -
> -config MACH_QSD8X50_SURF
> - depends on ARCH_QSD8X50
> - bool "QSD8x50 SURF"
> - help
> - Support for the Qualcomm QSD8x50 SURF eval board.
> -
> -config MACH_QSD8X50A_ST1_5
> - depends on ARCH_QSD8X50
> - bool "QSD8x50A ST1.5"
> - select MSM_SOC_REV_A
> - help
> - Support for the Qualcomm ST1.5.
> -
> -endmenu
> -
> -config MSM_PROC_COMM
> - bool
> -
> -config MSM_SMD
> - bool
> -
> -config MSM_GPIOMUX
> - bool
> - depends on !ARCH_MSM_DT
> - help
> - Support for MSM V1 TLMM GPIOMUX architecture.
> -
> config MSM_SCM
> bool
> endif
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index 4bc7ee4..0fa24f9 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -1,17 +1,6 @@
> obj-y += timer.o
> obj-y += clock.o
>
> -obj-$(CONFIG_MSM_VIC) += irq-vic.o
> -
> -obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
> -
> -obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
> -
> -obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o
> -obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o
> -
> -obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
> -obj-$(CONFIG_MSM_SMD) += last_radio_log.o
> obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
>
> CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
> @@ -19,7 +8,4 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)
> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
> obj-$(CONFIG_SMP) += headsmp.o platsmp.o
>
> -obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
> obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o
> -obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o
> -obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o
> diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
> deleted file mode 100644
> index 5f933bc..0000000
> diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c
> deleted file mode 100644
> index 9a80449..0000000
> diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h
> deleted file mode 100644
> index 5bb164f..0000000
> diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
> deleted file mode 100644
> index 9e1e9ce..0000000
> diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
> deleted file mode 100644
> index dccefad..0000000
> diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c
> deleted file mode 100644
> index f8f6adf..0000000
> diff --git a/arch/arm/mach-msm/gpiomux-8x50.c b/arch/arm/mach-msm/gpiomux-8x50.c
> deleted file mode 100644
> index f7a4ea5..0000000
> diff --git a/arch/arm/mach-msm/gpiomux-v1.h b/arch/arm/mach-msm/gpiomux-v1.h
> deleted file mode 100644
> index 71d86fe..0000000
> diff --git a/arch/arm/mach-msm/gpiomux.c b/arch/arm/mach-msm/gpiomux.c
> deleted file mode 100644
> index 2b8e2d2..0000000
> diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h
> deleted file mode 100644
> index 4410d77..0000000
> diff --git a/arch/arm/mach-msm/include/mach/entry-macro.S b/arch/arm/mach-msm/include/mach/entry-macro.S
> deleted file mode 100644
> index f2ae908..0000000
> diff --git a/arch/arm/mach-msm/include/mach/hardware.h b/arch/arm/mach-msm/include/mach/hardware.h
> deleted file mode 100644
> index 2d12609..0000000
> diff --git a/arch/arm/mach-msm/include/mach/irqs-8x50.h b/arch/arm/mach-msm/include/mach/irqs-8x50.h
> deleted file mode 100644
> index 26adbe0..0000000
> diff --git a/arch/arm/mach-msm/include/mach/irqs.h b/arch/arm/mach-msm/include/mach/irqs.h
> deleted file mode 100644
> index 164d355..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_gpiomux.h b/arch/arm/mach-msm/include/mach/msm_gpiomux.h
> deleted file mode 100644
> index 0c7d393..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
> deleted file mode 100644
> index 0faa894..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
> deleted file mode 100644
> index 0e4f491..0000000
> diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/arch/arm/mach-msm/include/mach/msm_smd.h
> deleted file mode 100644
> index 029463e..0000000
> diff --git a/arch/arm/mach-msm/include/mach/sirc.h b/arch/arm/mach-msm/include/mach/sirc.h
> deleted file mode 100644
> index ef55868..0000000
> diff --git a/arch/arm/mach-msm/include/mach/vreg.h b/arch/arm/mach-msm/include/mach/vreg.h
> deleted file mode 100644
> index 6626e78..0000000
> diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
> deleted file mode 100644
> index adc8971..0000000
> diff --git a/arch/arm/mach-msm/irq-vic.c b/arch/arm/mach-msm/irq-vic.c
> deleted file mode 100644
> index 1b54f80..0000000
> diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c
> deleted file mode 100644
> index 9c392a2..0000000
> diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c
> deleted file mode 100644
> index 507f5ca..0000000
> diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
> deleted file mode 100644
> index e8d043a..0000000
> diff --git a/arch/arm/mach-msm/sirc.c b/arch/arm/mach-msm/sirc.c
> deleted file mode 100644
> index 689e78c..0000000
> diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
> deleted file mode 100644
> index b1588a1..0000000
> diff --git a/arch/arm/mach-msm/smd_debug.c b/arch/arm/mach-msm/smd_debug.c
> deleted file mode 100644
> index 8056b3e..0000000
> diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h
> deleted file mode 100644
> index 727bfe6..0000000
> diff --git a/arch/arm/mach-msm/vreg.c b/arch/arm/mach-msm/vreg.c
> deleted file mode 100644
> index bd66ed0..0000000
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
On Tuesday 29 October 2013, Daniel Walker wrote:
> Why wouldn't you just update it to use the device tree ? There are lots
> of phones our there using 7x30 ..
>
> This is one that Qualcomm specifically upstreamed, so what was the point
> of upstreaming it ?
Things like this happen a lot: you start with great ambitions, then real
life takes over and everybody who was once working on it has moved on to
other projects before the code actually works.
We have the policy to let new code for incomplete platforms into the
tree very liberally, but the flip side is that we have to remove them
as swiftly if progress stops. Note that this is completely different
from most of the older platforms like the StrongARM based machines
that are way more outdated but are actually working just fine and
getting fixed when they don't.
The MSM platform is currently a mess with most SoCs broken most of
the time. I definitely agree with David's approach of removing the
ones that are not being worked on and finally getting the newer ones
to work properly, and on the same level as the other platforms.
Once that work is complete, adding back support for the older SoCs
should become much easier if anyone is still interested, since the
required changes (multiplatform, DT, ...) are targetted at reducing
the effort of maintaining platforms.
Arnd
On Tuesday 29 October 2013, Daniel Walker wrote:
> Isn't this the Nexus one platform ? Same as the last one , why don't you
> just update it to use the device tree? This doesn't seem like it would
> be all that difficult.
Please don't top-post.
> On Mon, Oct 28, 2013 at 01:43:26PM -0700, David Brown wrote:
> >
> > This code has not been converted to device tree, and is hindering
> > support for the multi-platform kernel on ARM. If someone wishes to
> > continue support for this target, patches that provide devicetree and
> > multi-platform support can start by re-adding these files.
^ Here is your answer.
While I'd definitely love to see support for the Nexus One upstream,
it is evident that nobody has been working on this for a long time.
Arnd
On Wed, Oct 30, 2013 at 02:30:23PM +0100, Arnd Bergmann wrote:
> On Tuesday 29 October 2013, Daniel Walker wrote:
> > Isn't this the Nexus one platform ? Same as the last one , why don't you
> > just update it to use the device tree? This doesn't seem like it would
> > be all that difficult.
>
> Please don't top-post.
Seriously ? I was responding to the whole comment, don't be so pedantic
..
>
> > On Mon, Oct 28, 2013 at 01:43:26PM -0700, David Brown wrote:
> > >
> > > This code has not been converted to device tree, and is hindering
> > > support for the multi-platform kernel on ARM. If someone wishes to
> > > continue support for this target, patches that provide devicetree and
> > > multi-platform support can start by re-adding these files.
>
> ^ Here is your answer.
>
>
> While I'd definitely love to see support for the Nexus One upstream,
> it is evident that nobody has been working on this for a long time.
I have a device with this chip in it .. I would like that device not to
disappear from Linux .. Doing this puts an un-do burden on users
who would like to see this support go in, but if it's removed like this
that will never happen. No one has an much information on these chips as
Qualcomm .. It's not realistic that any user would be able to do a
lot without their support.. By allowing them to remove code for these
device it effectively ends and chance of them have more code support added..
Yet the devices exist in mass amounts.
To be honest your not an MSM maintainer, are there are political issue
related to this.. This isn't particularly technical because converting
these relatively simple platform to the device tree shouldn't be all
that difficult. To me Your involvement is puzzling .. Myself and my
co-maintainers need to be the ones discussing this..
G1 code is also getting removed in this series, and the code for this
creates a usable device .. The problem here is that you really can't
start randomly removing support for platforms that people have and want
them to continue working. We have a process for that, and typically user
objections weight heavily in that process (read, feature-removal-schedule.txt)
Daniel
Olof Johansson <[email protected]> writes:
> I would be very happy to take more code for the older Qualcomm chipset
> to enable full functionality for them, but it's been my impression
> that far from all that is needed to make it a useful platform is in
> the upstream kernel, and there's been no signs of more of it showing
> up at least in the last two years.
>
> So we have a bit of a stalemate here -- the current Qualcomm team
> wants to avoid having to deal too much with the legacy platforms --
> they are technically quite different from the current platforms and
> the divergence makes it hard to deal with supporting it all in a
> modern way without risking regressions. I tend to agree with them.
As do I.
> Just like omap split between omap1 and omap2plus, I think it's a time
> to create a mach-qcom instead, and move the modern (v7, most likely)
> platforms there -- enable them with device tree, modern framework
> infrastructure, etc. That way you can keep older platforms in mach-msm
> without risk of regressions, and they have a clean base to start on
> with their later platforms.
I think this split approach is a good compromise.
If the maintainers of the current older platforms wish to bring them up
to modern frameworks, we can consider combining again. If not, they the
older platforms will take the same path as the rest of the older
platforms that slowly fade away.
Kevin
On Wed, Oct 30, 2013 at 04:08:27PM -0700, Kevin Hilman wrote:
> Olof Johansson <[email protected]> writes:
>
> > I would be very happy to take more code for the older Qualcomm chipset
> > to enable full functionality for them, but it's been my impression
> > that far from all that is needed to make it a useful platform is in
> > the upstream kernel, and there's been no signs of more of it showing
> > up at least in the last two years.
> >
> > So we have a bit of a stalemate here -- the current Qualcomm team
> > wants to avoid having to deal too much with the legacy platforms --
> > they are technically quite different from the current platforms and
> > the divergence makes it hard to deal with supporting it all in a
> > modern way without risking regressions. I tend to agree with them.
>
> As do I.
>
> > Just like omap split between omap1 and omap2plus, I think it's a time
> > to create a mach-qcom instead, and move the modern (v7, most likely)
> > platforms there -- enable them with device tree, modern framework
> > infrastructure, etc. That way you can keep older platforms in mach-msm
> > without risk of regressions, and they have a clean base to start on
> > with their later platforms.
>
> I think this split approach is a good compromise.
>
> If the maintainers of the current older platforms wish to bring them up
> to modern frameworks, we can consider combining again. If not, they the
> older platforms will take the same path as the rest of the older
> platforms that slowly fade away.
>
So the current users of those platforms are, what SOL ?
Daniel
On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
> So the current users of those platforms are, what SOL ?
What users? Show me one.
-Olof
On Wed, Oct 30, 2013 at 05:36:58PM -0700, Olof Johansson wrote:
> On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
>
> > So the current users of those platforms are, what SOL ?
>
> What users? Show me one.
>
What am I chop liver ?
Daniel
On Wed, Oct 30, 2013 at 7:45 PM, Daniel Walker <[email protected]> wrote:
> On Wed, Oct 30, 2013 at 05:36:58PM -0700, Olof Johansson wrote:
>> On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
>>
>> > So the current users of those platforms are, what SOL ?
>>
>> What users? Show me one.
>
> What am I chop liver ?
Ah, right. So, what platforms do you currently rely on mainline
support for? Please be precise so we can figure out what needs to be
kept and not.
-Olof
On Wed, Oct 30, 2013 at 10:19:30PM -0700, Olof Johansson wrote:
> On Wed, Oct 30, 2013 at 7:45 PM, Daniel Walker <[email protected]> wrote:
> > On Wed, Oct 30, 2013 at 05:36:58PM -0700, Olof Johansson wrote:
> >> On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
> >>
> >> > So the current users of those platforms are, what SOL ?
> >>
> >> What users? Show me one.
> >
> > What am I chop liver ?
>
> Ah, right. So, what platforms do you currently rely on mainline
> support for? Please be precise so we can figure out what needs to be
> kept and not.
The only one I don't have is 7x30, as I said in prior emails.
Daniel
On Thu, Oct 31, 2013 at 5:07 AM, Daniel Walker <[email protected]> wrote:
> On Wed, Oct 30, 2013 at 10:19:30PM -0700, Olof Johansson wrote:
>> On Wed, Oct 30, 2013 at 7:45 PM, Daniel Walker <[email protected]> wrote:
>> > On Wed, Oct 30, 2013 at 05:36:58PM -0700, Olof Johansson wrote:
>> >> On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
>> >>
>> >> > So the current users of those platforms are, what SOL ?
>> >>
>> >> What users? Show me one.
>> >
>> > What am I chop liver ?
>>
>> Ah, right. So, what platforms do you currently rely on mainline
>> support for? Please be precise so we can figure out what needs to be
>> kept and not.
>
> The only one I don't have is 7x30, as I said in prior emails.
That's not actually what I asked. Which ones of them do you rely on
mainline support for?
-Olof
On Thu, Oct 31, 2013 at 08:53:58AM -0700, Olof Johansson wrote:
> On Thu, Oct 31, 2013 at 5:07 AM, Daniel Walker <[email protected]> wrote:
> > On Wed, Oct 30, 2013 at 10:19:30PM -0700, Olof Johansson wrote:
> >> On Wed, Oct 30, 2013 at 7:45 PM, Daniel Walker <[email protected]> wrote:
> >> > On Wed, Oct 30, 2013 at 05:36:58PM -0700, Olof Johansson wrote:
> >> >> On Wed, Oct 30, 2013 at 4:25 PM, Daniel Walker <[email protected]> wrote:
> >> >>
> >> >> > So the current users of those platforms are, what SOL ?
> >> >>
> >> >> What users? Show me one.
> >> >
> >> > What am I chop liver ?
> >>
> >> Ah, right. So, what platforms do you currently rely on mainline
> >> support for? Please be precise so we can figure out what needs to be
> >> kept and not.
> >
> > The only one I don't have is 7x30, as I said in prior emails.
>
> That's not actually what I asked. Which ones of them do you rely on
> mainline support for?
I rely on mainline support for 8x50 and G1 trout. This is starting to feel
like an interogation .. The only reason I'm tolerating this is because I
know you'll make some attempt to accept these patches over my already
explicit objections.
Daniel
Daniel Walker <[email protected]> writes:
> On Wed, Oct 30, 2013 at 04:08:27PM -0700, Kevin Hilman wrote:
>> Olof Johansson <[email protected]> writes:
>>
>> > I would be very happy to take more code for the older Qualcomm chipset
>> > to enable full functionality for them, but it's been my impression
>> > that far from all that is needed to make it a useful platform is in
>> > the upstream kernel, and there's been no signs of more of it showing
>> > up at least in the last two years.
>> >
>> > So we have a bit of a stalemate here -- the current Qualcomm team
>> > wants to avoid having to deal too much with the legacy platforms --
>> > they are technically quite different from the current platforms and
>> > the divergence makes it hard to deal with supporting it all in a
>> > modern way without risking regressions. I tend to agree with them.
>>
>> As do I.
>>
>> > Just like omap split between omap1 and omap2plus, I think it's a time
>> > to create a mach-qcom instead, and move the modern (v7, most likely)
>> > platforms there -- enable them with device tree, modern framework
>> > infrastructure, etc. That way you can keep older platforms in mach-msm
>> > without risk of regressions, and they have a clean base to start on
>> > with their later platforms.
>>
>> I think this split approach is a good compromise.
>>
>> If the maintainers of the current older platforms wish to bring them up
>> to modern frameworks, we can consider combining again. If not, they the
>> older platforms will take the same path as the rest of the older
>> platforms that slowly fade away.
>>
>
> So the current users of those platforms are, what SOL ?
No. The idea behind splitting them is to allow current platforms with
active maintainers to progress without being held back. The older
platforms can stay and have an opportunity to modernize.
The kernel is a moving target, without some minimal effort to keep
platforms up to date, the effort to continue to maintain/modernize them
can become more of a pain than it's worth. If maintainers of these older
platforms are willing to put in the work, nobody will be SOL. If
nobody shows interest in modernizing these older platforms (which seems
to be the case based on the last couple years), then it is reasonable
IMO for them to fade away slowly.
Kevin
On Thu, Oct 31, 2013 at 10:12:03AM -0700, Kevin Hilman wrote:
> Daniel Walker <[email protected]> writes:
>
>
> No. The idea behind splitting them is to allow current platforms with
> active maintainers to progress without being held back. The older
> platforms can stay and have an opportunity to modernize.
>
> The kernel is a moving target, without some minimal effort to keep
> platforms up to date, the effort to continue to maintain/modernize them
> can become more of a pain than it's worth. If maintainers of these older
> platforms are willing to put in the work, nobody will be SOL. If
> nobody shows interest in modernizing these older platforms (which seems
> to be the case based on the last couple years), then it is reasonable
> IMO for them to fade away slowly.
According to a prior email Tony suggested that OMAP was split for purely
technical reasons.. If code is shared in some way , or has synergies, and there's no
technical reason to split a sub-architecture, then to me there's no win in splitting
things.. It's just more directories, more confusion etc.. The confusion
would come from someone wanting to find the code related to a platform,
but woops there's a bunch of directories, or code flow and how the
sub-architecture is strung together .. Personally I found OMAP very
confusing in that regard.
ARM and the sub-architectures is already confusing I don't think we need
to start compounding the problem by allowing random whatever-you-want
sub-directories from every sub-architecture.
Daniel
Daniel Walker <[email protected]> writes:
> On Thu, Oct 31, 2013 at 10:12:03AM -0700, Kevin Hilman wrote:
>> Daniel Walker <[email protected]> writes:
>>
>>
>> No. The idea behind splitting them is to allow current platforms with
>> active maintainers to progress without being held back. The older
>> platforms can stay and have an opportunity to modernize.
>>
>> The kernel is a moving target, without some minimal effort to keep
>> platforms up to date, the effort to continue to maintain/modernize them
>> can become more of a pain than it's worth. If maintainers of these older
>> platforms are willing to put in the work, nobody will be SOL. If
>> nobody shows interest in modernizing these older platforms (which seems
>> to be the case based on the last couple years), then it is reasonable
>> IMO for them to fade away slowly.
>
>
> According to a prior email Tony suggested that OMAP was split for purely
> technical reasons.. If code is shared in some way , or has synergies, and there's no
> technical reason to split a sub-architecture, then to me there's no win in splitting
> things..
The wins have already been well described in this thread in terms of
maintenance of newer platforms using modern kernel infrastructure.
> It's just more directories, more confusion etc.. The confusion
> would come from someone wanting to find the code related to a platform,
> but woops there's a bunch of directories, or code flow and how the
> sub-architecture is strung together .. Personally I found OMAP very
> confusing in that regard.
>
> ARM and the sub-architectures is already confusing I don't think we need
> to start compounding the problem by allowing random whatever-you-want
> sub-directories from every sub-architecture.
Randomness is quite a bit of an exaggeration of what's been proposed
here.
These decisions are made on a case-by-case basis and is this case is
being done for ease of maintainence for newer platforms, which may not
be a "technical reason" for you, but is important for overall
maintenance of arm-soc.
If we do this split, you are more than welcome to demonstrate the
commonality by modernizing mach-msm, combining it with mach-qcom,
removing mach-msm, and then removing all the "confusion."
Kevin
On Thu, Oct 31, 2013 at 10:35:06AM -0700, Daniel Walker wrote:
> ARM and the sub-architectures is already confusing I don't think we need
> to start compounding the problem by allowing random whatever-you-want
> sub-directories from every sub-architecture.
Confusing?
I'm not sure about that. It's actually really simple from my perspective:
arch/arm - the ARM 32-bit architecture
arch/arm/mach-* - support for a single SoC or a group of similar SoCs
arch/arm/plat-* - common support for a set of dissimilar SoCs which want
to share code between themselves
How is that confusing?
On Thu, Oct 31, 2013 at 11:51:34AM -0700, Kevin Hilman wrote:
> Daniel Walker <[email protected]> writes:
>
> > On Thu, Oct 31, 2013 at 10:12:03AM -0700, Kevin Hilman wrote:
> >> Daniel Walker <[email protected]> writes:
> >>
> >>
> >> No. The idea behind splitting them is to allow current platforms with
> >> active maintainers to progress without being held back. The older
> >> platforms can stay and have an opportunity to modernize.
> >>
> >> The kernel is a moving target, without some minimal effort to keep
> >> platforms up to date, the effort to continue to maintain/modernize them
> >> can become more of a pain than it's worth. If maintainers of these older
> >> platforms are willing to put in the work, nobody will be SOL. If
> >> nobody shows interest in modernizing these older platforms (which seems
> >> to be the case based on the last couple years), then it is reasonable
> >> IMO for them to fade away slowly.
> >
> >
> > According to a prior email Tony suggested that OMAP was split for purely
> > technical reasons.. If code is shared in some way , or has synergies, and there's no
> > technical reason to split a sub-architecture, then to me there's no win in splitting
> > things..
>
> The wins have already been well described in this thread in terms of
> maintenance of newer platforms using modern kernel infrastructure.
That's not very concrete .. Can you be specific, and what platforms are
we talking about?
> > It's just more directories, more confusion etc.. The confusion
> > would come from someone wanting to find the code related to a platform,
> > but woops there's a bunch of directories, or code flow and how the
> > sub-architecture is strung together .. Personally I found OMAP very
> > confusing in that regard.
> >
> > ARM and the sub-architectures is already confusing I don't think we need
> > to start compounding the problem by allowing random whatever-you-want
> > sub-directories from every sub-architecture.
>
> Randomness is quite a bit of an exaggeration of what's been proposed
> here.
No one has proposed anything, as far as I can tell.
> These decisions are made on a case-by-case basis and is this case is
> being done for ease of maintainence for newer platforms, which may not
> be a "technical reason" for you, but is important for overall
> maintenance of arm-soc.
Who's making this decision ? If there's some reason why maintenance is
easier , can you explain it ? That's typically how we make decisions in
this community there needs to be a clear reason to do something.
> If we do this split, you are more than welcome to demonstrate the
> commonality by modernizing mach-msm, combining it with mach-qcom,
> removing mach-msm, and then removing all the "confusion."
Thanks, why not get it right the first time..
Daniel
On Thu, Oct 31, 2013 at 07:23:30PM +0000, Russell King - ARM Linux wrote:
> On Thu, Oct 31, 2013 at 10:35:06AM -0700, Daniel Walker wrote:
> > ARM and the sub-architectures is already confusing I don't think we need
> > to start compounding the problem by allowing random whatever-you-want
> > sub-directories from every sub-architecture.
>
> Confusing?
>
> I'm not sure about that. It's actually really simple from my perspective:
>
> arch/arm - the ARM 32-bit architecture
>
> arch/arm/mach-* - support for a single SoC or a group of similar SoCs
>
> arch/arm/plat-* - common support for a set of dissimilar SoCs which want
> to share code between themselves
>
> How is that confusing?
>
It's the relationship between the arch/arm/mach-* and the
arch/arm/plat-* and which ones connect with each other etc, and how the
connection was actually done..
For me as a developer I found it confusing vs something that was fully integrated.
Daniel