Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d1a327c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.4/dt-pt2' of... 

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

Merge "omap dts changes for v4.4 merge window, part 2" from Tony Lindgren:

Few more omap dts changes for v4.4 merge window, mostly to fix and clean
up some omap5 issues to allow adding other omap5 boards. Also some other
fixes and clean-up:

- Fix SDIO WLAN for omap5 that's been broken for a while. As further
  patches are still needed for wl18xx, no need for stable on this one.

- Move most of omap5 support into omap5-board-common.dtsi as most omap5
  boards seem to share the same basic set of devices.

- Add minimal IGEPv5 support using based on omap5-board-common.dtsi

- Remove now unneedes gpio hogging for dra72-evm

- Update Javier Martinez Canillas email address

- Change earlier IGEP boards to use IOPAD pinmux macros

* tag 'omap-for-v4.4/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-base0033: Use IOPAD pinmux macro
  ARM: dts: am335x-igep0033: Use IOPAD pinmux macro
  ARM: dts: omap3-igep0020: Use IOPAD pinmux macro
  ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_ts
  ARM: dts: Update Javier Martinez Canillas's email
  ARM: dts: dra72-evm: remove cpsw gpio hogging and add mode-gpios
  ARM: dts: Add basic support for isee igepv5
  ARM: dts: Move most of omap5-uevm.dts to omap5-board-common.dtsi
  ARM: dts: Fix WLAN regression on omap5-uevm
parents 13e77e6b e9a26770

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ dtb-$(CONFIG_SOC_AM43XX) += \ 
	am437x-gp-evm.dtb

dtb-$(CONFIG_SOC_OMAP5) += \

	omap5-cm-t54.dtb \

	omap5-igep0050.dtb \

	omap5-sbc-t54.dtb \

	omap5-uevm.dtb

dtb-$(CONFIG_SOC_DRA7XX) += \

arch/arm/boot/dts/am335x-base0033.dts

