Commit 076919a6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for_3.11/dts' of... 

Merge branch 'for_3.11/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into next/dt

From Benoit Cousson:

omap devicetree changes for v3.11 merge window

- Add mandatory DT support for missing IPs, like USB host,
  bandgap, LED, NAND, LAN, CPSW, PWM for OMAP and AMXX devices.
- Introduce new AM43x silicon.

* 'for_3.11/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt

: (52 commits)
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ARM: dts: omap3-overo: Add default trigger for TWL4030 LED
  ARM: dts: omap3-tobi: Correct polarity for GPIO LED
  ARM: dts: omap3-tobi: Add SMSC911X node
  ARM: dts: OMAP3: Include IRQ header
  ARM: dts: Protect pinctrl headers against multiple inclusions
  ARM: AM33XX: clock data: Enable clkout2 as part of init
  ARM: AM33XX: clock: Add debugSS clock nodes
  ARM: dts: OMAP5: Add Palmas MFD node and regulator nodes
  ARM: dts: AM33XX: Add PWM backlight DT data to am335x-evmsk
  ARM: dts: AM33XX: Add PWM backlight DT data to am335x-evm
  ARM: dts: AM33XX: Add PWMSS device tree nodes
  ARM: dts: OMAP4460: Add bandgap entry for OMAP4460 devices
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parents 62274f8f 153030c2

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -56,3 +56,6 @@ Boards: 


- OMAP5 EVM : Evaluation Module

  compatible = "ti,omap5-evm", "ti,omap5"



- AM43x EPOS EVM

  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"

arch/arm/boot/dts/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -160,10 +160,14 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap4-panda-es.dtb \

	omap4-var-som.dtb \

	omap4-sdp.dtb \

	omap5-evm.dtb \

	omap4-sdp-es23plus.dtb \

	omap5-uevm.dtb \

	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-bone.dtb

	am335x-bone.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \

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

+107 −11
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */

/dts-v1/;



/include/ "am33xx.dtsi"

#include "am33xx.dtsi"



/ {

	model = "TI AM335x BeagleBone";
@@ -26,24 +26,104 @@ 


	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;

		pinctrl-0 = <&clkout2_pin>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */

				0x58 0x17	/* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */

				0x5c 0x7	/* gpmc_a7.gpio1_23, OUTPUT | MODE7 */

				0x60 0x17	/* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */

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

				0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a6.gpio1_22 */

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

				0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)	/* gpmc_a8.gpio1_24 */

			>;

		};



		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 */

			>;

		};



		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 */

			>;

		};



		clkout2_pin: pinmux_clkout2_pin {

			pinctrl-single,pins = <

				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */

			>;

		};



		cpsw_default: cpsw_default {

			pinctrl-single,pins = <

				/* Slave 1 */

				0x110 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxerr.mii1_rxerr */

				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txen.mii1_txen */

				0x118 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxdv.mii1_rxdv */

				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd3.mii1_txd3 */

				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd2.mii1_txd2 */

				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd1.mii1_txd1 */

				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* mii1_txd0.mii1_txd0 */

				0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_txclk.mii1_txclk */

				0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxclk.mii1_rxclk */

				0x134 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd3.mii1_rxd3 */

				0x138 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd2.mii1_rxd2 */

				0x13c (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd1.mii1_rxd1 */

				0x140 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mii1_rxd0.mii1_rxd0 */

			>;

		};



		cpsw_sleep: cpsw_sleep {

			pinctrl-single,pins = <

				/* Slave 1 reset value */

				0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};



		davinci_mdio_default: davinci_mdio_default {

			pinctrl-single,pins = <

				/* MDIO */

				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

			>;

		};



		davinci_mdio_sleep: davinci_mdio_sleep {

			pinctrl-single,pins = <

				/* MDIO reset value */

				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

		uart0: serial@44e09000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins>;



			status = "okay";

		};



		i2c0: i2c@44e0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;



			status = "okay";

			clock-frequency = <400000>;
@@ -55,31 +135,34 @@ 
	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		compatible = "gpio-leds";



		led@2 {

			label = "beaglebone:green:heartbeat";

			gpios = <&gpio1 21 0>;

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led@3 {

			label = "beaglebone:green:mmc0";

			gpios = <&gpio1 22 0>;

			gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "beaglebone:green:usr2";

			gpios = <&gpio1 23 0>;

			gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};



		led@5 {

			label = "beaglebone:green:usr3";

			gpios = <&gpio1 24 0>;

			gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};
@@ -136,3 +219,16 @@ 
&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

};



&mac {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;



};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

};

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

+246 −18
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 */

/dts-v1/;



/include/ "am33xx.dtsi"

