[PATCH v2 0/4] Add Qualcomm APQ8084 SoC support

[PATCH v2 0/4] Add Qualcomm APQ8084 SoC support

[Georgi Djakov]

This patchset adds basic support for the Qualcomm Snapdragon 805 APQ8084 SoC.

The first two patches add device-tree files for the SoC and the board, the
third adds a board compatible string to the DT machine descriptor.
The last one adds information about the low-level debug UART base address
to the DEBUG_QCOM_UARTDM Kconfig help section introduced by [1].

Tested on APQ8084-MTP board.

Changes from v1:
 - Remove the interrupts property from the l2-cache node as it is still not
   accepted (suggested by Stephen Boyd)
 - Move the timer node out of the soc container (suggested by Stephen Boyd)
 - Add just "qcom,apq8084" in the board machine descriptors to cover other
   future boards based on apq8084 (suggested by Kumar Gala)
 - Change the last patch (debug UART) to just add info about the SoC PHYS/VIRT
   addresses. Requires [1]. (suggestions by Arnd Bergmann and Ivan Ivanov)

[1] https://lkml.org/lkml/2014/4/14/312

Georgi Djakov (4):
  ARM: dts: qcom: Add APQ8084 SoC support
  ARM: dts: qcom: Add APQ8084-MTP board support
  ARM: qcom: Add APQ8084 to mach-qcom
  ARM: debug: qcom: add UART addresses to Kconfig help

 arch/arm/Kconfig.debug                 |    1 +
 arch/arm/boot/dts/Makefile             |    3 +-
 arch/arm/boot/dts/qcom-apq8084-mtp.dts |    6 ++
 arch/arm/boot/dts/qcom-apq8084.dtsi    |  179 ++++++++++++++++++++++++++++++++
 arch/arm/mach-qcom/board.c             |    1 +
 5 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/qcom-apq8084-mtp.dts
 create mode 100644 arch/arm/boot/dts/qcom-apq8084.dtsi

-- 
1.7.9.5

[PATCH v2 1/4] ARM: dts: qcom: Add APQ8084 SoC support

[Georgi Djakov]

Add support for the Qualcomm Snapdragon 805 APQ8084 SoC. It is
used on APQ8084-MTP and other boards.

Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
---
 arch/arm/boot/dts/qcom-apq8084.dtsi |  179 +++++++++++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 arch/arm/boot/dts/qcom-apq8084.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
