mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 09:04:39 +02:00
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 -----BEGIN PGP SIGNATURE----- iQJJBAABCgAzFiEEQeMYD8qOQTc1R/snC8hXbtmJZlwFAmFo5vkVHHh1d2VpNUBo aXNpbGljb24uY29tAAoJEAvIV27ZiWZc/48P/00Dx5XKqDIJKBnTJK07e69Mgusr VulJF4Dub7tqniEbFQLAjynvAR6mRR/ziasD8B/V7LLMm+RO9/KQ2UNm+08YSXd6 1JYsoCj20BLsIMnmGMOPaylJoZyKRyKYDHjtegr+MNkKib4aGMGhG/klbyVTjV/Q rTi/J87W5WM8WhsBkdVpbI7+xA7lLA0vOWPRANtaej4pjIaUQ6ibtt+AziBRC0zj Ckec/TP/JHO6sDwpcWVgdWW4k9ofohuEvpFttialrmBVrIRn3lrQK8V+UIrBNVcA fneSWjgexxxRYemw07kAWrVZKVJCvSHosIcp7BzOYYdU+Vd3GRILvvuWEgbBjHCY tzve6uVw0UQMZPA6jYMlvA9bPBL3JWuXByWIjtKBH0C2QX3aqTbuoyL9aAVy7C0S RMpAWZ15ED8YNef0HykQK2+HE0G4p8WyN1zjmMCshjOsjXPQVEKX2bIZ05cF8KX2 Q3zY6OdznV1H6PSlfVtRzbVM75B+158Pxw/SdTlIMiGiXjfxdIEYruEM6Ej8kxqU +QakyDIWjNSwaB6lt1x+bZe7O3GvMkRNb3HhKoqf9j7e4JhZH8hg3KyDdENgcPzb RLNVKN65Wwz0SyJZNlRKlF6IzDjeV6v5aXY7eLUkj75uIRT0vI6MYWJhxo4sx/PA kGPjXdKTEAsKUmsK =xa9d -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFvO4cACgkQmmx57+YA GNlB3xAAsoHs6hQFzZmpeii7DKrchYSBUvoEorG4boHtPiAQ7mZTpAW2tIgO6F0S P+CugE0u7TGuApVCAB6TVDj1dxEZJBl5xf0Mug3m/cpc0DukJj28QSbMztfAAl9s /1w3AVSHM6heD39a09ePxSaHzRn7Bl+hyTAnDkZBH+OenkihpMgaBdGBOrqkS95V 1HBB/wdCNF16hB8DyerZPlSpwwLR9zpd7Ncia4DbhIzfW9ppnIK4OdrQbZKDU0E2 55Fsef33YJc+c1FMY5+MfV0U2jpL4ozvRpIvBEU9KqZStWntriV71TbWH2iooRbg +mGaGR+JjxND1UEe7/eNqVgV76qUW8j8+sWNfRwAOwgX/UnZBU2+0KBdvlC7XuhX idkBGgjrz4tsMfnSkwjuFs2LE9KerNKCBVIC6EDA2Gx3DROehSK5CBizidQuK6o4 ap/GALZQHZhFGYHaQjtR5w5y9Ps5XS3LGWnsvftNvhb1ynqOHW1aknlfTQEH39D3 g/7gclkti0dbwnRuoWE4W9DNol/THnaCoV7zCWerI7PlPWkf/WMWLlggdValpJch MBFxFVRsJl2od6AgDw1PzV7XhqxYWsL09RlqlhILAlfCf+QdmxlP/JtxYiCPYaBe KIPt1MU1Tdlt/kJ02sBM34N/02zTKJVUDgYTsi4tG3JhVo1pxls= =Z1IX -----END PGP SIGNATURE----- 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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
6fa496fd7d
|
|
@ -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>,
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -669,7 +669,7 @@ ufs: ufs@ff3c0000 {
|
|||
interrupt-parent = <&gic>;
|
||||
interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&crg_ctrl HI3670_CLK_GATE_UFSIO_REF>,
|
||||
<&crg_ctrl HI3670_CLK_GATE_UFS_SUBSYS>;
|
||||
<&crg_ctrl HI3670_CLK_GATE_UFS_SUBSYS>;
|
||||
clock-names = "ref_clk", "phy_clk";
|
||||
freq-table-hz = <0 0
|
||||
0 0>;
|
||||
|
|
|
|||
|
|
@ -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>,
|
||||
|
|
|
|||
86
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
Normal file
86
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
// 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>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user