#include "am33xx.dtsi"



/ {

	model = "TI AM335x EVM";
@@ -26,32 +26,143 @@ 


	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;

		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;



		matrix_keypad_s0: matrix_keypad_s0 {

			pinctrl-single,pins = <

				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */

				0x58 0x7	/* gpmc_a6.gpio1_22, OUTPUT | MODE7 */

				0x64 0x27	/* gpmc_a9.gpio1_25, INPUT | MODE7 */

				0x68 0x27	/* gpmc_a10.gpio1_26, INPUT | MODE7 */

				0x6c 0x27	/* gpmc_a11.gpio1_27, INPUT | MODE7 */

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

				0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a6.gpio1_22 */

				0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a9.gpio1_25 */

				0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a10.gpio1_26 */

				0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a11.gpio1_27 */

			>;

		};



		volume_keys_s0: volume_keys_s0 {

			pinctrl-single,pins = <

				0x150 0x27	/* spi0_sclk.gpio0_2, INPUT | MODE7 */

				0x154 0x27	/* spi0_d0.gpio0_3, INPUT | MODE7 */

				0x150 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* spi0_sclk.gpio0_2 */

				0x154 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* spi0_d0.gpio0_3 */

			>;

		};



		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 */

			>;

		};



		i2c1_pins: pinmux_i2c1_pins {

			pinctrl-single,pins = <

				0x158 (PIN_INPUT_PULLUP | MUX_MODE2)	/* spi0_d1.i2c1_sda */

				0x15c (PIN_INPUT_PULLUP | MUX_MODE2)	/* spi0_cs0.i2c1_scl */

			>;

		};



		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 */

			>;

		};



		clkout2_pin: pinmux_clkout2_pin {

			pinctrl-single,pins = <

				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */

			>;

		};



		nandflash_pins_s0: nandflash_pins_s0 {

			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 */

			>;

		};



		ecap0_pins: backlight_pins {

			pinctrl-single,pins = <

				0x164 0x0	/* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out MODE0 */

			>;

		};



		cpsw_default: cpsw_default {

			pinctrl-single,pins = <

				/* Slave 1 */

				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txen.rgmii1_tctl */

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxdv.rgmii1_rctl */

				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd3.rgmii1_td3 */

				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd2.rgmii1_td2 */

				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd1.rgmii1_td1 */

				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd0.rgmii1_td0 */

				0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txclk.rgmii1_tclk */

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxclk.rgmii1_rclk */

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd3.rgmii1_rd3 */

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd2.rgmii1_rd2 */

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd1.rgmii1_rd1 */

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd0.rgmii1_rd0 */

			>;

		};



		cpsw_sleep: cpsw_sleep {

			pinctrl-single,pins = <

				/* Slave 1 reset value */

				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};



		davinci_mdio_default: davinci_mdio_default {

			pinctrl-single,pins = <

				/* MDIO */

				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

			>;

		};



		davinci_mdio_sleep: davinci_mdio_sleep {

			pinctrl-single,pins = <

				/* MDIO reset value */

				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

		uart0: serial@44e09000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins>;



			status = "okay";

		};



		i2c0: i2c@44e0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;



			status = "okay";

			clock-frequency = <400000>;
@@ -61,6 +172,9 @@ 
		};



		i2c1: i2c@4802a000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c1_pins>;



			status = "okay";

			clock-frequency = <100000>;
