kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Amlogic ARM64 DT changes for v5.14 round 2:

Browse source 
-  various fixes for Odroid C4/HC4 regulators handling, USB and SPI NOR Flash for HC4
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmDHDlwACgkQd9zb2sjI
 SdHRWg/+IzZ72GUKzkBTxHuxBuOTIcyLjThS71x+MJFXE2HAqfAv7X4AwdhEOKS5
 FgN8Jdo9v+ZqC2Qm/VioKNsoNtx3EZo2Z2G8kXTfcnTehZvnmilzWVpQTCMOl6Vp
 H38yiBNdrmJMZueB/0OP50CfbEQsWb4ZuyVq2lqZNd9N/RV//F2WHi6e2ZbU0+6u
 RKhx0FP48ou4bZBo1vB01iGnCeUO3J9EDDX55NCr9KGHK0GT1ojieQmEeTeX5M3T
 08+PWA1a34AzYhBryj9hpFvWuYVT9KoxVXrAsMySrLMQhjWpWzggTe/J+HcAjCYz
 b/zSATcuyiukGcLd2q7r59bpVn2MV3vd6ZDvuSBvyIHkHIKRun7pxwK25tRNIKfl
 VQN5JQqg9D0HTONlUvUGko5rScMrYuJ+01QL65yVdAx1kxqMwugCdNSXKIDMSp+o
 HUAFfNzrkSIng12bgbiIdlBb3HrUcHuB8Wv8Mk3lsQr/dVYmrlWbQSHydY/yjIr5
 402U03KzRJkoVpwAm/gar9Ctt7LT1XTYnCFNllT5VPYFMw+ihf9xPezqEKdCLXmZ
 BQh6wNdmjezFLih6OLEwJv5yj/gvYmv9d/PRggADMeRzXDuNSrGvEAmWA+tJwmxC
 f63SiLk+mX0Qff7bCPGu8mSEvMe2OeUrgJQwvgD7+IHfUIhFe9M=
 =rNCR
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJDBAABCgAtFiEElf+HevZ4QCAJmMQ+jBrnPN6EHHcFAmDKmDsPHG9sb2ZAbGl4
 b20ubmV0AAoJEIwa5zzehBx3lvsQAJ7W6cm0NS/GnIMJfk2a6DuzSc0FDOzBztjY
 cRW6khByzFpGKv3JmhBLZN/cX4jDB4QNPju721KaY17wh8Bqz3jaDIwmZatgOBLb
 IMV9lQ1au2uOTv6iwK1J9ViN1MAhYbkwqIymjtnjyz4CVRQeyr8wH6JSPrsUlfub
 5szqjH1WyiPvfqi9xknHK3hmAFApHctiH8MISZzZ/kaCpOT6sg6/ixZZQjXR9lsN
 Iy1XKvwEyisT3MSNUzOviG8bi8QtQOrQi7TlN+kYQegnxQgN/wP+8khXoztpxP/0
 rjzWU2HFyJ2OrY+j/SFRGRdS+vywPqitVuX73wnH2PQlIcgI6reNT01r2ZSwijJu
 afeAoyXLSrhP6YRhyYNhCO2BU+FJLnwlBoJ0V50WNRfeq36pi0r1XOZA33D+DKS0
 HK5+Hc6yB71NL7KuiOWV61qkYbSEAc4Lu2e5/KUhu68GQIEVTZcsitzs5PVi5YIE
 JQ74VtQindtD82raUExKKa5d29qeZVQAx+89jOoHrayFwX95RIKsYJUj95QieizE
 giotgncycbessXFBrlkIFJ8qli5KaNMme8/Lx+WzTGwfCTJRAcsK/ZHz361R1umi
 kx9G01u3nYXQGRlxNLZzlWgP3V23Xg12GJQ0xs5a7NbiKzhaMlwQVqqVGuqt5Clx
 +4P5BR08
 =el5l
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-arm64-dt-for-v5.14-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changes for v5.14 round 2:
-  various fixes for Odroid C4/HC4 regulators handling, USB and SPI NOR Flash for HC4

* tag 'amlogic-arm64-dt-for-v5.14-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson-sm1-odroid-c4: remove invalid hub_5v regulator
  arm64: dts: meson-sm1-odroid-hc4: add spifc node to ODROID-HC4
  arm64: dts: meson-sm1-odroid-hc4: add regulators controlled by GPIOH_8
  arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0
  arm64: dts: meson-sm1-odroid: add 5v regulator gpio
  arm64: dts: meson-sm1-odroid: set tf_io regulator gpio as open source
  arm64: dts: meson-sm1-odroid: add missing enable gpio and supply for tf_io regulator

Link: https://lore.kernel.org/r/c953e97a-f901-a749-1fb6-b1caa75b4748@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2021-06-16 17:32:50 -07:00
commit 194eb4eab5
3 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
View file

@ -23,18 +23,6 @@
};
};
hub_5v: regulator-hub_5v {
compatible = "regulator-fixed";
regulator-name = "HUB_5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc_5v>;
/* Connected to the Hub CHIPENABLE, LOW sets low power state */
gpio = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
sound {
model = "ODROID-C4";
};
@ -58,8 +46,3 @@
&ir {
linux,rc-map-name = "rc-odroid";
};
&usb2_phy1 {
/* Enable the hub which is connected to this port */
phy-supply = <&hub_5v>;
};

50
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
View file

@ -44,6 +44,32 @@
};
};
/* Powers the SATA Disk 0 regulator, which is enabled when a disk load is detected */
p12v_0: regulator-p12v_0 {
compatible = "regulator-fixed";
regulator-name = "P12V_0";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
vin-supply = <&main_12v>;
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
regulator-always-on;
};
/* Powers the SATA Disk 1 regulator, which is enabled when a disk load is detected */
p12v_1: regulator-p12v_1 {
compatible = "regulator-fixed";
regulator-name = "P12V_1";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
vin-supply = <&main_12v>;
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
regulator-always-on;
};
sound {
model = "ODROID-HC4";
};
@ -90,7 +116,25 @@
status = "disabled";
};
&usb {
phys = <&usb2_phy0>, <&usb2_phy1>;
phy-names = "usb2-phy0", "usb2-phy1";
&spifc {
status = "okay";
pinctrl-0 = <&nor_pins>;
pinctrl-names = "default";
spi-flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <104000000>;
};
};
&usb {
phys = <&usb2_phy1>;
phy-names = "usb2-phy1";
};
&usb2_phy0 {
status = "disabled";
};

9
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
View file

@ -46,8 +46,13 @@
regulator-name = "TF_IO";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_5v>;
gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>;
enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_SOURCE>;
gpios-states = <0>;
states = <3300000 0>,
@ -78,6 +83,8 @@
regulator-max-microvolt = <5000000>;
regulator-always-on;
vin-supply = <&main_12v>;
gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
enable-active-high;
};
vcc_1v8: regulator-vcc_1v8 {