Few fixes for omap dts files for v4.9 merge window. Let's also add

the tilcdc quirks:
 
 - Fix typo with recent beagleboard-x15 changes for mmc2_pins_default
 
 - Add am335x blue-and-red-wiring quirk as specified in the binding in
   Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Also
   fix up the whitespace formatting for am335x-evmsk.
 
 - Fix for recent igepv5 power button for GPIO_ACTIVE_LOW. Also fix
   up the whitespace formatting for the button
 -----BEGIN PGP SIGNATURE-----
 
 iQIuBAABCAAYBQJX4w32ERx0b255QGF0b21pZGUuY29tAAoJEBvUPslcq6VzGggP
 +waNl/O3wMsqw4VlTKxOKWAT3KtS3pWiCs0U0YO7KXV4txKqwinVr2uLn4HRb9Jv
 W254ngX7m0II6d4ws04+amcWuCmCaebwgm7zZwb4vf20TQ9MIns4oymPWXQRLhYK
 NY4ADMz+7nQ5uevhGtxOXqQqOK1aE5l+51zJ93ytMvqaq806ho8W9XaNo9kEUBI6
 0521PFDJuK+6rwIbb8VwXLE6cUajKz/j/25Nq5lC7RUpN+tHyfo+WSGesTW4+/Mi
 /27c9LS0tsrYlk1MRYPZ5c2ly1NBwTBCtdg6lJxgvWapH5+8YNdxgfgT8Sym+h8W
 aN3ZpiYkpdWhTptU4TW3o9sETxWZWAKn0TS6YklAzlXylZ6PTTRuLNzYV92P5IUq
 AtGIyfInkhk9tiioQo6b9ftwjxQYvTTd0GUpVmvCwTCjxQN9yZ5ut8ZaCaIAXiq4
 FzH5j36QmhLd9xaDiu5Gi+RqPhlIJXQVyOm/4fdCY8RWnQq2k6yh5+TLpErXIR0q
 xM4fY/DH9CtqTR8T6zqvwOnakSOvy9cDlVfCrP1nB2L2IT82oso82bkajnSMjWNB
 lDCE707Iwj13hkvAOfPoT03YAZqq3T6zc2VARRSXKyt6D83NT5q7I+xOxp3kL4U5
 dXiDX+qKcjkrb6/lqKyCxq7cK/gYh60dkHjomRE7E6Ij
 =14Zw
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "few minor fixes for omap dts files for v4.9 merge window"

Few fixes for omap dts files for v4.9 merge window. Let's also add
the tilcdc quirks:

- Fix typo with recent beagleboard-x15 changes for mmc2_pins_default

- Add am335x blue-and-red-wiring quirk as specified in the binding in
  Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Also
  fix up the whitespace formatting for am335x-evmsk.

- Fix for recent igepv5 power button for GPIO_ACTIVE_LOW. Also fix
  up the whitespace formatting for the button

* tag 'omap-for-v4.9/dt-pt3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap5-igep0050.dts: Use tabs for indentation
  ARM: dts: Fix igepv5 power button GPIO direction
  ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes
  ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node
  ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2
This commit is contained in:
Arnd Bergmann 2016-09-23 16:21:43 +02:00
Родитель 2008ee090c ce385a5e7a
Коммит 7dd84f065c
4 изменённых файлов: 27 добавлений и 23 удалений

Просмотреть файл

@ -497,6 +497,8 @@
&lcdc { &lcdc {
status = "okay"; status = "okay";
blue-and-red-wiring = "crossed";
}; };
&elm { &elm {

Просмотреть файл

@ -170,29 +170,29 @@
pinctrl-1 = <&lcd_pins_sleep>; pinctrl-1 = <&lcd_pins_sleep>;
status = "okay"; status = "okay";
panel-info { panel-info {
ac-bias = <255>; ac-bias = <255>;
ac-bias-intrpt = <0>; ac-bias-intrpt = <0>;
dma-burst-sz = <16>; dma-burst-sz = <16>;
bpp = <32>; bpp = <32>;
fdd = <0x80>; fdd = <0x80>;
sync-edge = <0>; sync-edge = <0>;
sync-ctrl = <1>; sync-ctrl = <1>;
raster-order = <0>; raster-order = <0>;
fifo-th = <0>; fifo-th = <0>;
}; };
display-timings { display-timings {
480x272 { 480x272 {
hactive = <480>; hactive = <480>;
vactive = <272>; vactive = <272>;
hback-porch = <43>; hback-porch = <43>;
hfront-porch = <8>; hfront-porch = <8>;
hsync-len = <4>; hsync-len = <4>;
vback-porch = <12>; vback-porch = <12>;
vfront-porch = <4>; vfront-porch = <4>;
vsync-len = <10>; vsync-len = <10>;
clock-frequency = <9000000>; clock-frequency = <9000000>;
hsync-active = <0>; hsync-active = <0>;
vsync-active = <0>; vsync-active = <0>;
}; };
}; };
}; };
@ -711,5 +711,7 @@
}; };
&lcdc { &lcdc {
status = "okay"; status = "okay";
blue-and-red-wiring = "crossed";
}; };

Просмотреть файл

@ -451,7 +451,7 @@
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>; pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&vdd_3v3>; vmmc-supply = <&vdd_3v3>;
bus-width = <8>; bus-width = <8>;

Просмотреть файл

@ -20,14 +20,14 @@
}; };
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-0 = <&power_button_pin>; pinctrl-0 = <&power_button_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
power-button { power-button {
label = "Power Button"; label = "Power Button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>; gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;
}; };
}; };