@@ -102,6 +216,101 @@ 
				reg = <0x48>;

			};

		};



		elm: elm@48080000 {

			status = "okay";

		};



		epwmss0: epwmss@48300000 {

			status = "okay";



			ecap0: ecap@48300100 {

				status = "okay";

				pinctrl-names = "default";

				pinctrl-0 = <&ecap0_pins>;

			};

		};



		gpmc: gpmc@50000000 {

			status = "okay";

			pinctrl-names = "default";

			pinctrl-0 = <&nandflash_pins_s0>;

			ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

			nand@0,0 {

				reg = <0 0 0>; /* CS0, offset 0 */

				nand-bus-width = <8>;

				ti,nand-ecc-opt = "bch8";

				gpmc,device-nand = "true";

				gpmc,device-width = <1>;

				gpmc,sync-clk-ps = <0>;

				gpmc,cs-on-ns = <0>;

				gpmc,cs-rd-off-ns = <44>;

				gpmc,cs-wr-off-ns = <44>;

				gpmc,adv-on-ns = <6>;

				gpmc,adv-rd-off-ns = <34>;

				gpmc,adv-wr-off-ns = <44>;

				gpmc,we-on-ns = <0>;

				gpmc,we-off-ns = <40>;

				gpmc,oe-on-ns = <0>;

				gpmc,oe-off-ns = <54>;

				gpmc,access-ns = <64>;

				gpmc,rd-cycle-ns = <82>;

				gpmc,wr-cycle-ns = <82>;

				gpmc,wait-on-read = "true";

				gpmc,wait-on-write = "true";

				gpmc,bus-turnaround-ns = <0>;

				gpmc,cycle2cycle-delay-ns = <0>;

				gpmc,clk-activation-ns = <0>;

				gpmc,wait-monitoring-ns = <0>;

				gpmc,wr-access-ns = <40>;

				gpmc,wr-data-mux-bus-ns = <0>;



				#address-cells = <1>;

				#size-cells = <1>;

				elm_id = <&elm>;



				/* MTD partition table */

				partition@0 {

					label = "SPL1";

					reg = <0x00000000 0x000020000>;

				};



				partition@1 {

					label = "SPL2";

					reg = <0x00020000 0x00020000>;

				};



				partition@2 {

					label = "SPL3";

					reg = <0x00040000 0x00020000>;

				};



				partition@3 {

					label = "SPL4";

					reg = <0x00060000 0x00020000>;

				};



				partition@4 {

					label = "U-boot";

					reg = <0x00080000 0x001e0000>;

				};



				partition@5 {

					label = "environment";

					reg = <0x00260000 0x00020000>;

				};



				partition@6 {

					label = "Kernel";

					reg = <0x00280000 0x00500000>;

				};



				partition@7 {

					label = "File-System";

					reg = <0x00780000 0x0F880000>;

				};

			};

		};

	};



	vbat: fixedregulator@0 {
@@ -123,12 +332,12 @@ 
		debounce-delay-ms = <5>;

		col-scan-delay-us = <2>;



		row-gpios = <&gpio1 25 0	/* Bank1, pin25 */

			     &gpio1 26 0	/* Bank1, pin26 */

			     &gpio1 27 0>;	/* Bank1, pin27 */

		row-gpios = <&gpio1 25 GPIO_ACTIVE_HIGH		/* Bank1, pin25 */

			     &gpio1 26 GPIO_ACTIVE_HIGH		/* Bank1, pin26 */

			     &gpio1 27 GPIO_ACTIVE_HIGH>;	/* Bank1, pin27 */



		col-gpios = <&gpio1 21 0	/* Bank1, pin21 */

			     &gpio1 22 0>;	/* Bank1, pin22 */

		col-gpios = <&gpio1 21 GPIO_ACTIVE_HIGH		/* Bank1, pin21 */

			     &gpio1 22 GPIO_ACTIVE_HIGH>;	/* Bank1, pin22 */



		linux,keymap = <0x0000008b	/* MENU */

				0x0100009e	/* BACK */
@@ -147,20 +356,27 @@ 
		switch@9 {

			label = "volume-up";

			linux,code = <115>;

			gpios = <&gpio0 2 1>;

			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

		};



		switch@10 {

			label = "volume-down";

			linux,code = <114>;

			gpios = <&gpio0 3 1>;

			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;

			gpio-key,wakeup;

		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&ecap0 0 50000 0>;

		brightness-levels = <0 51 53 56 62 75 101 152 255>;

		default-brightness-level = <8>;

	};

};



/include/ "tps65910.dtsi"

#include "tps65910.dtsi"



&tps {

	vcc1-supply = <&vbat>;
@@ -237,6 +453,18 @@ 
	};

};



&mac {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

};

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

+164 −20
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


/dts-v1/;



/include/ "am33xx.dtsi"

#include "am33xx.dtsi"



/ {

	model = "TI AM335x EVM-SK";
@@ -32,33 +32,145 @@ 


	am33xx_pinmux: pinmux@44e10800 {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>;

		pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;



		user_leds_s0: user_leds_s0 {

			pinctrl-single,pins = <

				0x10 0x7	/* gpmc_ad4.gpio1_4, OUTPUT | MODE7 */

				0x14 0x7	/* gpmc_ad5.gpio1_5, OUTPUT | MODE7 */

				0x18 0x7	/* gpmc_ad6.gpio1_6, OUTPUT | MODE7 */

				0x1c 0x7	/* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */

				0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad4.gpio1_4 */

				0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad5.gpio1_5 */

				0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad6.gpio1_6 */

				0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ad7.gpio1_7 */

			>;

		};



		gpio_keys_s0: gpio_keys_s0 {

			pinctrl-single,pins = <

				0x94 0x27	/* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */

				0x90 0x27	/* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */

				0x70 0x27	/* gpmc_wait0.gpio0_30, INPUT | MODE7 */

				0x9c 0x27	/* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */

				0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_oen_ren.gpio2_3 */

				0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_advn_ale.gpio2_2 */

				0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_wait0.gpio0_30 */

				0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ben0_cle.gpio2_5 */

			>;

		};



		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 */

			>;

		};



		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 */

			>;

		};



		clkout2_pin: pinmux_clkout2_pin {

			pinctrl-single,pins = <

				0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)		/* xdma_event_intr1.clkout2 */

			>;

		};



		ecap2_pins: backlight_pins {

			pinctrl-single,pins = <

				0x19c 0x4	/* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */

			>;

		};



		cpsw_default: cpsw_default {

			pinctrl-single,pins = <

				/* Slave 1 */

				0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txen.rgmii1_tctl */

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxdv.rgmii1_rctl */

				0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd3.rgmii1_td3 */

				0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd2.rgmii1_td2 */

				0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd1.rgmii1_td1 */

				0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd0.rgmii1_td0 */

				0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txclk.rgmii1_tclk */

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxclk.rgmii1_rclk */

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd3.rgmii1_rd3 */

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd2.rgmii1_rd2 */

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd1.rgmii1_rd1 */

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd0.rgmii1_rd0 */



				/* Slave 2 */

				0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a0.rgmii2_tctl */

				0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a1.rgmii2_rctl */

				0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a2.rgmii2_td3 */

				0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a3.rgmii2_td2 */

				0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a4.rgmii2_td1 */

				0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a5.rgmii2_td0 */

				0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a6.rgmii2_tclk */

				0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a7.rgmii2_rclk */

				0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a8.rgmii2_rd3 */

				0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a9.rgmii2_rd2 */

				0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a10.rgmii2_rd1 */

				0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a11.rgmii2_rd0 */

			>;

		};



		cpsw_sleep: cpsw_sleep {

			pinctrl-single,pins = <

				/* Slave 1 reset value */

				0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)



				/* Slave 2 reset value*/

				0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};



		davinci_mdio_default: davinci_mdio_default {

			pinctrl-single,pins = <

				/* MDIO */

				0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)	/* mdio_data.mdio_data */

				0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)			/* mdio_clk.mdio_clk */

			>;

		};



		davinci_mdio_sleep: davinci_mdio_sleep {

			pinctrl-single,pins = <

				/* MDIO reset value */

				0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)

				0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)

			>;

		};

	};



	ocp {

		uart1: serial@44e09000 {

		uart0: serial@44e09000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_pins>;



			status = "okay";

		};



		i2c0: i2c@44e0b000 {

			pinctrl-names = "default";

			pinctrl-0 = <&i2c0_pins>;



			status = "okay";

			clock-frequency = <400000>;
@@ -94,6 +206,16 @@ 
				st,max-limit-z = <750>;

			};

		};



		epwmss2: epwmss@48304000 {

			status = "okay";



			ecap2: ecap@48304100 {

				status = "okay";

				pinctrl-names = "default";

				pinctrl-0 = <&ecap2_pins>;

			};

		};

	};



	vbat: fixedregulator@0 {
@@ -111,30 +233,33 @@ 
	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		compatible = "gpio-leds";



		led@1 {

			label = "evmsk:green:usr0";

			gpios = <&gpio1 4 0>;

			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};



		led@2 {

			label = "evmsk:green:usr1";

			gpios = <&gpio1 5 0>;

			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};



		led@3 {

			label = "evmsk:green:mmc0";

			gpios = <&gpio1 6 0>;

			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "mmc0";

			default-state = "off";

		};



		led@4 {

			label = "evmsk:green:heartbeat";

			gpios = <&gpio1 7 0>;

			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};
@@ -148,31 +273,38 @@ 
		switch@1 {

			label = "button0";

			linux,code = <0x100>;

			gpios = <&gpio2 3 0>;

			gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;

		};



		switch@2 {

			label = "button1";

			linux,code = <0x101>;

			gpios = <&gpio2 2 0>;

			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;

		};



		switch@3 {

			label = "button2";

			linux,code = <0x102>;

			gpios = <&gpio0 30 0>;

			gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;

			gpio-key,wakeup;

		};



		switch@4 {

			label = "button3";

			linux,code = <0x103>;

			gpios = <&gpio2 5 0>;

			gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;

		};

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&ecap2 0 50000 1>;

		brightness-levels = <0 58 61 66 75 90 125 170 255>;

		default-brightness-level = <8>;

	};

};



/include/ "tps65910.dtsi"

#include "tps65910.dtsi"



&tps {

	vcc1-supply = <&vbat>;
@@ -248,3 +380,15 @@ 
		};

	};

};



&mac {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

};



&davinci_mdio {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE