leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allwinner DT changes for 4.20

Browse Source 
Our usual bunch of DT patches for the Allwinner arm32 SoCs.
 
 The most notable changes are:
   - Support for the video decoding / encoding engine on the
     A10s/A13/A20/A33
   - IR support for the A83t
   - SATA support for the R40
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0VqZU19dR2zEVaqr0rTAlCFNr3QFAluvkSIACgkQ0rTAlCFN
 r3Snkw/9FtNLppZKqT2l5NdU7eRE2nUGNvBBh1Dgw2lIlWyzpffjsdMBzZRGahTT
 wK/uZwvrLmdtb2WKWCnEJ4k2Vrp3nPGGNlOdonsf9I5CqR/Cl88Z6HPIdEI1FwMC
 bNgrC8LENP+zsDPjMZkgOJ/JBlOmPco9l42mC8c2kfLtSiKdiQWNZ88oPgCoiRbJ
 VCWnxnxU7pQkX10yj/aIu1bhcFgxLYa1M2C0rj4AkxIdWChVaDZxiDCncuSIqcHt
 7a4NchkBXOZeqYY2Dz3ppdxFnQWOhvR0qQJjHzVcGdKNDKurNv0Ud6Mq2v4+Doo9
 gJUKGy0PcbvMwm3spOK/CdcW+c3IfO2bJaOz36mE3S3d6a78Ku7UeIc2GnlL9zfx
 EYsowLaERm3213ZsbXWB07vfOxoJtk7cmCRIdnuk2S9sFaTZzB65/x+0lNCdxAbL
 6Pc4/ZBYVp596T2fGjjnPho6bx9SQ2+ybz9/epEHVRTBYja2zIfJ/Pw4D8ofxDBR
 bDZznX3EmE4L1m1w6FaDQzDsoQNv6pS/fiTfsXD35OnzNY0KplbFfcOCZQpF31Mi
 7s6iADszYEcefXOwmuIekG5Zw2qcCt4sNkWu/U0hjPXf3TVMnaImPce5K6PBXJHt
 zu9DabmboEHicazYPlvJflWD9gkbM5lHdNGAmqWVm/eQ7IDH0Z8=
 =vyaf
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner DT changes for 4.20

Our usual bunch of DT patches for the Allwinner arm32 SoCs.

The most notable changes are:
  - Support for the video decoding / encoding engine on the
    A10s/A13/A20/A33
  - IR support for the A83t
  - SATA support for the R40

* tag 'sunxi-dt-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun9i: Fix I2C bus warnings
  ARM: dts: sunxi: Fix I2C bus warnings
  ARM: dts: sun8i-a33: Add Video Engine and reserved memory nodes
  ARM: dts: sun7i-a20: Add Video Engine and reserved memory nodes
  ARM: dts: sun5i: Add Video Engine and reserved memory nodes
  ARM: dts: sun8i: sun8i-r40-bananapi-m2-ultra: enable AHCI
  ARM: dts: sun8i: r40: add sata node
  ARM: dts: sunxi: Don't use cd-inverted in sun8i-r40-bananapi-m2-ultra
  ARM: dts: sun8i: a83t: bananapi-m3: Enable IR controller
  ARM: dts: sun8i: a83t: Add support for the cir interface
  ARM: dts: sun8i: a83t: Add the cir pin for the A83T

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-10-02 10:25:41 +02:00
commit 26220da2ab
11 changed files with 139 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
View File

