Commit db7a033f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-2' of... 

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

arm64: dts: amlogic: updates for v5.13 (round 2)
- updates/cleanups for Hardkernel Odroid N2/N2+

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add GPIO line names to ODROID N2/N2+
  arm64: dts: meson: add saradc node to ODROID N2/N2+
  arm64: dts: meson: remove extra tab from ODROID N2/N2+ ext_mdio node

Link: https://lore.kernel.org/r/7htuofgwaz.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a8f6ba28 412c8fa8

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

+51 −1
Original line number Diff line number Diff line
@@ -446,6 +446,51 @@ 
};



&gpio {

	gpio-line-names =

		/* GPIOZ */

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		/* GPIOH */

		"", "", "", "", "", "", "", "",

		"",

		/* BOOT */

		"", "", "", "", "", "", "", "",

		"", "", "", "", "", "", "", "",

		/* GPIOC */

		"", "", "", "", "", "", "", "",

		/* GPIOA */

		"PIN_44", /* GPIOA_0 */

		"PIN_46", /* GPIOA_1 */

		"PIN_45", /* GPIOA_2 */

		"PIN_47", /* GPIOA_3 */

		"PIN_26", /* GPIOA_4 */

		"", "", "", "", "", "",

		"PIN_42", /* GPIOA_11 */

		"PIN_32", /* GPIOA_12 */

		"PIN_7",  /* GPIOA_13 */

		"PIN_27", /* GPIOA_14 */

		"PIN_28", /* GPIOA_15 */

		/* GPIOX */

		"PIN_16", /* GPIOX_0 */

		"PIN_18", /* GPIOX_1 */

		"PIN_22", /* GPIOX_2 */

		"PIN_11", /* GPIOX_3 */

		"PIN_13", /* GPIOX_4 */

		"PIN_33", /* GPIOX_5 */

		"PIN_35", /* GPIOX_6 */

		"PIN_15", /* GPIOX_7 */

		"PIN_19", /* GPIOX_8 */

		"PIN_21", /* GPIOX_9 */

		"PIN_24", /* GPIOX_10 */

		"PIN_23", /* GPIOX_11 */

		"PIN_8",  /* GPIOX_12 */

		"PIN_10", /* GPIOX_13 */

		"PIN_29", /* GPIOX_14 */

		"PIN_31", /* GPIOX_15 */

		"PIN_12", /* GPIOX_16 */

		"PIN_3",  /* GPIOX_17 */

		"PIN_5",  /* GPIOX_18 */

		"PIN_36"; /* GPIOX_19 */

	/*

	 * WARNING: The USB Hub on the Odroid-N2 needs a reset signal

	 * to be turned high in order to be detected by the USB Controller
@@ -508,6 +553,11 @@ 
	status = "okay";

};



&saradc {

	status = "okay";

	vref-supply = <&vddao_1v8>;

};



/* SD card */

&sd_emmc_b {

	status = "okay";