mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

Our usual round of DT patches for the 5.15 merge window, with some

Browse source 
Tanix TX6 improvements this time.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYRtzkgAKCRDj7w1vZxhR
 xVFDAP9KtkhynOTSSLPDBqQ3+Z3rah+9U+Edz/988S6M95XyfgD+IwxaT/f17cVy
 qnxN/0K5UJzQ/kj8Fjg3enZFghpGbQs=
 =c71z
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmEdAQgACgkQmmx57+YA
 GNmtbQ//UaS7cOopXPmnXJEEXJVKBuw0SZs4Liqup2DZCFmI9JZrcrUC2pgEee3/
 S+bw5PQpbp9Y8DbaNYAfsKcEtmvIBavjCLCDp9DhXLXXMGab2nSsuOrHUJ9m9WNS
 nb/nV0eq8/MI8mm56Uaj3c/t11TQYXqqY5erBMF1PlxkjqU3loLaX2DAFVwrCUiU
 9zPETGFYDAEL35vOgkR6HSLLjCz2T2oBk7/lePEFmnlEFNpzHzKRMe3vVg4qkVIT
 aElSN3um2+C9H8SHPwoHKnHlzt3s9yuK0iPUfTvFfBowWKqHjqjBszG1OwG9mjnS
 2fT5ftD3dMiWP/HlrxLwLl3OUsKLfVL1RuZn4afzHQTLVn7omqCbFpOirNgiksvr
 tTkWKBdwr/p/xoKVqI0jqIwjq3Uh5wfL7OHBlsIM8TTWsuXelYZIADu1xgw2ARsj
 xgAfINuIZbsPWa/uy+56LddkhOUCwF9ToEn9q5KOnyL+mKS9n/hvvnrHPbn3Styq
 NOXU5opklbpIhw1eIPdKXxrN1oRWsyPmGALhRjms5BdAnOBEaLL/AOVzGlJpMDdV
 aIqAOU7dvhZOmj1sEHH4mQcLDwbVRAUvxNXJ84p/heQ87M4D1PDcpp9xv3BJga3+
 F81IXGwwsON6Rz1gAXbLviEMG9EGW8DlZmr6VmyJGVfrqa1EtLw=
 =4XFz
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

Our usual round of DT patches for the 5.15 merge window, with some
Tanix TX6 improvements this time.

* tag 'sunxi-dt-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: dts: allwinner: h6: tanix-tx6: enable emmc
  arm64: dts: allwinner: h6: tanix-tx6: Add PIO power supplies
  arm64: dts: allwinner: h6: tanix-tx6: Fix regulator node names

Link: https://lore.kernel.org/r/39cd7be5-a9a7-42b6-bc29-f895b9a3448a.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-08-18 14:45:59 +02:00
commit 4b27844731
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts
View file

@ -32,14 +32,21 @@ hdmi_con_in: endpoint {
};
};
reg_vcc3v3: vcc3v3 {
reg_vcc1v8: regulator-vcc1v8 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
reg_vcc3v3: regulator-vcc3v3 {
compatible = "regulator-fixed";
regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_vdd_cpu_gpu: vdd-cpu-gpu {
reg_vdd_cpu_gpu: regulator-vdd-cpu-gpu {
compatible = "regulator-fixed";
regulator-name = "vdd-cpu-gpu";
regulator-min-microvolt = <1135000>;
@ -91,6 +98,16 @@ &mmc0 {
status = "okay";
};
&mmc2 {
vmmc-supply = <&reg_vcc3v3>;
vqmmc-supply = <&reg_vcc1v8>;
bus-width = <8>;
non-removable;
cap-mmc-hw-reset;
mmc-hs200-1_8v;
status = "okay";
};
&ohci0 {
status = "okay";
};
@ -99,6 +116,12 @@ &ohci3 {
status = "okay";
};
&pio {
vcc-pc-supply = <&reg_vcc1v8>;
vcc-pd-supply = <&reg_vcc3v3>;
vcc-pg-supply = <&reg_vcc1v8>;
};
&r_ir {
linux,rc-map-name = "rc-tanix-tx5max";
status = "okay";