These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / omap3-lilly-a83x.dtsi

diff --git a/kernel/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/kernel/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index e631333..57d7c93 100644 (file)
--- a/kernel/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -284,7 +284,7 @@
 };
 
 &mmc1 {
-       cd-gpios = <&gpio4 30 IRQ_TYPE_LEVEL_LOW>;
+       cd-gpios = <&gpio4 30 GPIO_ACTIVE_LOW>;
        cd-inverted;
        vmmc-supply = <&vmmc1>;
        bus-width = <4>;
@@ -314,17 +314,17 @@
                interrupt-parent = <&gpio1>;
                interrupts = <8 0>;   /* boot6 / gpio_8 */
                spi-max-frequency = <1000000>;
-               pendown-gpio = <&gpio1 8 0>;
+               pendown-gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                vcc-supply = <&reg_vcc3>;
                pinctrl-names = "default";
                pinctrl-0 = <&tsc2048_pins>;
 
-               ti,x-min = <300>;
-               ti,x-max = <3000>;
-               ti,y-min = <600>;
-               ti,y-max = <3600>;
-               ti,x-plate-ohms = <80>;
-               ti,pressure-max = <255>;
+               ti,x-min = /bits/ 16 <300>;
+               ti,x-max = /bits/ 16 <3000>;
+               ti,y-min = /bits/ 16 <600>;
+               ti,y-max = /bits/ 16 <3600>;
+               ti,x-plate-ohms = /bits/ 16 <80>;
+               ti,pressure-max = /bits/ 16 <255>;
                ti,swap-xy;
 
                linux,wakeup;