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

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from Olof Johansson:
"Stream of fixes has slowed down, only a few this week:

- Some DT fixes for Allwinner platforms, and addition of a clock to
the R_CCU clock controller that had been missed.

- A couple of small DT fixes for am335x-sl50"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
arm64: allwinner: h5: Remove syslink to shared DTSI
ARM: sunxi: h3/h5: fix the compatible of R_CCU

Linus Torvalds 1132d5e7 3696e4f0

options
unified split
Changed files
+10 -12
arch
arm
boot
dts
am335x-sl50.dts
sunxi-h3-h5.dtsi
arm64
boot
dts
allwinner
sun50i-a64.dtsi
sun50i-h5.dtsi
+2 -6
arch/arm/boot/dts/am335x-sl50.dts
··· 220 220 221 221 mmc1_pins: pinmux_mmc1_pins { 222 222 pinctrl-single,pins = < 223 - AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ 223 + AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7) /* uart0_rtsn.gpio1_9 */ 224 224 >; 225 225 }; 226 226 ··· 280 280 AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE7) /* nKbdReset - gpmc_ad13.gpio1_13 */ 281 281 AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7) /* nDispReset - gpmc_ad14.gpio1_14 */ 282 282 AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE7) /* USB1_enPower - gpmc_a1.gpio1_17 */ 283 - /* AVR Programming - SPI Bus (bit bang) - Screen and Keyboard */ 284 - AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE7) /* Kbd/Disp/BattMOSI spi0_d0.gpio0_3 */ 285 - AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE7) /* Kbd/Disp/BattMISO spi0_d1.gpio0_4 */ 286 - AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE7) /* Kbd/Disp/BattSCLK spi0_clk.gpio0_2 */ 287 283 /* PDI Bus - Battery system */ 288 284 AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7) /* nBattReset gpmc_a0.gpio1_16 */ 289 285 AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE7) /* BattPDIData gpmc_ad15.gpio1_15 */ ··· 380 384 pinctrl-names = "default"; 381 385 pinctrl-0 = <&mmc1_pins>; 382 386 bus-width = <4>; 383 - cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 387 + cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 384 388 vmmc-supply = <&vmmcsd_fixed>; 385 389 }; 386 390
+4 -3
arch/arm/boot/dts/sunxi-h3-h5.dtsi
··· 558 558 }; 559 559 560 560 r_ccu: clock@1f01400 { 561 - compatible = "allwinner,sun50i-a64-r-ccu"; 561 + compatible = "allwinner,sun8i-h3-r-ccu"; 562 562 reg = <0x01f01400 0x100>; 563 - clocks = <&osc24M>, <&osc32k>, <&iosc>; 564 - clock-names = "hosc", "losc", "iosc"; 563 + clocks = <&osc24M>, <&osc32k>, <&iosc>, 564 + <&ccu 9>; 565 + clock-names = "hosc", "losc", "iosc", "pll-periph"; 565 566 #clock-cells = <1>; 566 567 #reset-cells = <1>; 567 568 };
+3 -2
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
··· 406 406 r_ccu: clock@1f01400 { 407 407 compatible = "allwinner,sun50i-a64-r-ccu"; 408 408 reg = <0x01f01400 0x100>; 409 - clocks = <&osc24M>, <&osc32k>, <&iosc>; 410 - clock-names = "hosc", "losc", "iosc"; 409 + clocks = <&osc24M>, <&osc32k>, <&iosc>, 410 + <&ccu 11>; 411 + clock-names = "hosc", "losc", "iosc", "pll-periph"; 411 412 #clock-cells = <1>; 412 413 #reset-cells = <1>; 413 414 };
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
··· 40 40 * OTHER DEALINGS IN THE SOFTWARE. 41 41 */ 42 42 43 - #include "sunxi-h3-h5.dtsi" 43 + #include <arm/sunxi-h3-h5.dtsi> 44 44 45 45 / { 46 46 cpus {