github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 12:11:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM64: DT: HiSilicon ARM64 DT updates for v6.6

Browse Source 
- Miscellaneous fixes according the DTS coding style
 - Correct the clocks order of the sd0 for the hi3798cv200
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEQeMYD8qOQTc1R/snC8hXbtmJZlwFAmTMYsAVHHh1d2VpNUBo
 aXNpbGljb24uY29tAAoJEAvIV27ZiWZcvsYP/3i2T7XnFR2KcGuASMbqgPRYTy4z
 8Ehfu9+ubul6RqGMt5zSYBbYEHH6woxg85Rgpz7xEhi98y7MY+dIaZrpmLZ7JqmU
 US6Rq2ADGACXPnJMhAJXBoUuKdH5NFapZdlIb95ao6bhpnH+Liyt6f078pFoFvLV
 ZEzQupbDVd9u5DRN7wKxhG0oFboVsdrupwR7UY+vLKAx33BZH2CvLpCwlWJtiXEU
 y7LvMsBzhoTUJADtsrRYUxSeck2gOx0seME+cRRD6/ElBvDAmyhZ8B4hW+lPaDRZ
 YmY846ySoKWh+E3FI2vsqPcKPYQ8HobZvtcTvBpYuKNhUHBQWqXydcxeVUqsjvbT
 7a2vVY1QxD0JPsUb4QzpbthlhLi2MobMIL7FqCxDIPW8jm55qIfL/jD81Tm6lteZ
 c2/Mp1aX4wWnRR8T+er1aKflBqDGr51y1KhqZZb/tmLOKNEnFNrRz6+eVa2rMC1Y
 Vr59nzptylswfrm7k6eEgTpqkwErxqSIjUJv+mUL0ms8oI3jBnM7nirzZOizuuNF
 UU4xODRowh91nIjxwaJeWk7noWq66rUJtMuv24yIRneJHu3V6z/hkKA9GIFiezqx
 zjBuFLKV9DqY9afc3m3Q2Ajtfb7NkZ0zAv8+GUHBSKKpOQ1NDsYYquinrit42k00
 XKHPyXYr82IsnW7y
 =T5Tw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTXRgQACgkQYKtH/8kJ
 UieBZg//bDQbNyBOq62hVzCSKW0ruFa42ETJcJ7b+Exh9/VCRn5ZagIilPI6ux7U
 ZNpjg8Rx/q/Q78BSxsz/YXsD9nCePFAPPbCLv7i1QfrWVElqC0klPXyfm5b3X8n3
 LhtIgMkcHdzgmzOXgqVDMQ0h8AMqtJPECJvcIGMkBMiw0J3l8XuhGR4grFXp8V+q
 xGNbnOh0h7hwxlhkDrveSXCxvDVMu9hVc5FdyU9eXPjJKB4rI7ZDUkRblHl/rM9S
 o2dARhPkmgetFu7+mgx+BmR7FKTvn6nr/UMcIoeV979608PAEzWr1Of7GMQCgKOw
 3MYhIoi2sCUKqz9yGLT0hFtOxtYcBq4LQ4VnyBV0anz5Q0HH1xneb/SYAdmZHCKJ
 SCC3Ni/+HC+dnOM2Uyz2s++6Jf39qFpEdzhyrqhzXlcRZvz5V3g0xUhuAXATZO/w
 5SFjTEzQQr/siOnvSJotlDYI0LbQGRPqYi3vf/0f0JiVJzzwGQaB2/8PUNw/C5JG
 kXLVYxzTanYFSRGpWJO69RoJurJVBhgCA35viV4A20Rgj+MMyYLEAEHqssv+RrZx
 MP0iZrexNXuBlrl50A6K+1uBfBgv//IlEvPtuX3VQP47ErWD9LvR3X6zrLOVv5GX
 TBJuGH7phhqME2puhebN0chhaOSdL1KlR3e7isR70SpOe3M2VC0=
 =CyEJ
 -----END PGP SIGNATURE-----

Merge tag 'hisi-arm64-dt-for-6.6' of https://github.com/hisilicon/linux-hisi into soc/dt

ARM64: DT: HiSilicon ARM64 DT updates for v6.6

- Miscellaneous fixes according the DTS coding style
- Correct the clocks order of the sd0 for the hi3798cv200

* tag 'hisi-arm64-dt-for-6.6' of https://github.com/hisilicon/linux-hisi:
  arm64: dts: hi3798cv200: Fix clocks order of sd0
  arm64: dts: hisilicon: add missing space before {
  arm64: dts: hisilicon: minor whitespace cleanup around '='

Link: https://lore.kernel.org/r/64CC99A3.5030701@hisilicon.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-08-12 10:42:44 +02:00
commit a4cd6f2677
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
View File

@ -302,8 +302,8 @@ sd0: mmc@9820000 {
compatible = "snps,dw-mshc";
reg = <0x9820000 0x10000>;
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&crg HISTB_SDIO0_CIU_CLK>,
<&crg HISTB_SDIO0_BIU_CLK>;
clocks = <&crg HISTB_SDIO0_BIU_CLK>,
<&crg HISTB_SDIO0_CIU_CLK>;
clock-names = "biu", "ciu";
resets = <&crg 0x9c 4>;
reset-names = "reset";

24
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
View File

@ -861,7 +861,7 @@ tsensor: tsensor@0,f7030700 {
#thermal-sensor-cells = <1>;
};
i2s0: i2s@f7118000{
i2s0: i2s@f7118000 {
compatible = "hisilicon,hi6210-i2s";
reg = <0x0 0xf7118000 0x0 0x8000>; /* i2s unit */
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; /* 155 "DigACodec_intr"-32 */
@ -1032,17 +1032,17 @@ mali: gpu@f4080000 {
compatible = "hisilicon,hi6220-mali", "arm,mali-450";
reg = <0x0 0xf4080000 0x0 0x00040000>;
interrupt-parent = <&gic>;
interrupts = <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "gp",
"gpmmu",

8
arch/arm64/boot/dts/hisilicon/hip06.dtsi
View File

@ -570,7 +570,7 @@ port@5 {
};
};
eth0: ethernet-4{
eth0: ethernet-4 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <4>;
@ -579,7 +579,7 @@ eth0: ethernet-4{
dma-coherent;
};
eth1: ethernet-5{
eth1: ethernet-5 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <5>;
@ -588,7 +588,7 @@ eth1: ethernet-5{
dma-coherent;
};
eth2: ethernet-0{
eth2: ethernet-0 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <0>;
@ -597,7 +597,7 @@ eth2: ethernet-0{
dma-coherent;
};
eth3: ethernet-1{
eth3: ethernet-1 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <1>;

8
arch/arm64/boot/dts/hisilicon/hip07.dtsi
View File

@ -1483,7 +1483,7 @@ port@5 {
};
};
eth0: ethernet@4{
eth0: ethernet@4 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <4>;
@ -1492,7 +1492,7 @@ eth0: ethernet@4{
dma-coherent;
};
eth1: ethernet@5{
eth1: ethernet@5 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <5>;
@ -1501,7 +1501,7 @@ eth1: ethernet@5{
dma-coherent;
};
eth2: ethernet@0{
eth2: ethernet@0 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <0>;
@ -1510,7 +1510,7 @@ eth2: ethernet@0{
dma-coherent;
};
eth3: ethernet@1{
eth3: ethernet@1 {
compatible = "hisilicon,hns-nic-v2";
ae-handle = <&dsaf0>;
port-idx-in-ae = <1>;