Commit 8a20a04b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull more ARM DT changes from Arnd Bergmann:
 "Here are some final updates for ARM SoC specific dts files:

   - The i.MX changes were sent relatively late, and had a dependency on
     the clk tree, so I delayed that a bit.  Support for the new i.MX6qp
     SoC and a couple of new boards is added in this branch.

   - Uniphier renames a few files to match the final product names that
     were decided by the company, kudos to the kernel developer(s) for
     getting support upstream before the product release.  Also two
     boards are added.  The patches were posted early enough and nice
     overall, but we forgot to apply them and decided to give it some
     more time in linux-next

   - at91 has two small bug fixes"

* tag 'armsoc-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: dts: at91: sama5d4 Xplained: don't disable hsmci regulator
  ARM: dts: at91: sama5d3 Xplained: don't disable hsmci regulator
  ARM: dts: uniphier: add pinmux node for I2C ch4
  ARM: dts: uniphier: add @{address} to EEPROM node
  ARM: dts: uniphier: add PH1-Pro4 Sanji board support
  ARM: dts: uniphier: add PH1-Pro4 Ace board support
  ARM: dts: uniphier: enable I2C channel 2 of ProXstream2 Gentil board
  ARM: dts: uniphier: add EEPROM node for ProXstream2 Gentil board
  ARM: dts: uniphier: add reference clock nodes
  ARM: dts: uniphier: rework UniPhier System Bus nodes
  ARM: dts: uniphier: factor out ranges property of support card
  arm64: dts: uniphier: rename PH1-LD10 to PH1-LD20
  ARM: dts: imx53-qsb: Fix gpio button polarity
  ARM: dts: vfxxx: Add DAC node for Vybrid SoC
  ARM: dts: imx6q: add missing links between ipu2 and mipi dsi
  ARM: dts: imx: Add support for Advantech/GE B850v3
  ARM: dts: imx: Add support for Advantech/GE B650v3
  ARM: dts: imx: Add support for Advantech/GE B450v3
  ARM: dts: imx: Add support for Advantech/GE Bx50v3
  ARM: dts: imx: Add Advantech BA-16 Qseven module
  ...
parents 732b84ee 6fe35ab7

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ ad Avionic Design GmbH 
adapteva	Adapteva, Inc.

adh	AD Holdings Plc.

adi	Analog Devices, Inc.

advantech	Advantech Corporation

aeroflexgaisler	Aeroflex Gaisler AB

al	Annapurna Labs

allwinner	Allwinner Technology Co., Ltd.
@@ -89,6 +90,7 @@ fcs Fairchild Semiconductor 
firefly	Firefly

focaltech	FocalTech Systems Co.,Ltd

fsl	Freescale Semiconductor

ge	General Electric Company

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

geniatech	Geniatech, Inc.

arch/arm/boot/dts/Makefile

+11 −1
Original line number Diff line number Diff line
@@ -325,12 +325,17 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-udoo.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6q-apalis-ixora.dtb \

	imx6q-apf6dev.dtb \

	imx6q-arm2.dtb \

	imx6q-b450v3.dtb \

	imx6q-b650v3.dtb \

	imx6q-b850v3.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \

	imx6q-dfi-fs700-m60.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-evi.dtb \

	imx6q-gk802.dtb \

	imx6q-gw51xx.dtb \

	imx6q-gw52xx.dtb \
@@ -340,6 +345,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-nitrogen6x.dtb \

	imx6q-nitrogen6_max.dtb \

	imx6q-novena.dtb \
@@ -357,7 +363,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-tx6q-1110.dtb \

	imx6q-udoo.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb

	imx6q-wandboard-revb1.dtb \

	imx6qp-sabreauto.dtb \

	imx6qp-sabresd.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-warp.dtb
@@ -752,7 +760,9 @@ dtb-$(CONFIG_ARCH_U8500) += \ 
dtb-$(CONFIG_ARCH_UNIPHIER) += \

	uniphier-ph1-ld4-ref.dtb \

	uniphier-ph1-ld6b-ref.dtb \

	uniphier-ph1-pro4-ace.dtb \

	uniphier-ph1-pro4-ref.dtb \

	uniphier-ph1-pro4-sanji.dtb \

	uniphier-ph1-sld3-ref.dtb \

	uniphier-ph1-sld8-ref.dtb \

	uniphier-proxstream2-gentil.dtb \

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ 
		regulator-name = "mmc0-card-supply";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	gpio_keys {

arch/arm/boot/dts/at91-sama5d4_xplained.dts

+1 −0
Original line number Diff line number Diff line
@@ -268,5 +268,6 @@ 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_3v3_reg>;

		regulator-always-on;

	};

};

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
			label = "BP1";

			gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;

			linux,code = <BTN_MISC>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE