Skip to content

Commit

Permalink
Merge tag 'samsung-dt-4.9' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history 
…el/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
  • Loading branch information
Arnd Bergmann committed Sep 13, 2016
2 parents 94c6a37 + 05b01dd commit 6f7f9e4
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos4210-universal_c210.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250-arndale.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250-smdk5250.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
};

&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
};

&i2c_0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250-snow-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
};

&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
phy = <&hdmiphy>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5250-spring.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
};

&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
phy = <&hdmiphy>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5410-odroidxu.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
};

chosen {
linux,stdout-path = &serial_2;
stdout-path = "serial2:115200n8";
};

emmc_pwrseq: pwrseq {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5420-peach-pit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

&hdmi {
status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
ddc = <&i2c_2>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5420-smdk5420.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@

&hdmi {
status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
};

chosen {
linux,stdout-path = &serial_2;
stdout-path = "serial2:115200n8";
};

firmware@02073000 {
Expand Down Expand Up @@ -250,7 +250,7 @@

&hdmi {
status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/exynos5800-peach-pi.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

&hdmi {
status = "okay";
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>;
ddc = <&i2c_2>;
Expand Down

0 comments on commit 6f7f9e4

Please sign in to comment.