new file mode 100644
index 0000000..e3e009a
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -0,0 +1,179 @@
+/dts-v1/;
+
+#include "skeleton.dtsi"
+
+/ {
+	model = "Qualcomm APQ 8084";
+	compatible = "qcom,apq8084";
+	interrupt-parent = <&intc>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu at 0 {
+			device_type = "cpu";
+			compatible = "qcom,krait";
+			reg = <0>;
+			enable-method = "qcom,kpss-acc-v2";
+			next-level-cache = <&L2>;
+			qcom,acc = <&acc0>;
+		};
+
+		cpu at 1 {
+			device_type = "cpu";
+			compatible = "qcom,krait";
+			reg = <1>;
+			enable-method = "qcom,kpss-acc-v2";
+			next-level-cache = <&L2>;
+			qcom,acc = <&acc1>;
+		};
+
+		cpu at 2 {
+			device_type = "cpu";
+			compatible = "qcom,krait";
+			reg = <2>;
+			enable-method = "qcom,kpss-acc-v2";
+			next-level-cache = <&L2>;
+			qcom,acc = <&acc2>;
+		};
+
+		cpu at 3 {
+			device_type = "cpu";
+			compatible = "qcom,krait";
+			reg = <3>;
+			enable-method = "qcom,kpss-acc-v2";
+			next-level-cache = <&L2>;
+			qcom,acc = <&acc3>;
+		};
+
+		L2: l2-cache {
+			compatible = "qcom,arch-cache";
+			cache-level = <2>;
+			qcom,saw = <&saw_l2>;
+		};
+	};
+
+	cpu-pmu {
+		compatible = "qcom,krait-pmu";
+		interrupts = <1 7 0xf04>;
+	};
+
+	timer {
+		compatible = "arm,armv7-timer";
+		interrupts = <1 2 0xf08>,
+			     <1 3 0xf08>,
+			     <1 4 0xf08>,
+			     <1 1 0xf08>;
+		clock-frequency = <19200000>;
+	};
+
+	soc: soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+		compatible = "simple-bus";
+
+		intc: interrupt-controller at f9000000 {
+			compatible = "qcom,msm-qgic2";
+			interrupt-controller;
+			#interrupt-cells = <3>;
+			reg = <0xf9000000 0x1000>,
+			      <0xf9002000 0x1000>;
+		};
+
+		timer at f9020000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+			compatible = "arm,armv7-timer-mem";
+			reg = <0xf9020000 0x1000>;
+			clock-frequency = <19200000>;
+
+			frame at f9021000 {
+				frame-number = <0>;
+				interrupts = <0 8 0x4>,
+					     <0 7 0x4>;
+				reg = <0xf9021000 0x1000>,
+				      <0xf9022000 0x1000>;
+			};
+
+			frame at f9023000 {
+				frame-number = <1>;
+				interrupts = <0 9 0x4>;
+				reg = <0xf9023000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9024000 {
+				frame-number = <2>;
+				interrupts = <0 10 0x4>;
+				reg = <0xf9024000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9025000 {
+				frame-number = <3>;
+				interrupts = <0 11 0x4>;
+				reg = <0xf9025000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9026000 {
+				frame-number = <4>;
+				interrupts = <0 12 0x4>;
+				reg = <0xf9026000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9027000 {
+				frame-number = <5>;
+				interrupts = <0 13 0x4>;
+				reg = <0xf9027000 0x1000>;
+				status = "disabled";
+			};
+
+			frame at f9028000 {
+				frame-number = <6>;
+				interrupts = <0 14 0x4>;
+				reg = <0xf9028000 0x1000>;
+				status = "disabled";
+			};
+		};
+
+		saw_l2: regulator at f9012000 {
+			compatible = "qcom,saw2";
+			reg = <0xf9012000 0x1000>;
+			regulator;
+		};
+
+		acc0: clock-controller at f9088000 {
+			compatible = "qcom,kpss-acc-v2";
+			reg = <0xf9088000 0x1000>,
+			      <0xf9008000 0x1000>;
+		};
+
+		acc1: clock-controller at f9098000 {
+			compatible = "qcom,kpss-acc-v2";
+			reg = <0xf9098000 0x1000>,
+			      <0xf9008000 0x1000>;
+		};
+
+		acc2: clock-controller at f90a8000 {
+			compatible = "qcom,kpss-acc-v2";
+			reg = <0xf90a8000 0x1000>,
+			      <0xf9008000 0x1000>;
+		};
+
+		acc3: clock-controller at f90b8000 {
+			compatible = "qcom,kpss-acc-v2";
+			reg = <0xf90b8000 0x1000>,
+			      <0xf9008000 0x1000>;
+		};
+
+		restart at fc4ab000 {
+			compatible = "qcom,pshold";
+			reg = <0xfc4ab000 0x4>;
+		};
+	};
+};
-- 
1.7.9.5

[PATCH v2 2/4] ARM: dts: qcom: Add APQ8084-MTP board support

[Georgi Djakov]

Add device-tree file for APQ8084-MTP board, which belongs
to the Snapdragon 805 family.

Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
---
 arch/arm/boot/dts/Makefile             |    3 ++-
 arch/arm/boot/dts/qcom-apq8084-mtp.dts |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/qcom-apq8084-mtp.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 377b7c3..792f063 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -293,7 +293,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb \
-	qcom-apq8074-dragonboard.dtb
+	qcom-apq8074-dragonboard.dtb \
+	qcom-apq8084-mtp.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 	s3c6410-smdk6410.dtb
diff --git a/arch/arm/boot/dts/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom-apq8084-mtp.dts
new file mode 100644
index 0000000..9dae387
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8084-mtp.dts
@@ -0,0 +1,6 @@
+#include "qcom-apq8084.dtsi"
+
+/ {
+	model = "Qualcomm APQ 8084-MTP";
+	compatible = "qcom,apq8084-mtp", "qcom,apq8084";
+};
-- 
1.7.9.5

[PATCH v2 3/4] ARM: qcom: Add APQ8084 to mach-qcom

[Georgi Djakov]

Add the SoC compatibility string to the board machine descriptors.

Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
---
 arch/arm/mach-qcom/board.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c
index bae617e..c17e7b0 100644
--- a/arch/arm/mach-qcom/board.c
+++ b/arch/arm/mach-qcom/board.c
@@ -18,6 +18,7 @@ static const char * const qcom_dt_match[] __initconst = {
 	"qcom,msm8660-surf",
 	"qcom,msm8960-cdp",
 	"qcom,apq8074-dragonboard",
+	"qcom,apq8084",
 	NULL
 };
 
-- 
1.7.9.5

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Georgi Djakov]

Add information about the APQ8084 debug UART physical and virtual
addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
Requires: https://lkml.org/lkml/2014/4/14/312

Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
---
 arch/arm/Kconfig.debug |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 40ee328..e71723d 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -376,6 +376,7 @@ choice
 		  their output to the serial port on Qualcomm devices.
 
 		  ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
