xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull "Allwinner fixes for 4.13" from Chen-Yu Tsai:

Two fixes to correct the EMAC blocks memory region size to match the
datasheet. One that converts raw A83T clock indices to macros from the
clk dt-binding header, completing the A83T sunxi-ng clk driver.

* tag 'sunxi-fixes-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun8i: a83t: Switch to CCU device tree binding macros
  arm64: allwinner: sun50i-a64: Correct emac register size
  ARM: dts: sunxi: h3/h5: Correct emac register size
This commit is contained in:
Arnd Bergmann
2017-08-04 13:04:42 +02:00
parent 3d8db0a889 c50f9fb6c5
commit ae119859a1
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/sun8i-a83t.dtsi
View File

@@ -44,7 +44,9 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/sun8i-a83t-ccu.h>
#include <dt-bindings/clock/sun8i-r-ccu.h> #include <dt-bindings/clock/sun8i-r-ccu.h>
#include <dt-bindings/reset/sun8i-a83t-ccu.h>
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@@ -175,8 +177,8 @@
compatible = "allwinner,sun8i-a83t-dma"; compatible = "allwinner,sun8i-a83t-dma";
reg = <0x01c02000 0x1000>; reg = <0x01c02000 0x1000>;
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu 21>; clocks = <&ccu CLK_BUS_DMA>;
resets = <&ccu 7>; resets = <&ccu RST_BUS_DMA>;
#dma-cells = <1>; #dma-cells = <1>;
}; };
@@ -195,7 +197,7 @@
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x01c20800 0x400>; reg = <0x01c20800 0x400>;
clocks = <&ccu 45>, <&osc24M>, <&osc16Md512>; clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc16Md512>;
clock-names = "apb", "hosc", "losc"; clock-names = "apb", "hosc", "losc";
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
@@ -247,8 +249,8 @@
"allwinner,sun8i-h3-spdif"; "allwinner,sun8i-h3-spdif";
reg = <0x01c21000 0x400>; reg = <0x01c21000 0x400>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu 44>, <&ccu 76>; clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>;
resets = <&ccu 32>; resets = <&ccu RST_BUS_SPDIF>;
clock-names = "apb", "spdif"; clock-names = "apb", "spdif";
dmas = <&dma 2>; dmas = <&dma 2>;
dma-names = "tx"; dma-names = "tx";
@@ -263,8 +265,8 @@
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <2>; reg-shift = <2>;
reg-io-width = <4>; reg-io-width = <4>;
clocks = <&ccu 53>; clocks = <&ccu CLK_BUS_UART0>;
resets = <&ccu 40>; resets = <&ccu RST_BUS_UART0>;
status = "disabled"; status = "disabled";
}; };

2
arch/arm/boot/dts/sunxi-h3-h5.dtsi
View File

@@ -394,7 +394,7 @@
emac: ethernet@1c30000 { emac: ethernet@1c30000 {
compatible = "allwinner,sun8i-h3-emac"; compatible = "allwinner,sun8i-h3-emac";
syscon = <&syscon>; syscon = <&syscon>;
reg = <0x01c30000 0x104>; reg = <0x01c30000 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq"; interrupt-names = "macirq";
resets = <&ccu RST_BUS_EMAC>; resets = <&ccu RST_BUS_EMAC>;

2
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View File

@@ -452,7 +452,7 @@
emac: ethernet@1c30000 { emac: ethernet@1c30000 {
compatible = "allwinner,sun50i-a64-emac"; compatible = "allwinner,sun50i-a64-emac";
syscon = <&syscon>; syscon = <&syscon>;
reg = <0x01c30000 0x100>; reg = <0x01c30000 0x10000>;
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq"; interrupt-names = "macirq";
resets = <&ccu RST_BUS_EMAC>; resets = <&ccu RST_BUS_EMAC>;