+24 −24
Original line number Diff line number Diff line
@@ -46,39 +46,39 @@ 
&am33xx_pinmux {

	nxp_hdmi_pins: pinmux_nxp_hdmi_pins {

		pinctrl-single,pins = <

			0x1b0 (PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

			0xa0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data0 */

			0xa4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data1 */

			0xa8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data2 */

			0xac (PIN_OUTPUT | MUX_MODE0)	/* lcd_data3 */

			0xb0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data4 */

			0xb4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data5 */

			0xb8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data6 */

			0xbc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data7 */

			0xc0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data8 */

			0xc4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data9 */

			0xc8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data10 */

			0xcc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data11 */

			0xd0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data12 */

			0xd4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data13 */

			0xd8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_data14 */

			0xdc (PIN_OUTPUT | MUX_MODE0)	/* lcd_data15 */

			0xe0 (PIN_OUTPUT | MUX_MODE0)	/* lcd_vsync */

			0xe4 (PIN_OUTPUT | MUX_MODE0)	/* lcd_hsync */

			0xe8 (PIN_OUTPUT | MUX_MODE0)	/* lcd_pclk */

			0xec (PIN_OUTPUT | MUX_MODE0)	/* lcd_ac_bias_en */

			AM33XX_IOPAD(0x9b0, PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

			AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0)	/* lcd_data0 */

			AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0)	/* lcd_data1 */

			AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0)	/* lcd_data2 */

			AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0)	/* lcd_data3 */

			AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0)	/* lcd_data4 */

			AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0)	/* lcd_data5 */

			AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0)	/* lcd_data6 */

			AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0)	/* lcd_data7 */

			AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0)	/* lcd_data8 */

			AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0)	/* lcd_data9 */

			AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0)	/* lcd_data10 */

			AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0)	/* lcd_data11 */

			AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0)	/* lcd_data12 */

			AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0)	/* lcd_data13 */

			AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0)	/* lcd_data14 */

			AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0)	/* lcd_data15 */

			AM33XX_IOPAD(0x8e0, PIN_OUTPUT | MUX_MODE0)	/* lcd_vsync */

			AM33XX_IOPAD(0x8e4, PIN_OUTPUT | MUX_MODE0)	/* lcd_hsync */

			AM33XX_IOPAD(0x8e8, PIN_OUTPUT | MUX_MODE0)	/* lcd_pclk */

			AM33XX_IOPAD(0x8ec, PIN_OUTPUT | MUX_MODE0)	/* lcd_ac_bias_en */

		>;

	};

	nxp_hdmi_off_pins: pinmux_nxp_hdmi_off_pins {

		pinctrl-single,pins = <

			0x1b0 (PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

			AM33XX_IOPAD(0x9b0, PIN_OUTPUT | MUX_MODE3)	/* xdma_event_intr0.clkout1 */

		>;

	};



	leds_base_pins: pinmux_leds_base_pins {

		pinctrl-single,pins = <

			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */

			0x88 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_csn3.gpio2_0 */

			AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.gpio1_21 */

			AM33XX_IOPAD(0x888, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_csn3.gpio2_0 */

		>;

	};

};

arch/arm/boot/dts/am335x-igep0033.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -56,41 +56,41 @@ 
&am33xx_pinmux {

	i2c0_pins: pinmux_i2c0_pins {

		pinctrl-single,pins = <

			0x188 (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */

			0x18c (PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */

			AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_sda.i2c0_sda */

			AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c0_scl.i2c0_scl */

		>;

	};



	nandflash_pins: pinmux_nandflash_pins {

		pinctrl-single,pins = <

			0x0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */

			0x4 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */

			0x8 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */

			0xc (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad3.gpmc_ad3 */

			0x10 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad4.gpmc_ad4 */

			0x14 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad5.gpmc_ad5 */

			0x18 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad6.gpmc_ad6 */

			0x1c (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad7.gpmc_ad7 */

			0x70 (PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_wait0.gpmc_wait0 */

			0x74 (PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_wpn.gpio0_30 */

			0x7c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_csn0.gpmc_csn0 */

			0x90 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_advn_ale.gpmc_advn_ale */

			0x94 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_oen_ren.gpmc_oen_ren */

			0x98 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_wen.gpmc_wen */

			0x9c (PIN_OUTPUT | MUX_MODE0)		/* gpmc_be0n_cle.gpmc_be0n_cle */

			AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad0.gpmc_ad0 */

			AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad1.gpmc_ad1 */

			AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad2.gpmc_ad2 */

			AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad3.gpmc_ad3 */

			AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad4.gpmc_ad4 */

			AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad5.gpmc_ad5 */

			AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad6.gpmc_ad6 */

			AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_ad7.gpmc_ad7 */

			AM33XX_IOPAD(0x870, PIN_INPUT_PULLUP | MUX_MODE0)	/* gpmc_wait0.gpmc_wait0 */

			AM33XX_IOPAD(0x874, PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_wpn.gpio0_30 */

			AM33XX_IOPAD(0x87c, PIN_OUTPUT | MUX_MODE0)		/* gpmc_csn0.gpmc_csn0 */

			AM33XX_IOPAD(0x890, PIN_OUTPUT | MUX_MODE0)		/* gpmc_advn_ale.gpmc_advn_ale */

			AM33XX_IOPAD(0x894, PIN_OUTPUT | MUX_MODE0)		/* gpmc_oen_ren.gpmc_oen_ren */

			AM33XX_IOPAD(0x898, PIN_OUTPUT | MUX_MODE0)		/* gpmc_wen.gpmc_wen */

			AM33XX_IOPAD(0x89c, PIN_OUTPUT | MUX_MODE0)		/* gpmc_be0n_cle.gpmc_be0n_cle */

		>;

	};



	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

		>;

	};



	leds_pins: pinmux_leds_pins {

		pinctrl-single,pins = <

			0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */

			AM33XX_IOPAD(0x85c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.gpio1_23 */

		>;

	};

};

arch/arm/boot/dts/am437x-gp-evm.dts

+9 −0
Original line number Diff line number Diff line
@@ -595,8 +595,17 @@ 


		attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;



		/*

		 * 0x264 represents the offset of padconf register of

		 * gpio3_22 from am43xx_pinmux base.

		 */

		interrupts-extended = <&gpio3 22 IRQ_TYPE_NONE>,

				      <&am43xx_pinmux 0x264>;

		interrupt-names = "tsc", "wakeup";



		touchscreen-size-x = <1024>;

		touchscreen-size-y = <600>;

		wakeup-source;

	};



	ov2659@30 {

arch/arm/boot/dts/dra72-evm.dts

+1 −6
Original line number Diff line number Diff line
@@ -429,12 +429,6 @@ 
		interrupts = <11 IRQ_TYPE_EDGE_FALLING>;

		interrupt-controller;

		#interrupt-cells = <2>;



		cpsw_sel_s0 {

			gpio-hog;

			gpios = <4 GPIO_ACTIVE_HIGH>;

			output-low;

		};

	};



	tlv320aic3106: tlv320aic3106@19 {
@@ -689,6 +683,7 @@ 
	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	slaves = <1>;

	mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_HIGH>;

};



&cpsw_emac0 {