From 0574cb14398c312f4eaea8d518c63ce62f20ecbc Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 15 Sep 2016 14:10:59 -0500 Subject: ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2 Commit d20f997b4d1f ("ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869") fat fingered a change in which basically replaced mmc2_pinctrl_default with mmc1_pinctrl_default. And kernel dutifully reports conflict of usage. [...] pinctrl-single 4a003400.pinmux: pin 4a00376c.0 already requested by 4809c000.mmc; cannot claim for 480b4000.mmc pinctrl-single 4a003400.pinmux: pin-219 (480b4000.mmc) status -22 pinctrl-single 4a003400.pinmux: could not request pin 219 (4a00376c.0) from group mmc1_pins_default on device pinctrl-single omap_hsmmc 480b4000.mmc: Error applying setting, reverse things back omap_hsmmc 480b4000.mmc: could not initialize pin control state [...] But, thanks to the fact that we were in fact setting all the muxes in U-Boot, all the MMC devices were still properly detected. Fix the typo. Fixes: d20f997b4d1f ("ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869") Reported-by: Tony Lindgren Signed-off-by: Nishanth Menon [tony@atomide.com: removed timestamps and wrapped description] Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi index ec85ff9004e8..6df7829a2c15 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -451,7 +451,7 @@ status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins_default>; + pinctrl-0 = <&mmc2_pins_default>; vmmc-supply = <&vdd_3v3>; bus-width = <8>; -- cgit From f91f0f246632d2a8ee63dbbffaa5163fb5432c74 Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Fri, 16 Sep 2016 14:50:11 +0300 Subject: ARM: dts: am335x-evm: Add blue-and-red-wiring -property to lcdc node Add blue-and-red-wiring -property to lcdc node. The am335x-evm has blue and red wires crossed to get 24-bit RGB (and 16-bit BGR) support. After this patch am335x-evm supports BGR565, RGB888, and XRGB8888 color formats. See details in Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Signed-off-by: Jyri Sarha Reviewed-by: Tomi Valkeinen Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-evm.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index 3cf896a2a204..e82432c79f85 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -497,6 +497,8 @@ &lcdc { status = "okay"; + + blue-and-red-wiring = "crossed"; }; &elm { -- cgit From 5dffb684e090aa83ff054647ab4ba89a81986690 Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Fri, 16 Sep 2016 14:50:12 +0300 Subject: ARM: dts: am335x-evmsk: Whitespace cleanup of lcdc related nodes Whitespace cleanup of lcdc related nodes. Do all indentation and alignment with tabs instead of spaces. Signed-off-by: Jyri Sarha Reviewed-by: Tomi Valkeinen Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-evmsk.dts | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 0e5e8dcdcc24..ef56b07068b3 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -170,29 +170,29 @@ pinctrl-1 = <&lcd_pins_sleep>; status = "okay"; panel-info { - ac-bias = <255>; - ac-bias-intrpt = <0>; - dma-burst-sz = <16>; - bpp = <32>; - fdd = <0x80>; - sync-edge = <0>; - sync-ctrl = <1>; - raster-order = <0>; - fifo-th = <0>; + ac-bias = <255>; + ac-bias-intrpt = <0>; + dma-burst-sz = <16>; + bpp = <32>; + fdd = <0x80>; + sync-edge = <0>; + sync-ctrl = <1>; + raster-order = <0>; + fifo-th = <0>; }; display-timings { 480x272 { - hactive = <480>; - vactive = <272>; - hback-porch = <43>; - hfront-porch = <8>; - hsync-len = <4>; - vback-porch = <12>; - vfront-porch = <4>; - vsync-len = <10>; + hactive = <480>; + vactive = <272>; + hback-porch = <43>; + hfront-porch = <8>; + hsync-len = <4>; + vback-porch = <12>; + vfront-porch = <4>; + vsync-len = <10>; clock-frequency = <9000000>; - hsync-active = <0>; - vsync-active = <0>; + hsync-active = <0>; + vsync-active = <0>; }; }; }; @@ -711,5 +711,5 @@ }; &lcdc { - status = "okay"; + status = "okay"; }; -- cgit From 3dc4674a603093ddcd013a54f759d75aa15de032 Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Fri, 16 Sep 2016 14:50:13 +0300 Subject: ARM: dts: am335x-evmsk: Add blue-and-red-wiring -property to lcdc node Add blue-and-red-wiring -property to lcdc node. The am335x-evmsk has blue and red wires crossed to get 24-bit RGB (and 16-bit BGR) support. After this patch am335x-evmsk supports BGR565, RGB888, and XRGB8888 color formats. See details in Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt. Signed-off-by: Jyri Sarha Reviewed-by: Tomi Valkeinen Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/am335x-evmsk.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index ef56b07068b3..975c36e332a2 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -712,4 +712,6 @@ &lcdc { status = "okay"; + + blue-and-red-wiring = "crossed"; }; -- cgit From d6c91b99baeece562ca1aaf26396d32655197477 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 20 Sep 2016 11:37:35 -0700 Subject: ARM: dts: Fix igepv5 power button GPIO direction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be GPIO_ACTIVE_LOW instead of GPIO_ACTIVE_HIGH as pointed out by Pau Pajuel . Cc: Agustí Fontquerni i Gorchs Cc: Enric Balletbo Serra Cc: Javier Martinez Canillas Cc: Pau Pajuel Fixes: b118c6a6ffa1 ("ARM: dts: Add power button support for igepv5") Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap5-igep0050.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts index 44e03b9be1f1..1810ae75d73c 100644 --- a/arch/arm/boot/dts/omap5-igep0050.dts +++ b/arch/arm/boot/dts/omap5-igep0050.dts @@ -27,7 +27,7 @@ power-button { label = "Power Button"; linux,code = ; - gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>; + gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; }; }; -- cgit From ce385a5e7a85c023af2e013101d4fe2240beec21 Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Tue, 20 Sep 2016 14:09:03 +0200 Subject: ARM: dts: omap5-igep0050.dts: Use tabs for indentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And here's another nitpick ;-) Cc: Agustí Fontquerni i Gorchs Cc: Enric Balletbo Serra Cc: Javier Martinez Canillas Cc: Pau Pajuel Fixes: b118c6a6ffa1 ("ARM: dts: Add power button support for igepv5") Signed-off-by: Ladislav Michl --- arch/arm/boot/dts/omap5-igep0050.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap5-igep0050.dts b/arch/arm/boot/dts/omap5-igep0050.dts index 1810ae75d73c..8fc19218057e 100644 --- a/arch/arm/boot/dts/omap5-igep0050.dts +++ b/arch/arm/boot/dts/omap5-igep0050.dts @@ -20,7 +20,7 @@ }; gpio_keys { - compatible = "gpio-keys"; + compatible = "gpio-keys"; pinctrl-0 = <&power_button_pin>; pinctrl-names = "default"; -- cgit