Re: [RFC 3/4] arm64: dts: msm8994 SoC and Huawei Angler (Nexus 6P) support

[Jeremy McNicoll <jmcnicol@redhat.com>]

On 2016-09-20 6:12 PM, Andy Gross wrote:
> On Thu, Jul 07, 2016 at 05:41:06PM -0700, Jeremy McNicoll wrote:
>> From: Bastian Köcher <mail@kchr.de>
>>
>> Initial device tree support for Qualcomm MSM8994 SoC and
>> Huawei Angler / Google Nexus 6P support.
>>
>> The device tree and the angler_defconfig are based on the
>> device tree from the Google 3.10 kernel tree.
>>
>> The device can be booted into the initrd with only one CPU running.
>>
>> Signed-off-by: Bastian Köcher <mail@kchr.de>
>> Signed-off-by: Jeremy McNicoll <jeremymc@redhat.com>
>> ---
>>  arch/arm64/Kconfig.platforms                       |  13 +
>>  arch/arm64/boot/dts/Makefile                       |   1 +
>>  arch/arm64/boot/dts/huawei/Makefile                |   5 +
>>  .../boot/dts/huawei/msm8994-angler-rev-101.dts     |  41 ++
>
> There is nothing to warrant having huawei have their own directory unless they
> are making their own SOC.
>

done

>>  arch/arm64/boot/dts/qcom/msm8994-pins.dtsi         |  38 ++
>>  arch/arm64/boot/dts/qcom/msm8994-v2.0.dtsi         |  31 +
>>  arch/arm64/boot/dts/qcom/msm8994.dtsi              | 237 ++++++++
>>  arch/arm64/configs/angler_defconfig                | 666 +++++++++++++++++++++
>
> We don't need to add defconfigs.  We just need to turn on the options in the
> main defconfig.
>

ok, removed

> Also, when you do have defconfigs, please separate those changes into a separate
> patch.
>

will do.


>>  8 files changed, 1032 insertions(+)
>>  create mode 100644 arch/arm64/boot/dts/huawei/Makefile
>>  create mode 100644 arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts
>>  create mode 100644 arch/arm64/boot/dts/qcom/msm8994-pins.dtsi
>>  create mode 100644 arch/arm64/boot/dts/qcom/msm8994-v2.0.dtsi
>>  create mode 100644 arch/arm64/boot/dts/qcom/msm8994.dtsi
>>  create mode 100644 arch/arm64/configs/angler_defconfig
>>
>> diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
>> index 515e669..f253f60d 100644
>> --- a/arch/arm64/Kconfig.platforms
>> +++ b/arch/arm64/Kconfig.platforms
>> @@ -98,6 +98,19 @@ config MACH_LGE
>>  	help
>>  	  This enables support for the LGE Nexus 5X - BullHead MSM8992.
>>
>> +config ARCH_MSM8994
>> +	bool "Qualcomm MSM8994"
>> +	depends on ARCH_QCOM
>> +	select ARCH_REQUIRE_GPIOLIB
>> +	help
>> +	  This enables support for the Qualcomm MSM8994
>> +
>> +config MACH_HUAWEI
>> +	bool "Huawei Angler (MSM8994)"
>> +	depends on ARCH_QCOM
>> +	help
>> +	  This enables support for the Huawei Nexus 6P - Angler MSM8994.
>
> Remove both of these.  We aren't adding more ARCHs or machs.
>

done

