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

Commit 6f7f9e44 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt 

Merge "Samsung DeviceTree update for v4.9" from Krzysztof Kozlowski:

1. Set chosen serial bitrate which allows proper serial output when
   bootloader does pass all the data in command line.
2. Cleanup.

* tag 'samsung-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Use 'hpd-gpios' instead of 'hpd-gpio'
  ARM: dts: exynos: Use stdout non-deprecated property and add serial options to Odroid XU/XU3/XU4
parents 94c6a37a 05b01dd9

Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Required properties: 
- reg: physical base address of the hdmi and length of memory mapped

	region.

- interrupts: interrupt number to the cpu.

- hpd-gpio: following information about the hotplug gpio pin.

- hpd-gpios: following information about the hotplug gpio pin.

	a) phandle of the gpio controller node.

	b) pin number within the gpio controller.

	c) optional flags and pull up/down.
@@ -56,7 +56,7 @@ Example: 
		compatible = "samsung,exynos4212-hdmi";

		reg = <0x14530000 0x100000>;

		interrupts = <0 95 0>;

		hpd-gpio = <&gpx3 7 1>;

		hpd-gpios = <&gpx3 7 1>;

		ddc = <&hdmi_ddc_node>;

		phy = <&hdmi_phy_node>;

		samsung,syscon-phandle = <&pmu_system_controller>;

arch/arm/boot/dts/exynos4210-universal_c210.dts

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ 
};



&hdmi {

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd>;

	hdmi-en-supply = <&hdmi_en>;

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 
};



&hdmi {

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&hdmi_hpd>;

	vdd-supply = <&ldo8_reg>;

arch/arm/boot/dts/exynos5250-arndale.dts

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ 
};



&hdmi {

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>;

	vdd_osc-supply = <&ldo10_reg>;

	vdd_pll-supply = <&ldo8_reg>;

	vdd-supply = <&ldo8_reg>;

arch/arm/boot/dts/exynos5250-smdk5250.dts

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
};



&hdmi {

	hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;

	hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;

};



&i2c_0 {