Unverified Commit 194eb4ea authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-arm64-dt-for-v5.14-v2' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 8d8538a4 303d2af2

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

+0 −17
Original line number Diff line number Diff line
@@ -23,18 +23,6 @@ led-blue { 
		};

	};



	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 @@ hog-0 { 
&ir {

	linux,rc-map-name = "rc-odroid";

};
 


&usb2_phy1 {

	/* Enable the hub which is connected to this port */

	phy-supply = <&hub_5v>;

};

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

+46 −2
Original line number Diff line number Diff line
@@ -44,6 +44,32 @@ led-red { 
		};

	};



	/* 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 @@ &sd_emmc_c { 
	status = "disabled";

};



&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_phy0>, <&usb2_phy1>;

	phy-names = "usb2-phy0", "usb2-phy1";

	phys = <&usb2_phy1>;

	phy-names = "usb2-phy1";

};



&usb2_phy0 {

	status = "disabled";

};

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

+8 −1
Original line number Diff line number Diff line
@@ -46,8 +46,13 @@ tf_io: gpio-regulator-tf_io { 
		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 @@ vcc_5v: regulator-vcc_5v { 
		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 {