>
>> +
>>  config ARCH_ROCKCHIP
>>  	bool "Rockchip Platforms"
>>  	select ARCH_HAS_RESET_CONTROLLER
>> diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
>> index bde90fb..d199f8b 100644
>> --- a/arch/arm64/boot/dts/Makefile
>> +++ b/arch/arm64/boot/dts/Makefile
>> @@ -9,6 +9,7 @@ dts-dirs += cavium
>>  dts-dirs += exynos
>>  dts-dirs += freescale
>>  dts-dirs += hisilicon
>> +dts-dirs += huawei
>>  dts-dirs += marvell
>>  dts-dirs += mediatek
>>  dts-dirs += nvidia
>> diff --git a/arch/arm64/boot/dts/huawei/Makefile b/arch/arm64/boot/dts/huawei/Makefile
>> new file mode 100644
>> index 0000000..4b31ff4
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/huawei/Makefile
>> @@ -0,0 +1,5 @@
>> +dtb-$(CONFIG_MACH_HUAWEI) += msm8994-angler-rev-101.dtb
>> +
>> +always          := $(dtb-y)
>> +subdir-y        := $(dts-dirs)
>> +clean-files     := *.dtb
>> diff --git a/arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts
>> new file mode 100644
>> index 0000000..07a71d6
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/huawei/msm8994-angler-rev-101.dts
>> @@ -0,0 +1,41 @@
>> +/* Copyright (c) 2015, Huawei Inc. All rights reserved.
>> + * Copyright (c) 2016, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "../qcom/msm8994-v2.0.dtsi"
>> +
>> +/ {
>> +	model = "HUAWEI MSM8994 ANGLER rev-1.01";
>> +	compatible = "qcom,msm8994";
>> +	qcom,board-id= <8026 0>;
>> +};
>> +
>> +/ {
>> +	aliases {
>> +		serial0 = &blsp1_uart2;
>> +	};
>> +
>> +	chosen {
>> +		stdout-path = "serial0";
>> +	};
>> +
>> +	soc {
>> +		serial@f991e000 {
>> +			status = "okay";
>> +			pinctrl-names = "default", "sleep";
>> +			pinctrl-0 = <&blsp1_uart2_default>;
>> +			pinctrl-1 = <&blsp1_uart2_sleep>;
>> +		};
>> +	};
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi
>> new file mode 100644
>> index 0000000..0e4eea0
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/msm8994-pins.dtsi
>> @@ -0,0 +1,38 @@
>> +/*
>> + * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + */
>> +
>> +&msmgpio {
>> +	blsp1_uart2_default: blsp1_uart2_default {
>> +		pinmux {
>> +			function = "blsp_uart2";
>> +			pins = "gpio4", "gpio5";
>> +		};
>> +		pinconf {
>> +			pins = "gpio4", "gpio5";
>> +			drive-strength = <16>;
>> +			bias-disable;
>> +		};
>> +	};
>> +
>> +	blsp1_uart2_sleep: blsp1_uart2_sleep {
>> +		pinmux {
>> +			function = "gpio";
>> +			pins = "gpio4", "gpio5";
>> +		};
>> +		pinconf {
>> +			pins = "gpio4", "gpio5";
>> +			drive-strength = <2>;
>> +			bias-pull-down;
>> +		};
>> +	};
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/msm8994-v2.0.dtsi b/arch/arm64/boot/dts/qcom/msm8994-v2.0.dtsi
>> new file mode 100644
>> index 0000000..8fc4c41f
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/msm8994-v2.0.dtsi
>> @@ -0,0 +1,31 @@
>> +/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + */
>> +
>> +/*
>> + * As a general rule, only version-specific property overrides should be placed
>> + * inside this file. Device definitions should be placed inside the msm8994.dtsi
>> + * file.
>> + */
>> +
>> +#include "msm8994.dtsi"
>> +
>> +/ {
>> +	model = "Qualcomm Technologies, Inc. MSM 8994v2.0";
>> +	compatible = "qcom,msm8994";
>> +	qcom,msm-id = <207 0x20000>;
>
> Drop the msm-id
>

Dealt with over IRC.

>> +
>> +};
>> +
>> +/* Clock driver overrides */
>> +&clock_gcc {
>> +	compatible = "qcom,gcc-8994v2";
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
>> new file mode 100644
>> index 0000000..c95cb73
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
>> @@ -0,0 +1,237 @@
>> +/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + */
>> +
>> +/memreserve/ 0x00000000 0x00001000;
>> +/memreserve/ 0xac1c0000 0x00001000;
>
> So the 0x00000000 is totally bogus.  And the 0xac1c0000 needs to move to a
> reserved area lower in the dts.
>

I am going to leave this in until we get a chance to test the various 
permutations etc... ideally we will be able to remove both completely.
This is explicitly mentioned in the leadin for v2.


>> +
>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>> +#include <dt-bindings/clock/qcom,gcc-msm8994.h>
>> +
>> +/ {
>> +	model = "Qualcomm Technologies, Inc. MSM 8994";
>> +	compatible = "qcom,msm8994";
>> +	qcom,msm-id = <207 0x0>;
>> +	qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
>
> kill the ids
>
done

>> +	interrupt-parent = <&intc>;
>> +
>> +	#address-cells = <2>;
>> +	#size-cells = <2>;
>> +
>> +	chosen { };
>> +
>> +	cpus {
>> +		#address-cells = <1>;
>> +		#size-cells = <0>;
>> +		cpu-map {
>> +			cluster0 {
>> +				core0 {
>> +					cpu = <&CPU0>;
>> +				};
>> +			};
>> +		};
>> +
>> +		CPU0: cpu@0 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a53", "arm,armv8";
>> +			reg = <0x0>;
>> +			next-level-cache = <&L2_0>;
>> +			// The currents(uA) correspond to the frequencies in the
>> +			// frequency table.
>> +			current = < 24140 //384000 kHZ
>> +				    27200 //460800 kHZ
>> +				    32300 //600000 kHZ
>> +				    36940 //672000 kHz
>> +				    41570 //768000 kHZ
>> +				    49870 //864000 kHZ
>> +				    57840 //960000 kHZ
>> +				    79800 //1248000 kHZ
>> +				    88810 //1344000 kHZ
>> +				    102400 //1478400 kHZ
>> +				    110900>; //1555200 kHZ
>> +			L2_0: l2-cache {
>> +			      compatible = "cache";
>> +			      cache-level = <2>;
>> +			};
>> +		};
>> +	};
>> +
>> +	soc: soc { };
>> +
>> +	memory {
>> +		device_type = "memory";
>> +		/* We expect the bootloader to fill in the reg */
>> +		reg = <0 0 0 0>;
>> +	};
>> +
>> +	reserved-memory {
>> +		#address-cells = <2>;
>> +		#size-cells = <2>;
>> +		ranges;
>
> Move that reserve down here and make it no-map.
>

See comment above on reserved memory.


<....snip>

-jeremy