Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 305cd70e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

arm64: dts: Amlogic fixes for v5.3-rc
- a few small DT fixes for g12a/g12b platforms

* tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: amlogic: odroid-n2: keep SD card regulator always on
  arm64: dts: meson-g12a-sei510: enable IR controller
  arm64: dts: meson-g12a: add missing dwc2 phy-names
parents c372740c dc7f2cb2

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

+6 −0
Original line number Diff line number Diff line
@@ -339,6 +339,12 @@ 
	pinctrl-names = "default";

};



&ir {

	status = "okay";

	pinctrl-0 = <&remote_input_ao_pins>;

	pinctrl-names = "default";

};



&pwm_ef {

	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

arch/arm64/boot/dts/amlogic/meson-g12a.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2386,6 +2386,7 @@ 
				clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;

				clock-names = "ddr";

				phys = <&usb2_phy1>;

				phy-names = "usb2-phy";

				dr_mode = "peripheral";

				g-rx-fifo-size = <192>;

				g-np-tx-fifo-size = <128>;

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


		gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		regulator-always-on;

	};



	tf_io: gpio-regulator-tf_io {