@ -92,7 +92,8 @@
*/
clock-frequency = <400000>;
touchscreen: touchscreen {
touchscreen: touchscreen@40 {
reg = <0x40>;
interrupt-parent = <&pio>;
interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>; /* EINT11 (PG11) */
pinctrl-names = "default";

26
arch/arm/boot/dts/sun5i.dtsi
View File

@ -108,6 +108,21 @@
};
};
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
cma_pool: cma@4a000000 {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
reusable;
linux,cma-default;
};
};
soc@1c00000 {
compatible = "simple-bus";
#address-cells = <1>;
@ -294,6 +309,17 @@
};
};
video-codec@1c0e000 {
compatible = "allwinner,sun5i-a13-video-engine";
reg = <0x01c0e000 0x1000>;
clocks = <&ccu CLK_AHB_VE>, <&ccu CLK_VE>,
<&ccu CLK_DRAM_VE>;
clock-names = "ahb", "mod", "ram";
resets = <&ccu RST_VE>;
interrupts = <53>;
allwinner,sram = <&ve_sram 1>;
};
mmc0: mmc@1c0f000 {
compatible = "allwinner,sun5i-a13-mmc";
reg = <0x01c0f000 0x1000>;

26
arch/arm/boot/dts/sun7i-a20.dtsi
View File

@ -174,6 +174,21 @@
reg = <0x40000000 0x80000000>;
};
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
cma_pool: cma@4a000000 {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
reusable;
linux,cma-default;
};
};
timer {
compatible = "arm,armv7-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@ -479,6 +494,17 @@
};
};
video-codec@1c0e000 {
compatible = "allwinner,sun7i-a20-video-engine";
reg = <0x01c0e000 0x1000>;
clocks = <&ccu CLK_AHB_VE>, <&ccu CLK_VE>,
<&ccu CLK_DRAM_VE>;
clock-names = "ahb", "mod", "ram";
resets = <&ccu RST_VE>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
allwinner,sram = <&ve_sram 1>;
};
mmc0: mmc@1c0f000 {
compatible = "allwinner,sun7i-a20-mmc";
reg = <0x01c0f000 0x1000>;

26
arch/arm/boot/dts/sun8i-a33.dtsi
View File

@ -190,6 +190,21 @@
reg = <0x40000000 0x80000000>;
};
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
/* Address must be kept in the lower 256 MiBs of DRAM for VE. */
cma_pool: cma@4a000000 {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
reusable;
linux,cma-default;
};
};
sound: sound {
compatible = "simple-audio-card";
simple-audio-card,name = "sun8i-a33-audio";
@ -254,6 +269,17 @@
};
};
video-codec@01c0e000 {
compatible = "allwinner,sun8i-a33-video-engine";
reg = <0x01c0e000 0x1000>;
clocks = <&ccu CLK_BUS_VE>, <&ccu CLK_VE>,
<&ccu CLK_DRAM_VE>;
clock-names = "ahb", "mod", "ram";
resets = <&ccu RST_BUS_VE>;
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
allwinner,sram = <&ve_sram 1>;
};
crypto: crypto-engine@1c15000 {
compatible = "allwinner,sun4i-a10-crypto";
reg = <0x01c15000 0x1000>;

5
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
View File

@ -191,6 +191,11 @@
status = "okay";
};
&r_cir {
clock-frequency = <3000000>;
status = "okay";
};
&r_rsb {
status = "okay";

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

@ -990,6 +990,19 @@
reg = <0x1f01c00 0x400>;
};
r_cir: ir@1f02000 {
compatible = "allwinner,sun8i-a83t-ir",
"allwinner,sun5i-a13-ir";
clocks = <&r_ccu CLK_APB0_IR>, <&r_ccu CLK_IR>;
clock-names = "apb", "ir";
resets = <&r_ccu RST_APB0_IR>;
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x01f02000 0x400>;
pinctrl-names = "default";
pinctrl-0 = <&r_cir_pin>;
status = "disabled";
};
r_pio: pinctrl@1f02c00 {
compatible = "allwinner,sun8i-a83t-r-pinctrl";
reg = <0x01f02c00 0x400>;
@ -1002,6 +1015,11 @@
interrupt-controller;
#interrupt-cells = <3>;
r_cir_pin: r-cir-pin {
pins = "PL12";
function = "s_cir_rx";
};
r_rsb_pins: r-rsb-pins {
pins = "PL0", "PL1";
function = "s_rsb";

21
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
View File

@ -105,6 +105,12 @@
};
};
&ahci {
ahci-supply = <&reg_dldo4>;
phy-supply = <&reg_eldo3>;
status = "okay";
};
&de {
status = "okay";
};
@ -159,8 +165,7 @@
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 13 GPIO_ACTIVE_HIGH>; /* PH13 */
cd-inverted;
cd-gpios = <&pio 7 13 GPIO_ACTIVE_LOW>; /* PH13 */
status = "okay";
};
@ -251,6 +256,18 @@
regulator-name = "vcc-wifi";
};
&reg_dldo4 {
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-name = "vdd2v5-sata";
};
&reg_eldo3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-name = "vdd1v2-sata";
};
&tcon_tv0 {
status = "okay";
};

13
arch/arm/boot/dts/sun8i-r40.dtsi
View File

@ -529,6 +529,19 @@
#size-cells = <0>;
};
ahci: sata@1c18000 {
compatible = "allwinner,sun8i-r40-ahci";
reg = <0x01c18000 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;
resets = <&ccu RST_BUS_SATA>;
resets-name = "ahci";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
gmac: ethernet@1c50000 {
compatible = "allwinner,sun8i-r40-gmac";
syscon = <&ccu>;

3
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
View File

@ -69,7 +69,8 @@
*/
clock-frequency = <400000>;
touchscreen: touchscreen@0 {
touchscreen: touchscreen@40 {
reg = <0x40>;
interrupt-parent = <&pio>;
interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */
pinctrl-names = "default";

2
arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts
View File

@ -95,7 +95,7 @@
&i2c0 {
status = "okay";
axp22x: pmic@68 {
axp22x: pmic@34 {
compatible = "x-powers,axp221";
reg = <0x34>;
interrupt-parent = <&nmi_intc>;

2
arch/arm/boot/dts/sun9i-a80.dtsi
View File

@ -1196,7 +1196,7 @@
};
};
r_rsb: i2c@8003400 {
r_rsb: rsb@8003400 {
compatible = "allwinner,sun8i-a23-rsb";
reg = <0x08003400 0x400>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;