Allwinner H3/H5 changes for 4.19

Our usual bunch of changes shared between arm and arm64.
 
 This time, we have:
   - eMMC support for the ALL-H3-CC boards
   - EMAC support for the Beelink X2
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0VqZU19dR2zEVaqr0rTAlCFNr3QFAltXJHsACgkQ0rTAlCFN
 r3TrXQ//ai4SQCdkx9sWvbmVll3qhoFWT4cRE5S8bWI/9nJmoYGmlIW94PgLXi3f
 ck5lMgkL1yNLDD66ym+YW57fcXjAVkySsqySMOwFkhKCFKVeZnT69om3jl7dWXou
 8ieJblWO7MZUhQ7IFZdq/+KAzmQKw9H0He27Pe1x0KEEbOHgkjsWBZPnSvRMbnyC
 wBt3ItecbtK/5wNmgvGrQr6yLooXnsfLS8tq/je/mP+/260FfZcvt5J73mvi/JVX
 k4WISVHB+QL3tIS+/8jijYG+PD3Is9OxXcQdmGVACGyPxKQQpgmUqakn2IGwpXWv
 gTc5CPOAigDKhICgbGaeiHNM/9+UEA9kqQQmweUpM0dd5p2O+mIbdOAstvQCD41y
 iK5NmBrr9Q/XaobeogtQNVxDmcyFtjEp4vftHIRSt9kijIN1yhCKlC/SiRIP6hlr
 t/lsXiIDyfh1eo5ZZdIltcCxKD6LpWwUqs9tRRGCXQOEz6tLivF/VFIgpvDsthLO
 N/tPHeqA9VMBybyEavJsq7hs+Ckt5YbriOW+nWZRqgek0r9BHcZ2nFBg5nMhqIWw
 jCZ62PXmIdJJNtaDcO/ZidWAZMIeoiTmm4VJzyhIwMMQG8DT4ONWsxxsT1aHCGk8
 k7MT1/RLDHFBuj2dJKbwPIsyF8ivZAodtWdNu67zeXs+8l7vd04=
 =Blyi
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-h3-h5-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt

Allwinner H3/H5 changes for 4.19

Our usual bunch of changes shared between arm and arm64.

This time, we have:
  - eMMC support for the ALL-H3-CC boards
  - EMAC support for the Beelink X2

* tag 'sunxi-h3-h5-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sunxi-h3-h5: Remove unused address-cells/size-cells of dwmac-sun8i
  ARM: dts: sunxi: libretech-all-h3-cc: Enable eMMC module
  ARM: sun8i: h3: add SY8113B regulator on Banana Pi M2 Zero board
  ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2
  ARM: dts: sun8i-h3: Add missing cooling device properties for CPUs

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-26 00:02:45 -07:00
commit 31342a2150
5 changed files with 46 additions and 2 deletions

View File

@ -48,6 +48,23 @@
};
};
reg_vdd_cpux: vdd-cpux-regulator {
compatible = "regulator-gpio";
regulator-name = "vdd-cpux";
regulator-type = "voltage";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1300000>;
regulator-ramp-delay = <50>; /* 4ms */
gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */
enable-active-high;
gpios-states = <0x1>;
states = <1100000 0x0
1300000 0x1>;
};
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
pinctrl-names = "default";
@ -55,6 +72,10 @@
};
};
&cpu0 {
cpu-supply = <&reg_vdd_cpux>;
};
&ehci0 {
status = "okay";
};

View File

@ -123,6 +123,13 @@
status = "okay";
};
&emac {
phy-handle = <&int_mii_phy>;
phy-mode = "mii";
allwinner,leds-active-low;
status = "okay";
};
&hdmi {
status = "okay";
};

View File

@ -84,21 +84,30 @@
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <1>;
clocks = <&ccu CLK_CPUX>;
clock-names = "cpu";
operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>;
};
cpu@2 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <2>;
clocks = <&ccu CLK_CPUX>;
clock-names = "cpu";
operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>;
};
cpu@3 {
compatible = "arm,cortex-a7";
device_type = "cpu";
reg = <3>;
clocks = <&ccu CLK_CPUX>;
clock-names = "cpu";
operating-points-v2 = <&cpu0_opp_table>;
#cooling-cells = <2>;
};
};

View File

@ -506,8 +506,6 @@
reset-names = "stmmaceth";
clocks = <&ccu CLK_BUS_EMAC>;
clock-names = "stmmaceth";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
mdio: mdio {

View File

@ -178,6 +178,15 @@
status = "okay";
};
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_8bit_pins>;
vmmc-supply = <&reg_vcc_io>;
bus-width = <8>;
non-removable;
status = "okay";
};
&ohci0 {
status = "okay";
};