github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Samsung DeviceTree update for v4.9:

Browse Source 
1. Set chosen serial bitrate which allows proper serial output when
    bootloader does pass all the data in command line.
 2. Cleanup.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXxUu4AAoJEME3ZuaGi4PXvHEP/jtgqI3x2AKqSeHZ67JVetvV
 9mmRFcyOHavz7D0kutUnKxuHMAM6j/0CBVVJblbDrDz1MTtQc2O1q6aCqambwi8y
 RW9Uckbn0WtA3VNKp+FlIe3nB7VBpBYwwdjCx9az5Z7SAO4S2eMKg3HAPNJPjphd
 Dhu27NpwQlFOvmKkVvKRpJtXbLRL77ustSbQEGeKyVuT1flzKXe8rkwJI642V1Ur
 lCcgIv8Hf5L5kREg9qvbRMVpFk5hIDTLIuPz9ToM5H3hjU7jGHz2DiAx/Ec9K5GJ
 RihGgVFE4pQxQil9mlF8SDc8D326zgs760f8TbqVpdf1uT6FvbSWm75IbkZAlXZ3
 Pyq5j+2Trx5fA3phi7L0Jz8yq04tXBRbHC15bTXE2X9d8l/djZopTtLCAUZkewFd
 Mv2UicPMGDwkA5/QMvz38U2rhiAiNTgSBvj9Py5DmpyIfuwbJr+xZkKDedX5Vvc7
 bDOPOg/+XOA6AOcmsK1Fsu2i9M6SZL9MuRtKq9hMsGmuZ8OB1TFqWiAHy/AusG2r
 +/mKjXV2Xi/zF8tVJhfgKDNF+k9vsUT2v91TLH3gKO7FXEpdvXSoh5fCfid9GiSC
 QznTz+t62e4r1utMzl37hf2lDtxOKH9/7xNM/1O2wPhVgw9pWP+slYqZLYNkSaLB
 1PA1vrrYEGZ9grucSYE8
 =8Yu8
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-09-13 16:09:10 +02:00
commit 6f7f9e4418
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt
View File

@ -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>;

2
arch/arm/boot/dts/exynos4210-universal_c210.dts
View File

@ -269,7 +269,7 @@ fimd_dpi_ep: endpoint {
};
&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>;

2
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@ -227,7 +227,7 @@ &fimc_3 {
};
&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>;

2
arch/arm/boot/dts/exynos5250-arndale.dts
View File

@ -152,7 +152,7 @@ &fimd {
};
&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>;

2
arch/arm/boot/dts/exynos5250-smdk5250.dts
View File

@ -116,7 +116,7 @@ &fimd {
};
&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
};
&i2c_0 {

2
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View File

@ -260,7 +260,7 @@ &fimd {
};
&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>;

2
arch/arm/boot/dts/exynos5250-spring.dts
View File

@ -91,7 +91,7 @@ &fimd {
};
&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>;

2
arch/arm/boot/dts/exynos5410-odroidxu.dts
View File

@ -26,7 +26,7 @@ memory {
};
chosen {
linux,stdout-path = &serial_2;
stdout-path = "serial2:115200n8";
};
emmc_pwrseq: pwrseq {

2
arch/arm/boot/dts/exynos5420-peach-pit.dts
View File

@ -179,7 +179,7 @@ &fimd {
&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>;

2
arch/arm/boot/dts/exynos5420-smdk5420.dts
View File

@ -130,7 +130,7 @@ &fimd {
&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>;
};

4
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View File

@ -26,7 +26,7 @@ memory {
};
chosen {
linux,stdout-path = &serial_2;
stdout-path = "serial2:115200n8";
};
firmware@02073000 {
@ -250,7 +250,7 @@ &cpu4 {
&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>;

2
arch/arm/boot/dts/exynos5800-peach-pi.dts
View File

@ -179,7 +179,7 @@ &fimd {
&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>;