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

Merge tag 'sunxi-fixes-for-5.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

A number of fixes for this release, but mostly:
- A fixup for the A10 CSI DT binding merged during the 5.4-rc1 window
- A fix for a dt-binding error
- Addition of phy regulator delays
- The PMU on the A64 was found to be non-functional, so we've dropped it for now

* tag 'sunxi-fixes-for-5.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun7i: Drop the module clock from the device tree
dt-bindings: media: sun4i-csi: Drop the module clock
media: dt-bindings: Fix building error for dt_binding_check
arm64: dts: allwinner: a64: sopine-baseboard: Add PHY regulator delay
arm64: dts: allwinner: a64: Drop PMU node
arm64: dts: allwinner: a64: pine64-plus: Add PHY regulator delay

Link: https://lore.kernel.org/r/80085a57-c40f-4bed-a9c3-19858d87564e.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>

+20 -18
+3 -6
Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
··· 1 1 # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) 2 2 %YAML 1.2 3 3 --- 4 - $id: http://devicetree.org/schemas/arm/allwinner,sun4i-a10-csi.yaml# 4 + $id: http://devicetree.org/schemas/media/allwinner,sun4i-a10-csi.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 7 title: Allwinner A10 CMOS Sensor Interface (CSI) Device Tree Bindings ··· 27 27 clocks: 28 28 items: 29 29 - description: The CSI interface clock 30 - - description: The CSI module clock 31 30 - description: The CSI ISP clock 32 31 - description: The CSI DRAM clock 33 32 34 33 clock-names: 35 34 items: 36 35 - const: bus 37 - - const: mod 38 36 - const: isp 39 37 - const: ram 40 38 ··· 87 89 compatible = "allwinner,sun7i-a20-csi0"; 88 90 reg = <0x01c09000 0x1000>; 89 91 interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; 90 - clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>, 91 - <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; 92 - clock-names = "bus", "mod", "isp", "ram"; 92 + clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; 93 + clock-names = "bus", "isp", "ram"; 93 94 resets = <&ccu RST_CSI0>; 94 95 95 96 port {
+2 -3
arch/arm/boot/dts/sun7i-a20.dtsi
··· 380 380 compatible = "allwinner,sun7i-a20-csi0"; 381 381 reg = <0x01c09000 0x1000>; 382 382 interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; 383 - clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>, 384 - <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; 385 - clock-names = "bus", "mod", "isp", "ram"; 383 + clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>; 384 + clock-names = "bus", "isp", "ram"; 386 385 resets = <&ccu RST_CSI0>; 387 386 status = "disabled"; 388 387 };
+9
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
··· 63 63 reg = <1>; 64 64 }; 65 65 }; 66 + 67 + &reg_dc1sw { 68 + /* 69 + * Ethernet PHY needs 30ms to properly power up and some more 70 + * to initialize. 100ms should be plenty of time to finish 71 + * whole process. 72 + */ 73 + regulator-enable-ramp-delay = <100000>; 74 + };
+6
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
··· 159 159 }; 160 160 161 161 &reg_dc1sw { 162 + /* 163 + * Ethernet PHY needs 30ms to properly power up and some more 164 + * to initialize. 100ms should be plenty of time to finish 165 + * whole process. 166 + */ 167 + regulator-enable-ramp-delay = <100000>; 162 168 regulator-name = "vcc-phy"; 163 169 }; 164 170
-9
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
··· 142 142 clock-output-names = "ext-osc32k"; 143 143 }; 144 144 145 - pmu { 146 - compatible = "arm,cortex-a53-pmu"; 147 - interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>, 148 - <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>, 149 - <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>, 150 - <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>; 151 - interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; 152 - }; 153 - 154 145 psci { 155 146 compatible = "arm,psci-0.2"; 156 147 method = "smc";