From 1259bc692882ad2883faeca80817b84f0d7ad2aa Mon Sep 17 00:00:00 2001 From: Ricardo Martins Date: Sat, 1 Feb 2014 23:59:38 +0000 Subject: [PATCH] lctr-b2xx: added proper device tree patch. --- .../00-igep0020-manta-makefile.patch | 10 --- ...manta-dts.patch => 00-lctr-a9xx-dts.patch} | 73 +++++++++++-------- 2 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 systems/lctr-a9xx/patches/linux/patches-3.13.1/00-igep0020-manta-makefile.patch rename systems/lctr-a9xx/patches/linux/patches-3.13.1/{01-igep0020-manta-dts.patch => 00-lctr-a9xx-dts.patch} (58%) diff --git a/systems/lctr-a9xx/patches/linux/patches-3.13.1/00-igep0020-manta-makefile.patch b/systems/lctr-a9xx/patches/linux/patches-3.13.1/00-igep0020-manta-makefile.patch deleted file mode 100644 index d376ffc..0000000 --- a/systems/lctr-a9xx/patches/linux/patches-3.13.1/00-igep0020-manta-makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-3.13/arch/arm/boot/dts/Makefile 2014-01-20 02:40:07.000000000 +0000 -+++ linux-3.13.rasm/arch/arm/boot/dts/Makefile 2014-01-31 03:29:41.495659458 +0000 -@@ -185,6 +185,7 @@ - omap3-tobi.dtb \ - omap3-gta04.dtb \ - omap3-igep0020.dtb \ -+ omap3-igep0020-manta.dtb \ - omap3-igep0030.dtb \ - omap3-zoom3.dtb \ - omap4-panda.dtb \ diff --git a/systems/lctr-a9xx/patches/linux/patches-3.13.1/01-igep0020-manta-dts.patch b/systems/lctr-a9xx/patches/linux/patches-3.13.1/00-lctr-a9xx-dts.patch similarity index 58% rename from systems/lctr-a9xx/patches/linux/patches-3.13.1/01-igep0020-manta-dts.patch rename to systems/lctr-a9xx/patches/linux/patches-3.13.1/00-lctr-a9xx-dts.patch index 7d8be5d..d6c9955 100644 --- a/systems/lctr-a9xx/patches/linux/patches-3.13.1/01-igep0020-manta-dts.patch +++ b/systems/lctr-a9xx/patches/linux/patches-3.13.1/00-lctr-a9xx-dts.patch @@ -1,6 +1,18 @@ ---- linux-3.13/arch/arm/boot/dts/omap3-igep0020-manta.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.rasm/arch/arm/boot/dts/omap3-igep0020-manta.dts 2014-01-31 03:30:13.453357542 +0000 -@@ -0,0 +1,113 @@ +diff -Nru linux-3.13.1/arch/arm/boot/dts/Makefile linux-3.13.1.rasm/arch/arm/boot/dts/Makefile +--- linux-3.13.1/arch/arm/boot/dts/Makefile 2014-01-29 13:06:37.000000000 +0000 ++++ linux-3.13.1.rasm/arch/arm/boot/dts/Makefile 2014-02-01 23:49:34.138870922 +0000 +@@ -186,6 +186,7 @@ + omap3-gta04.dtb \ + omap3-igep0020.dtb \ + omap3-igep0030.dtb \ ++ omap3-lctr-a9xx.dtb \ + omap3-zoom3.dtb \ + omap4-panda.dtb \ + omap4-panda-a4.dtb \ +diff -Nru linux-3.13.1/arch/arm/boot/dts/omap3-lctr-a9xx.dts linux-3.13.1.rasm/arch/arm/boot/dts/omap3-lctr-a9xx.dts +--- linux-3.13.1/arch/arm/boot/dts/omap3-lctr-a9xx.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.13.1.rasm/arch/arm/boot/dts/omap3-lctr-a9xx.dts 2014-02-01 23:49:40.019073833 +0000 +@@ -0,0 +1,110 @@ +/* + * Copyright (C) 2014 Universidade do Porto - Faculdade de Engenharia + * @@ -15,7 +27,7 @@ +/ { + model = "Manta A2XX/A3XX"; + compatible = "isee,omap3-igep0020", "ti,omap3"; -+ ++ + leds { + boot { + linux,default-trigger = "heartbeat"; @@ -25,30 +37,30 @@ + gpio_keys { + pinctrl-names = "default"; + pinctrl-0 = <&gpio_keys_pins>; -+ compatible = "gpio-keys"; ++ compatible = "gpio-keys"; + -+ button0 { ++ button@0 { + label = "Button 0"; + gpios = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* gpio_139 */ + linux,code = ; + debounce-interval = <5>; + }; + -+ button1 { ++ button@1 { + label = "Button 1"; + gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>; /* gpio_138 */ + linux,code = ; + debounce-interval = <5>; + }; + -+ button2 { ++ button@2 { + label = "Button 2"; + gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>; /* gpio_137 */ + linux,code = ; -+ debounce-interval = <5>; ++ debounce-interval = <5>; + }; + }; -+ ++ + pps { + compatible = "pps-gpio"; + pinctrl-names = "default"; @@ -59,6 +71,24 @@ +}; + +&omap3_pmx_core { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&board_pins>; ++ ++ board_pins: pinmux_board_pins { ++ pinctrl-single,pins = < ++ /* gpio_133 - panel backlight */ ++ 0x130 (PIN_OUTPUT | MUX_MODE4) ++ /* gpio_135 - panel LED */ ++ 0x132 (PIN_OUTPUT | MUX_MODE4) ++ /* gpio_157 - transducer */ ++ 0x15e (PIN_INPUT_PULLUP | MUX_MODE4) ++ /* uart1_cts / gpio_150 / UART1 RS232. */ ++ 0x150 (PIN_INPUT | MUX_MODE4) ++ /* uart1_rts / gpio_149 / UART1 RS232. */ ++ 0x14e (PIN_INPUT | MUX_MODE4) ++ >; ++ }; ++ + gpio_keys_pins: pinmux_gpio_keys_pins { + pinctrl-single,pins = < + 0x136 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* gpio_137 - button 2 */ @@ -66,31 +96,11 @@ + 0x13a (PIN_INPUT_PULLDOWN | MUX_MODE4) /* gpio_139 - button 0 */ + >; + }; -+ ++ + pps_pins: pinmux_pps_pins { + pinctrl-single,pins = < + 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* gpio_136 */ + >; -+ }; -+ -+ panel_pins: pinmux_panel_pins { -+ pinctrl-single,pins = < -+ 0x130 (PIN_OUTPUT | MUX_MODE4) /* gpio_133 - panel backlight */ -+ 0x132 (PIN_OUTPUT | MUX_MODE4) /* gpio_135 - panel LED */ -+ >; -+ }; -+ -+ txd_pins: pinmux_txd_pins { -+ pinctrl-single,pins = < -+ 0x15e (PIN_INPUT_PULLUP | MUX_MODE4) /* gpio_157 */ -+ >; -+ }; -+ -+ uart1_rs232_pins: pinmux_uart1_rs232_pins { -+ pinctrl-single,pins = < -+ 0x150 (PIN_INPUT | MUX_MODE4) /* uart1_cts.gpio_150 */ -+ 0x14e (PIN_INPUT | MUX_MODE4) /* uart1_rts.gpio_149 */ -+ >; + }; +}; + @@ -113,4 +123,3 @@ +&lbee1usjyc_vmmc { + status = "disabled"; +}; -+