Skip to content

L
linux
Commit 0b9c5cdd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

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

ARM64: DT: Hisilicon ARM64 DT updates for 5.12

- Further cleanups of the hisilicon DTS to align with the dtschema
- Add or update the I2C, pinctrl and reset nodes for Hikey970

* tag 'hisi-arm64-dt-for-5.12v2' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: hi3670.dtsi: add I2C settings
  arm64: dts: hisilicon: hikey970-pinctrl.dtsi: add missing pinctrl settings
  arm64: dts: hisilicon: hi3670.dtsi: add iomcu_rst
  arm64: dts: hisilicon: delete unused property smmu-cb-memtype
  arm64: dts: hisilicon: avoid irrelevant nodes being mistakenly identified as PHY nodes
  arm64: dts: hisilicon: normalize the node name of the localbus
  arm64: dts: hisilicon: normalize the node name of the module thermal
  arm64: dts: hisilicon: place clock-names "bus" before "core"
  arm64: dts: hisilicon: separate each group of data in the property "ranges"

Link: https://lore.kernel.org/r/6013D1C7.90902@hisilicon.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1f99bd1a b6e141ee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 714 additions and 34 deletions
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
View file @ 0b9c5cdd
...@@ -1113,7 +1113,7 @@ tsensor: tsensor@fff30000 { ...@@ -1113,7 +1113,7 @@ tsensor: tsensor@fff30000 {
thermal-zones { thermal-zones {
cls0: cls0 { cls0: cls0-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
sustainable-power = <4500>; sustainable-power = <4500>;
...@@ -1122,13 +1122,13 @@ cls0: cls0 { ...@@ -1122,13 +1122,13 @@ cls0: cls0 {
thermal-sensors = <&tsensor 1>; thermal-sensors = <&tsensor 1>;
trips { trips {
threshold: trip-point@0 { threshold: trip-point0 {
temperature = <65000>; temperature = <65000>;
hysteresis = <1000>; hysteresis = <1000>;
type = "passive"; type = "passive";
}; };
target: trip-point@1 { target: trip-point1 {
temperature = <75000>; temperature = <75000>;
hysteresis = <1000>; hysteresis = <1000>;
type = "passive"; type = "passive";
......
arch/arm64/boot/dts/hisilicon/hi3670.dtsi
View file @ 0b9c5cdd
...@@ -194,6 +194,12 @@ media2_crg: media2_crgctrl@e8900000 { ...@@ -194,6 +194,12 @@ media2_crg: media2_crgctrl@e8900000 {
#clock-cells = <1>; #clock-cells = <1>;
}; };
iomcu_rst: reset {
compatible = "hisilicon,hi3660-reset";
hisi,rst-syscon = <&iomcu>;
#reset-cells = <2>;
};
uart0: serial@fdf02000 { uart0: serial@fdf02000 {
compatible = "arm,pl011", "arm,primecell"; compatible = "arm,pl011", "arm,primecell";
reg = <0x0 0xfdf02000 0x0 0x1000>; reg = <0x0 0xfdf02000 0x0 0x1000>;
...@@ -708,5 +714,76 @@ dwmmc2: dwmmc2@fc183000 { ...@@ -708,5 +714,76 @@ dwmmc2: dwmmc2@fc183000 {
card-detect-delay = <200>; card-detect-delay = <200>;
status = "disabled"; status = "disabled";
}; };
/* I2C */
i2c0: i2c@ffd71000 {
compatible = "snps,designware-i2c";
reg = <0x0 0xffd71000 0x0 0x1000>;
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <400000>;
clocks = <&iomcu HI3670_CLK_GATE_I2C0>;
resets = <&iomcu_rst 0x20 3>;
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pmx_func &i2c0_cfg_func>;
status = "disabled";
};
i2c1: i2c@ffd72000 {
compatible = "snps,designware-i2c";
reg = <0x0 0xffd72000 0x0 0x1000>;
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <400000>;
clocks = <&iomcu HI3670_CLK_GATE_I2C1>;
resets = <&iomcu_rst 0x20 4>;
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>;
status = "disabled";
};
i2c2: i2c@ffd73000 {
compatible = "snps,designware-i2c";
reg = <0x0 0xffd73000 0x0 0x1000>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <400000>;
clocks = <&iomcu HI3670_CLK_GATE_I2C2>;
resets = <&iomcu_rst 0x20 5>;
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pmx_func &i2c2_cfg_func>;
status = "disabled";
};
i2c3: i2c@fdf0c000 {
compatible = "snps,designware-i2c";
reg = <0x0 0xfdf0c000 0x0 0x1000>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <400000>;
clocks = <&crg_ctrl HI3670_CLK_GATE_I2C3>;
resets = <&crg_rst 0x78 7>;
pinctrl-names = "default";
pinctrl-0 = <&i2c3_pmx_func &i2c3_cfg_func>;
status = "disabled";
};
i2c4: i2c@fdf0d000 {
compatible = "snps,designware-i2c";
reg = <0x0 0xfdf0d000 0x0 0x1000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clock-frequency = <400000>;
clocks = <&crg_ctrl HI3670_CLK_GATE_I2C4>;
resets = <&crg_rst 0x78 27>;
pinctrl-names = "default";
pinctrl-0 = <&i2c4_pmx_func &i2c4_cfg_func>;
status = "disabled";
};
}; };
}; };
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
View file @ 0b9c5cdd
...@@ -113,7 +113,7 @@ perictrl: peripheral-controller@8a20000 { ...@@ -113,7 +113,7 @@ perictrl: peripheral-controller@8a20000 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x8a20000 0x1000>; ranges = <0x0 0x8a20000 0x1000>;
usb2_phy1: usb2-phy@120 { usb2_phy1: usb2_phy@120 {
compatible = "hisilicon,hi3798cv200-usb2-phy"; compatible = "hisilicon,hi3798cv200-usb2-phy";
reg = <0x120 0x4>; reg = <0x120 0x4>;
clocks = <&crg HISTB_USB2_PHY1_REF_CLK>; clocks = <&crg HISTB_USB2_PHY1_REF_CLK>;
...@@ -134,7 +134,7 @@ usb2_phy1_port1: phy@1 { ...@@ -134,7 +134,7 @@ usb2_phy1_port1: phy@1 {
}; };
}; };
usb2_phy2: usb2-phy@124 { usb2_phy2: usb2_phy@124 {
compatible = "hisilicon,hi3798cv200-usb2-phy"; compatible = "hisilicon,hi3798cv200-usb2-phy";
reg = <0x124 0x4>; reg = <0x124 0x4>;
clocks = <&crg HISTB_USB2_PHY2_REF_CLK>; clocks = <&crg HISTB_USB2_PHY2_REF_CLK>;
...@@ -565,8 +565,8 @@ pcie: pcie@9860000 { ...@@ -565,8 +565,8 @@ pcie: pcie@9860000 {
device_type = "pci"; device_type = "pci";
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
num-lanes = <1>; num-lanes = <1>;
ranges = <0x81000000 0x0 0x00000000 0x4f00000 0x0 0x100000 ranges = <0x81000000 0x0 0x00000000 0x4f00000 0x0 0x100000>,
0x82000000 0x0 0x3000000 0x3000000 0x0 0x01f00000>; <0x82000000 0x0 0x3000000 0x3000000 0x0 0x01f00000>;
interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "msi"; interrupt-names = "msi";
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
View file @ 0b9c5cdd
...@@ -872,7 +872,7 @@ i2s0: i2s@f7118000{ ...@@ -872,7 +872,7 @@ i2s0: i2s@f7118000{
thermal-zones { thermal-zones {
cls0: cls0 { cls0: cls0-thermal {
polling-delay = <1000>; polling-delay = <1000>;
polling-delay-passive = <100>; polling-delay-passive = <100>;
sustainable-power = <3326>; sustainable-power = <3326>;
...@@ -881,13 +881,13 @@ cls0: cls0 { ...@@ -881,13 +881,13 @@ cls0: cls0 {
thermal-sensors = <&tsensor 2>; thermal-sensors = <&tsensor 2>;
trips { trips {
threshold: trip-point@0 { threshold: trip-point0 {
temperature = <65000>; temperature = <65000>;
hysteresis = <0>; hysteresis = <0>;
type = "passive"; type = "passive";
}; };
target: trip-point@1 { target: trip-point1 {
temperature = <75000>; temperature = <75000>;
hysteresis = <0>; hysteresis = <0>;
type = "passive"; type = "passive";
...@@ -1053,7 +1053,7 @@ mali: gpu@f4080000 { ...@@ -1053,7 +1053,7 @@ mali: gpu@f4080000 {
"ppmmu3"; "ppmmu3";
clocks = <&media_ctrl HI6220_G3D_CLK>, clocks = <&media_ctrl HI6220_G3D_CLK>,
<&media_ctrl HI6220_G3D_PCLK>; <&media_ctrl HI6220_G3D_PCLK>;
clock-names = "core", "bus"; clock-names = "bus", "core";
assigned-clocks = <&media_ctrl HI6220_G3D_CLK>, assigned-clocks = <&media_ctrl HI6220_G3D_CLK>,
<&media_ctrl HI6220_G3D_PCLK>; <&media_ctrl HI6220_G3D_PCLK>;
assigned-clock-rates = <500000000>, <144000000>; assigned-clock-rates = <500000000>, <144000000>;
......
arch/arm64/boot/dts/hisilicon/hip05.dtsi
View file @ 0b9c5cdd
...@@ -318,7 +318,7 @@ uart1: serial@80310000 { ...@@ -318,7 +318,7 @@ uart1: serial@80310000 {
status = "disabled"; status = "disabled";
}; };
lbc: localbus@80380000 { lbc: local-bus@80380000 {
compatible = "hisilicon,hisi-localbus", "simple-bus"; compatible = "hisilicon,hisi-localbus", "simple-bus";
reg = <0x0 0x80380000 0x0 0x10000>; reg = <0x0 0x80380000 0x0 0x10000>;
status = "disabled"; status = "disabled";
......
arch/arm64/boot/dts/hisilicon/hip06.dtsi
View file @ 0b9c5cdd
...@@ -335,7 +335,6 @@ smmu0: iommu@a0040000 { ...@@ -335,7 +335,6 @@ smmu0: iommu@a0040000 {
reg = <0x0 0xa0040000 0x0 0x20000>; reg = <0x0 0xa0040000 0x0 0x20000>;
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
smmu-cb-memtype = <0x0 0x1>;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
status = "disabled"; status = "disabled";
}; };
...@@ -737,9 +736,8 @@ pcie0: pcie@a0090000 { ...@@ -737,9 +736,8 @@ pcie0: pcie@a0090000 {
#size-cells = <2>; #size-cells = <2>;
device_type = "pci"; device_type = "pci";
dma-coherent; dma-coherent;
ranges = <0x02000000 0 0xb2000000 0x0 0xb2000000 0 ranges = <0x02000000 0 0xb2000000 0x0 0xb2000000 0 0x5ff0000>,
0x5ff0000 0x01000000 0 0 0 0xb7ff0000 <0x01000000 0 0 0 0xb7ff0000 0 0x10000>;
0 0x10000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>; interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4 interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4
......
arch/arm64/boot/dts/hisilicon/hip07.dtsi
View file @ 0b9c5cdd
...@@ -1166,7 +1166,6 @@ smmu0: iommu@a0040000 { ...@@ -1166,7 +1166,6 @@ smmu0: iommu@a0040000 {
reg = <0x0 0xa0040000 0x0 0x20000>; reg = <0x0 0xa0040000 0x0 0x20000>;
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
smmu-cb-memtype = <0x0 0x1>;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
status = "disabled"; status = "disabled";
}; };
...@@ -1181,7 +1180,6 @@ p0_smmu_alg_a: iommu@d0040000 { ...@@ -1181,7 +1180,6 @@ p0_smmu_alg_a: iommu@d0040000 {
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p0_smmu_alg_b: iommu@8d0040000 { p0_smmu_alg_b: iommu@8d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
...@@ -1194,7 +1192,6 @@ p0_smmu_alg_b: iommu@8d0040000 { ...@@ -1194,7 +1192,6 @@ p0_smmu_alg_b: iommu@8d0040000 {
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p1_smmu_alg_a: iommu@400d0040000 { p1_smmu_alg_a: iommu@400d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
...@@ -1207,7 +1204,6 @@ p1_smmu_alg_a: iommu@400d0040000 { ...@@ -1207,7 +1204,6 @@ p1_smmu_alg_a: iommu@400d0040000 {
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/
}; };
p1_smmu_alg_b: iommu@408d0040000 { p1_smmu_alg_b: iommu@408d0040000 {
compatible = "arm,smmu-v3"; compatible = "arm,smmu-v3";
...@@ -1220,7 +1216,6 @@ p1_smmu_alg_b: iommu@408d0040000 { ...@@ -1220,7 +1216,6 @@ p1_smmu_alg_b: iommu@408d0040000 {
#iommu-cells = <1>; #iommu-cells = <1>;
dma-coherent; dma-coherent;
hisilicon,broken-prefetch-cmd; hisilicon,broken-prefetch-cmd;
/* smmu-cb-memtype = <0x0 0x1>;*/
}; };
soc { soc {
...@@ -1708,8 +1703,8 @@ p0_pcie2_a: pcie@a00a0000 { ...@@ -1708,8 +1703,8 @@ p0_pcie2_a: pcie@a00a0000 {
#size-cells = <2>; #size-cells = <2>;
device_type = "pci"; device_type = "pci";
dma-coherent; dma-coherent;
ranges = <0x02000000 0 0xa8000000 0 0xa8000000 0 0x77f0000 ranges = <0x02000000 0 0xa8000000 0 0xa8000000 0 0x77f0000>,
0x01000000 0 0 0 0xaf7f0000 0 0x10000>; <0x01000000 0 0 0 0xaf7f0000 0 0x10000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0xf800 0 0 7>; interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = <0x0 0 0 1 &mbigen_pcie2_a 671 4 interrupt-map = <0x0 0 0 1 &mbigen_pcie2_a 671 4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7