Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

ARM: DT: Hisilicon ARM32 SoCs DT updates for 5.10

- Update the SP804 nodes to have the correct clocks and
clock names for the hi3620 SoC
- Update the SP805 nodes to have the correct clocks and
clock names for the hix5hd2 SoC

* tag 'hisi-arm32-dt-for-5.10' of git://github.com/hisilicon/linux-hisi:
ARM: dts: hisilicon: Fix SP805 clocks
ARM: dts: hisilicon: Fix SP804 users

Link: https://lore.kernel.org/r/5F617209.90003@hisilicon.com
Signed-off-by: Olof Johansson <olof@lixom.net>

+25 -14
+20 -10
arch/arm/boot/dts/hi3620.dtsi
··· 111 111 reg = <0x800000 0x1000>; 112 112 /* timer00 & timer01 */ 113 113 interrupts = <0 0 4>, <0 1 4>; 114 - clocks = <&clock HI3620_TIMER0_MUX>, <&clock HI3620_TIMER1_MUX>; 115 - clock-names = "apb_pclk"; 114 + clocks = <&clock HI3620_TIMER0_MUX>, 115 + <&clock HI3620_TIMER1_MUX>, 116 + <&clock HI3620_TIMER0_MUX>; 117 + clock-names = "timer0clk", "timer1clk", "apb_pclk"; 116 118 status = "disabled"; 117 119 }; 118 120 ··· 123 121 reg = <0x801000 0x1000>; 124 122 /* timer10 & timer11 */ 125 123 interrupts = <0 2 4>, <0 3 4>; 126 - clocks = <&clock HI3620_TIMER2_MUX>, <&clock HI3620_TIMER3_MUX>; 127 - clock-names = "apb_pclk"; 124 + clocks = <&clock HI3620_TIMER2_MUX>, 125 + <&clock HI3620_TIMER3_MUX>, 126 + <&clock HI3620_TIMER2_MUX>; 127 + clock-names = "timer0clk", "timer1clk", "apb_pclk"; 128 128 status = "disabled"; 129 129 }; 130 130 ··· 135 131 reg = <0xa01000 0x1000>; 136 132 /* timer20 & timer21 */ 137 133 interrupts = <0 4 4>, <0 5 4>; 138 - clocks = <&clock HI3620_TIMER4_MUX>, <&clock HI3620_TIMER5_MUX>; 139 - clock-names = "apb_pclk"; 134 + clocks = <&clock HI3620_TIMER4_MUX>, 135 + <&clock HI3620_TIMER5_MUX>, 136 + <&clock HI3620_TIMER4_MUX>; 137 + clock-names = "timer0lck", "timer1clk", "apb_pclk"; 140 138 status = "disabled"; 141 139 }; 142 140 ··· 147 141 reg = <0xa02000 0x1000>; 148 142 /* timer30 & timer31 */ 149 143 interrupts = <0 6 4>, <0 7 4>; 150 - clocks = <&clock HI3620_TIMER6_MUX>, <&clock HI3620_TIMER7_MUX>; 151 - clock-names = "apb_pclk"; 144 + clocks = <&clock HI3620_TIMER6_MUX>, 145 + <&clock HI3620_TIMER7_MUX>, 146 + <&clock HI3620_TIMER6_MUX>; 147 + clock-names = "timer0clk", "timer1clk", "apb_pclk"; 152 148 status = "disabled"; 153 149 }; 154 150 ··· 159 151 reg = <0xa03000 0x1000>; 160 152 /* timer40 & timer41 */ 161 153 interrupts = <0 96 4>, <0 97 4>; 162 - clocks = <&clock HI3620_TIMER8_MUX>, <&clock HI3620_TIMER9_MUX>; 163 - clock-names = "apb_pclk"; 154 + clocks = <&clock HI3620_TIMER8_MUX>, 155 + <&clock HI3620_TIMER9_MUX>, 156 + <&clock HI3620_TIMER8_MUX>; 157 + clock-names = "timer0clk", "timer1clk", "apb_pclk"; 164 158 status = "disabled"; 165 159 }; 166 160
+2 -2
arch/arm/boot/dts/hip04.dtsi
··· 226 226 compatible = "arm,sp804", "arm,primecell"; 227 227 reg = <0x3000000 0x1000>; 228 228 interrupts = <0 224 4>; 229 - clocks = <&clk_50m>, <&clk_50m>; 230 - clock-names = "apb_pclk"; 229 + clocks = <&clk_50m>, <&clk_50m>, <&clk_50m>; 230 + clock-names = "timer0clk", "timer1clk", "apb_pclk"; 231 231 }; 232 232 233 233 arm-pmu {
+3 -2
arch/arm/boot/dts/hisi-x5hd2.dtsi
··· 370 370 arm,primecell-periphid = <0x00141805>; 371 371 reg = <0xa2c000 0x1000>; 372 372 interrupts = <0 29 4>; 373 - clocks = <&clock HIX5HD2_WDG0_RST>; 374 - clock-names = "apb_pclk"; 373 + clocks = <&clock HIX5HD2_WDG0_RST>, 374 + <&clock HIX5HD2_WDG0_RST>; 375 + clock-names = "wdog_clk", "apb_pclk"; 375 376 }; 376 377 }; 377 378