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

Commit 21c9a648 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-4.7-2' of... 

Merge tag 'imx-dt-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt

Merge "i.MX device tree updates for 4.7, take 2: from Shawn Guo:

The i.MX device tree updates for 4.7, take 2:
 - Update display clock configuration for imx6q-b850v3 board
 - Use watchdog external reset for imx6q-ba16 board
 - Update operating points settings for i.MX6UL/SX/DL
 - New board support: imx6ul-pico-hobbit and imx6q-marsboard
 - Add SAI audio support for imx6ul-14x14-evk board
 - Enable USB OTG support for M53EVK board
 - A couple of fixes on DTC warnings

* tag 'imx-dt-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mx5: dts: Enable USB OTG on M53EVK
  ARM: dts: imx6ul-14x14-evk: Add audio support
  ARM: dts: imx6qdl: Remove unneeded unit-addresses
  ARM: dts: imx6: apalis: parallel lcd display support on ixora
  ARM: dts: imx6sx-sdb: Add 198MHz operational point
  ARM: dts: imx28-m28: Remove unneeded partition nodes
  ARM: dts: imx6ul-pico-hobbit: Add initial support
  ARM: dts: imx6: Do not hardcode the CLKO clock
  ARM: dts: imx6: Add dts for Embest MarS Board
  ARM: dts: imx6: fix dtc warnings for ipu endpoints
  ARM: dts: imx6dl: Fix the VDD_ARM_CAP voltage for 396MHz operation
  ARM: dts: imx6sx: Add 198MHz operating point
  ARM: dts: imx6ul: Fix operating points
  ARM: dts: imx6q-ba16: use wdog external reset
  ARM: dts: imx: b450/b650v3: Move ldb_di clk assignment
  ARM: dts: imx6q-b850v3: Update display clock source
  ARM: dts: imx6q-b850v3: Remove ldb panel
parents 7430bc19 194521f7

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw552x.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-marsboard.dtb \

	imx6q-nitrogen6x.dtb \

	imx6q-nitrogen6_max.dtb \

	imx6q-novena.dtb \
@@ -392,6 +393,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sdb.dtb

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb \

	imx6ul-pico-hobbit.dtb \

	imx6ul-tx6ul-0010.dtb \

	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb

arch/arm/boot/dts/imx28-m28.dtsi

+0 −26
Original line number Diff line number Diff line
@@ -27,32 +27,6 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;

				status = "okay";



				partition@0 {

					label = "bootloader";

					reg = <0x00000000 0x00300000>;

					read-only;

				};



				partition@1 {

					label = "environment";

					reg = <0x00300000 0x00080000>;

				};



				partition@2 {

					label = "redundant-environment";

					reg = <0x00380000 0x00080000>;

				};



				partition@3 {

					label = "kernel";

					reg = <0x00400000 0x00400000>;

				};



				partition@4 {

					label = "filesystem";

					reg = <0x00800000 0x0f800000>;

				};

			};

		};

arch/arm/boot/dts/imx53-m53evk.dts

+20 −1
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ 
			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 2 0>;

		};



		reg_usb_otg_vbus: regulator@4 {

			compatible = "regulator-fixed";

			reg = <4>;

			regulator-name = "usb_otg_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 4 0>;

		};

	};



	sound {
@@ -168,6 +177,12 @@ 
			>;

		};



		pinctrl_usbotg: usbotggrp {

			fsl,pins = <

				MX53_PAD_GPIO_4__GPIO1_4		0x000b0

			>;

		};



		led_pin_gpio: led_gpio@0 {

			fsl,pins = <

				MX53_PAD_PATA_DATA8__GPIO2_8		0x80000000
@@ -351,6 +366,10 @@ 
};



&usbotg {

	dr_mode = "peripheral";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbotg>;

	dr_mode = "otg";

	vbus-supply = <&reg_usb_otg_vbus>;

	disable-over-current;

	status = "okay";

};

arch/arm/boot/dts/imx6dl-riotboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
	codec: sgtl5000@0a {

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		clocks = <&clks 201>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

	};

arch/arm/boot/dts/imx6dl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
				/* kHz    uV */

				996000  1250000

				792000  1175000

				396000  1075000

				396000  1150000

			>;

			fsl,soc-operating-points = <

				/* ARM kHz  SOC-PU uV */