Unverified Commit 6fa496fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'hisi-arm64-dt-for-5.16' of git://github.com/hisilicon/linux-hisi into arm/dt 

ARM64: DT: HiSilicon ARM64 DT updates for 5.16

- Add SPMI PMIC support for the Hikey970 board
- Correct the sp805 watchdog compatible string to match the document
- Correct the operating-points table name to match the dtschema

* tag 'hisi-arm64-dt-for-5.16' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: align operating-points table name with dtschema
  arm64: dts: hisilicon: fix arm,sp805 compatible string
  arm64: dts: hisilicon: Add support for Hikey 970 PMIC

Link: https://lore.kernel.org/r/6168EB53.60503@hisilicon.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 514d5078 dcc3f565

arch/arm64/boot/dts/hisilicon/hi3660.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ A73_L2: l2-cache1 { 
		};

	};



	cluster0_opp: opp_table0 {

	cluster0_opp: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -245,7 +245,7 @@ opp04 { 
		};

	};



	cluster1_opp: opp_table1 {

	cluster1_opp: opp-table-1 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -1087,7 +1087,7 @@ dwmmc2: dwmmc2@ff3ff000 { 
		};



		watchdog0: watchdog@e8a06000 {

			compatible = "arm,sp805-wdt", "arm,primecell";

			compatible = "arm,sp805", "arm,primecell";

			reg = <0x0 0xe8a06000 0x0 0x1000>;

			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&crg_ctrl HI3660_OSC32K>,
@@ -1096,7 +1096,7 @@ watchdog0: watchdog@e8a06000 { 
		};



		watchdog1: watchdog@e8a07000 {

			compatible = "arm,sp805-wdt", "arm,primecell";

			compatible = "arm,sp805", "arm,primecell";

			reg = <0x0 0xe8a07000 0x0 0x1000>;

			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&crg_ctrl HI3660_OSC32K>,

arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts

+3 −19
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "hi3670.dtsi"

#include "hikey970-pinctrl.dtsi"

#include "hikey970-pmic.dtsi"



/ {

	model = "HiKey970";
@@ -39,23 +40,6 @@ memory@0 { 
		reg = <0x0 0x0 0x0 0x0>;

	};



	sd_1v8: regulator-1v8 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-1.8V";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	sd_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};



	wlan_en: wlan-en-1-8v {

		compatible = "regulator-fixed";

		regulator-name = "wlan-en-regulator";
@@ -402,8 +386,8 @@ &dwmmc1 { 
	pinctrl-0 = <&sd_pmx_func

		     &sd_clk_cfg_func

		     &sd_cfg_func>;

	vmmc-supply = <&sd_3v3>;

	vqmmc-supply = <&sd_1v8>;

	vmmc-supply = <&ldo16>;

	vqmmc-supply = <&ldo9>;

	status = "okay";

};

arch/arm64/boot/dts/hisilicon/hi6220.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ CLUSTER1_L2: l2-cache1 { 
		};

	};



	cpu_opp_table: cpu_opp_table {

	cpu_opp_table: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;
@@ -840,7 +840,7 @@ dwmmc_2: dwmmc2@f723f000 { 
		};



		watchdog0: watchdog@f8005000 {

			compatible = "arm,sp805-wdt", "arm,primecell";

			compatible = "arm,sp805", "arm,primecell";

			reg = <0x0 0xf8005000 0x0 0x1000>;

			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ao_ctrl HI6220_WDT0_PCLK>,

arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi

0 → 100644
+86 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * dts file for Hi6421v600 SPMI PMIC used at the HiKey970 Development Board

 *

 * Copyright (C) 2020, Huawei Tech. Co., Ltd.

 */



#include <dt-bindings/spmi/spmi.h>



/ {

	spmi: spmi@fff24000 {

		compatible = "hisilicon,kirin970-spmi-controller";

		#address-cells = <2>;

		#size-cells = <0>;

		status = "okay";

		reg = <0x0 0xfff24000 0x0 0x1000>;

		hisilicon,spmi-channel = <2>;



		pmic: pmic@0 {

			compatible = "hisilicon,hi6421-spmi";

			reg = <0 SPMI_USID>;



			#interrupt-cells = <2>;

			interrupt-controller;

			gpios = <&gpio28 0 0>;



			regulators {

				#address-cells = <1>;

				#size-cells = <0>;



				ldo3: ldo3 { /* HDMI */

					regulator-name = "ldo3";

					regulator-min-microvolt = <1500000>;

					regulator-max-microvolt = <2000000>;

					regulator-boot-on;

				};



				ldo4: ldo4 { /* 40 PIN */

					regulator-name = "ldo4";

					regulator-min-microvolt = <1725000>;

					regulator-max-microvolt = <1900000>;

					regulator-boot-on;

				};



				ldo9: ldo9 { /* SDCARD I/O */

					regulator-name = "ldo9";

					regulator-min-microvolt = <1750000>;

					regulator-max-microvolt = <3300000>;

					regulator-boot-on;

				};



				ldo15: ldo15 { /* UFS */

					regulator-name = "ldo15";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

				};



				ldo16: ldo16 { /* SD */

					regulator-name = "ldo16";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3000000>;

					regulator-boot-on;

				};



				ldo17: ldo17 { /* USB HUB */

					regulator-name = "ldo17";

					regulator-min-microvolt = <2500000>;

					regulator-max-microvolt = <3300000>;

				};



				ldo33: ldo33 { /* PEX8606 */

					regulator-name = "ldo33";

					regulator-min-microvolt = <2500000>;

					regulator-max-microvolt = <3300000>;

				};



				ldo34: ldo34 { /* GPS AUX IN VDD */

					regulator-name = "ldo34";

					regulator-min-microvolt = <2600000>;

					regulator-max-microvolt = <3300000>;

				};

			};

		};

	};

};

arch/arm64/boot/dts/hisilicon/hi3670.dtsi

+1 −1

File changed.

Contains only whitespace changes.