+		  APQ8084   0xf995e000        0xfa75e000
 		  MSM8X60   0x19c40000        0xf0040000
 		  MSM8960   0x16440000        0xf0040000
 		  MSM8974   0xf991e000        0xfa71e000
-- 
1.7.9.5

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Matthias Brugger]

2014-05-23 17:12 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
> Add information about the APQ8084 debug UART physical and virtual
> addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
> Requires: https://lkml.org/lkml/2014/4/14/312
>
> Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
> ---
>  arch/arm/Kconfig.debug |    1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 40ee328..e71723d 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -376,6 +376,7 @@ choice
>                   their output to the serial port on Qualcomm devices.
>
>                   ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
> +                 APQ8084   0xf995e000        0xfa75e000
>                   MSM8X60   0x19c40000        0xf0040000
>                   MSM8960   0x16440000        0xf0040000
>                   MSM8974   0xf991e000        0xfa71e000

You don't have any uart defined in your dts. You should add them
before any adding low level debug support.
Otherwise there might be problems in booting a multi-platform kernel.

Regards,
Matthias

> --
> 1.7.9.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



-- 
motzblog.wordpress.com

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Georgi Djakov]

On 23.05.14, 19:39, Matthias Brugger wrote:
> 2014-05-23 17:12 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>> Add information about the APQ8084 debug UART physical and virtual
>> addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
>> Requires: https://lkml.org/lkml/2014/4/14/312
>>
>> Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
>> ---
>>  arch/arm/Kconfig.debug |    1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>> index 40ee328..e71723d 100644
>> --- a/arch/arm/Kconfig.debug
>> +++ b/arch/arm/Kconfig.debug
>> @@ -376,6 +376,7 @@ choice
>>                   their output to the serial port on Qualcomm devices.
>>
>>                   ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
>> +                 APQ8084   0xf995e000        0xfa75e000
>>                   MSM8X60   0x19c40000        0xf0040000
>>                   MSM8960   0x16440000        0xf0040000
>>                   MSM8974   0xf991e000        0xfa71e000
>
> You don't have any uart defined in your dts. You should add them
> before any adding low level debug support.
> Otherwise there might be problems in booting a multi-platform kernel.
>

Thanks for the comment! As the uart depends on clocks, i am adding it to 
the dts as part of my global clock controller patchset [1].
In this patch i am just adding some information to the help section.
Do you see any problem with this?

[1] https://lkml.org/lkml/2014/5/22/422

Thanks,
Georgi

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Matthias Brugger]

2014-05-26 15:45 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
> On 23.05.14, 19:39, Matthias Brugger wrote:
>>
>> 2014-05-23 17:12 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>>>
>>> Add information about the APQ8084 debug UART physical and virtual
>>> addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
>>> Requires: https://lkml.org/lkml/2014/4/14/312
>>>
>>> Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
>>> ---
>>>  arch/arm/Kconfig.debug |    1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>>> index 40ee328..e71723d 100644
>>> --- a/arch/arm/Kconfig.debug
>>> +++ b/arch/arm/Kconfig.debug
>>> @@ -376,6 +376,7 @@ choice
>>>                   their output to the serial port on Qualcomm devices.
>>>
>>>                   ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
>>> +                 APQ8084   0xf995e000        0xfa75e000
>>>                   MSM8X60   0x19c40000        0xf0040000
>>>                   MSM8960   0x16440000        0xf0040000
>>>                   MSM8974   0xf991e000        0xfa71e000
>>
>>
>> You don't have any uart defined in your dts. You should add them
>> before any adding low level debug support.
>> Otherwise there might be problems in booting a multi-platform kernel.
>>
>
> Thanks for the comment! As the uart depends on clocks, i am adding it to the
> dts as part of my global clock controller patchset [1].
> In this patch i am just adding some information to the help section.
> Do you see any problem with this?

Are the patches for the clock controller applied already?
If not, I would consider to add this patch to clock controller series.

Cheers,
Matthias

>
> [1] https://lkml.org/lkml/2014/5/22/422
>
> Thanks,
> Georgi



-- 
motzblog.wordpress.com

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Georgi Djakov]

On 05/26/2014 08:17 PM, Matthias Brugger wrote:
> 2014-05-26 15:45 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>> On 23.05.14, 19:39, Matthias Brugger wrote:
>>>
>>> 2014-05-23 17:12 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>>>>
>>>> Add information about the APQ8084 debug UART physical and virtual
>>>> addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
>>>> Requires: https://lkml.org/lkml/2014/4/14/312
>>>>
>>>> Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
>>>> ---
>>>>  arch/arm/Kconfig.debug |    1 +
>>>>  1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>>>> index 40ee328..e71723d 100644
>>>> --- a/arch/arm/Kconfig.debug
>>>> +++ b/arch/arm/Kconfig.debug
>>>> @@ -376,6 +376,7 @@ choice
>>>>                   their output to the serial port on Qualcomm devices.
>>>>
>>>>                   ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
>>>> +                 APQ8084   0xf995e000        0xfa75e000
>>>>                   MSM8X60   0x19c40000        0xf0040000
>>>>                   MSM8960   0x16440000        0xf0040000
>>>>                   MSM8974   0xf991e000        0xfa71e000
>>>
>>>
>>> You don't have any uart defined in your dts. You should add them
>>> before any adding low level debug support.
>>> Otherwise there might be problems in booting a multi-platform kernel.
>>>
>>
>> Thanks for the comment! As the uart depends on clocks, i am adding it to the
>> dts as part of my global clock controller patchset [1].
>> In this patch i am just adding some information to the help section.
>> Do you see any problem with this?
> 
> Are the patches for the clock controller applied already?
> If not, I would consider to add this patch to clock controller series.
> 

No, they are not applied yet. The uart dts definition depends on clocks, but the
DEBUG_LL support does not. And the DEBUG_LL support is already there as it is 
common with other SoCs. I am sorry, but i don't see dependency between the dts
definition and this patch. Could you explain please?

Thanks,
Georgi

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Matthias Brugger]

2014-05-27 14:05 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
> On 05/26/2014 08:17 PM, Matthias Brugger wrote:
>> 2014-05-26 15:45 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>>> On 23.05.14, 19:39, Matthias Brugger wrote:
>>>>
>>>> 2014-05-23 17:12 GMT+02:00 Georgi Djakov <gdjakov@mm-sol.com>:
>>>>>
>>>>> Add information about the APQ8084 debug UART physical and virtual
>>>>> addresses in the DEBUG_QCOM_UARTDM Kconfig help section.
>>>>> Requires: https://lkml.org/lkml/2014/4/14/312
>>>>>
>>>>> Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
>>>>> ---
>>>>>  arch/arm/Kconfig.debug |    1 +
>>>>>  1 file changed, 1 insertion(+)
>>>>>
>>>>> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
>>>>> index 40ee328..e71723d 100644
>>>>> --- a/arch/arm/Kconfig.debug
>>>>> +++ b/arch/arm/Kconfig.debug
>>>>> @@ -376,6 +376,7 @@ choice
>>>>>                   their output to the serial port on Qualcomm devices.
>>>>>
>>>>>                   ARCH      DEBUG_UART_PHYS   DEBUG_UART_BASE
>>>>> +                 APQ8084   0xf995e000        0xfa75e000
>>>>>                   MSM8X60   0x19c40000        0xf0040000
>>>>>                   MSM8960   0x16440000        0xf0040000
>>>>>                   MSM8974   0xf991e000        0xfa71e000
>>>>
>>>>
>>>> You don't have any uart defined in your dts. You should add them
>>>> before any adding low level debug support.
>>>> Otherwise there might be problems in booting a multi-platform kernel.
>>>>
>>>
>>> Thanks for the comment! As the uart depends on clocks, i am adding it to the
>>> dts as part of my global clock controller patchset [1].
>>> In this patch i am just adding some information to the help section.
>>> Do you see any problem with this?
>>
>> Are the patches for the clock controller applied already?
>> If not, I would consider to add this patch to clock controller series.
>>
>
> No, they are not applied yet. The uart dts definition depends on clocks, but the
> DEBUG_LL support does not. And the DEBUG_LL support is already there as it is
> common with other SoCs. I am sorry, but i don't see dependency between the dts
> definition and this patch. Could you explain please?

IMHO the dependancy is that DEBUG_LL uses the uart device, and this is
added when you add the dts.
AFAIK there can arise problems with multi-platform kernels if the uart
is not present.

>
> Thanks,
> Georgi
>



-- 
motzblog.wordpress.com

[PATCH v2 4/4] ARM: debug: qcom: add UART addresses to Kconfig help

[Ivan T. Ivanov]

On Thu, 2014-05-29 at 17:26 +0200, Matthias Brugger wrote:

> IMHO the dependancy is that DEBUG_LL uses the uart device, and this is
> added when you add the dts.
> AFAIK there can arise problems with multi-platform kernels if the uart
> is not present.

Once DEBUG_LL is enabled you don't have multi-platform kernel anymore,
so this should not be an issue here.

Regards,
Ivan