Commit 9e3cffd8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Merge "omap dts changes for v4.3, part2" from Tony Lindgren:

More omap dts changes for v4.3 merge window:

- Add missing devices for pandora. Note that we're adding wl1251
  WLAN and LCD backlight support for now using legacy pdata as that
  allows us to drop the legacy board file for pandora in another
  series of patches

- Enable power button support for omap5-uevm

- Add aliases for am437x UARTs

- Add support for phyCORE phyBOARD-WEGA-AM335x rdk and
  phyCORE-AM335x SoM

- Use u16 values for tsc2046 on omap3-lilly

* tag 'omap-for-v4.3/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: omap3-pandora: add wifi support
  ARM: OMAP2+: omap3-pandora: add backlight support
  ARM: dts: omap3-pandora: add support for usb host and 32k buffer
  ARM: dts: omap3-pandora: miscellaneous corrections
  ARM: dts: omap5-uevm: Add Palmas power button support
  ARM: dts: am437x: add aliases for all UART instances
  ARM: dts: Add phyBOARD-WEGA-AM335x rdk
  ARM: dts: Add support for phyCORE-AM335x SoM
  ARM: dts: omap3: correct the format of u16 values for tsc2046 node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7d132de8 f9d50fef

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

+3 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ Boards: 
- AM335X OrionLXm : Substation Automation Platform

  compatible = "novatech,am335x-lxm", "ti,am33xx"



- AM335X phyBOARD-WEGA: Single Board Computer dev kit

  compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx"



- OMAP5 EVM : Evaluation Module

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

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -445,7 +445,8 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-nano.dtb \

	am335x-pepper.dtb \

	am335x-lxm.dtb \

	am335x-chiliboard.dtb

	am335x-chiliboard.dtb \

	am335x-wega-rdk.dtb

dtb-$(CONFIG_ARCH_OMAP4) += \

	omap4-duovero-parlor.dtb \

	omap4-panda.dtb \

arch/arm/boot/dts/am335x-phycore-som.dtsi

0 → 100644
+368 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 Phytec Messtechnik GmbH

 * Author: Teresa Remmet <t.remmet@phytec.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include "am33xx.dtsi"



/ {

	model = "Phytec AM335x phyCORE";

	compatible = "phytec,am335x-phycore-som", "ti,am33xx";



	aliases {

		rtc0 = &i2c_rtc;

		rtc1 = &rtc;

	};



	cpus {

		cpu@0 {

			cpu0-supply = <&vdd1_reg>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>; /* 256 MB */

	};



	vbat: fixedregulator@0 {

		compatible = "regulator-fixed";

	};

};



/* Crypto Module */

&aes {

	status = "okay";

};



&sham {

	status = "okay";

};



/* Ethernet */

&am33xx_pinmux {

	ethernet0_pins: pinmux_ethernet0 {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_crs.rmii1_crs_dv */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxerr.rmii1_rxerr */

			0x114 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txen.rmii1_txen */

			0x124 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txd1.rmii1_txd1 */

			0x128 (PIN_OUTPUT | MUX_MODE1)		/* mii1_txd0.rmii1_txd0 */

			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxd1.rmii1_rxd1 */

			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* mii1_rxd0.rmii1_rxd0 */

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE0)	/* rmii1_refclk.rmii1_refclk */

		>;

	};



	mdio_pins: pinmux_mdio {

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

		>;

	};

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

};



&davinci_mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&mdio_pins>;

	status = "okay";

};



&mac {

	slaves = <1>;

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins>;

	status = "okay";

};



&phy_sel {

	rmii-clock-ext;

};



/* I2C Busses */

&am33xx_pinmux {

	i2c0_pins: pinmux_i2c0 {

		pinctrl-single,pins = <

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

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

		>;

	};

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;

	clock-frequency = <400000>;

	status = "okay";



	tps: pmic@2d {

		reg = <0x2d>;

	};



	i2c_eeprom: eeprom@52 {

		compatible = "atmel,24c32";

		pagesize = <32>;

		reg = <0x52>;

		status = "disabled";

	};



	i2c_rtc: rtc@68 {

		compatible = "rv4162";

		reg = <0x68>;

		status = "disabled";

	};

};



/* NAND memory */

&am33xx_pinmux {

		nandflash_pins: pinmux_nandflash {

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

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

		>;

	};

};



&elm {

	status = "okay";

};



&gpmc {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&nandflash_pins>;

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

	nandflash: nand@0,0 {

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		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 = <30>;

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

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

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

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

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

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

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

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

		gpmc,access-ns = <30>;

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

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

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

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

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

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

		gpmc,cycle2cycle-diffcsen;

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

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

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

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



		elm_id = <&elm>;



		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "xload";

			reg = <0x0 0x20000>;

		};

		partition@1 {

			label = "xload_backup1";

			reg = <0x20000 0x20000>;

		};

		partition@2 {

			label = "xload_backup2";

			reg = <0x40000 0x20000>;

		};

		partition@3 {

			label = "xload_backup3";

			reg = <0x60000 0x20000>;

		};

		partition@4 {

			label = "barebox";

			reg = <0x80000 0x80000>;

		};

		partition@5 {

			label = "bareboxenv";

			reg = <0x100000 0x40000>;

		};

		partition@6 {

			label = "oftree";

			reg = <0x140000 0x40000>;

		};

		partition@7 {

			label = "kernel";

			reg = <0x180000 0x800000>;

		};

		partition@8 {

			label = "root";

			reg = <0x980000 0x0>;

		};

	};

};



/* Power */

#include "tps65910.dtsi"



&tps {

	vcc1-supply = <&vbat>;

	vcc2-supply = <&vbat>;

	vcc3-supply = <&vbat>;

	vcc4-supply = <&vbat>;

	vcc5-supply = <&vbat>;

	vcc6-supply = <&vbat>;

	vcc7-supply = <&vbat>;

	vccio-supply = <&vbat>;



	regulators {

		vrtc_reg: regulator@0 {

			regulator-always-on;

		};



		vio_reg: regulator@1 {

			regulator-always-on;

		};



		vdd1_reg: regulator@2 {

			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */

			regulator-name = "vdd_mpu";

			regulator-min-microvolt = <912500>;

			regulator-max-microvolt = <1312500>;

			regulator-boot-on;

			regulator-always-on;

		};



		vdd2_reg: regulator@3 {

			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */

			regulator-name = "vdd_core";

			regulator-min-microvolt = <912500>;

			regulator-max-microvolt = <1150000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vdd3_reg: regulator@4 {

			regulator-always-on;

		};



		vdig1_reg: regulator@5 {

			regulator-name = "vdig1_1p8v";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		vdig2_reg: regulator@6 {

			regulator-always-on;

		};



		vpll_reg: regulator@7 {

			regulator-always-on;

		};



		vdac_reg: regulator@8 {

			regulator-always-on;

		};



		vaux1_reg: regulator@9 {

			regulator-always-on;

		};



		vaux2_reg: regulator@10 {

			regulator-always-on;

		};



		vaux33_reg: regulator@11 {

			regulator-always-on;

		};



		vmmc_reg: regulator@12 {

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};

};



&vbat {

	regulator-name = "vbat";

	regulator-min-microvolt = <5000000>;

	regulator-max-microvolt = <5000000>;

	regulator-boot-on;

};



/* SPI Busses */

&am33xx_pinmux {

	spi0_pins: pinmux_spi0 {

		pinctrl-single,pins = <

			0x150 (PIN_INPUT_PULLDOWN | MUX_MODE0)	/* spi0_clk.spi0_clk */

			0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0)	/* spi0_d0.spi0_d0 */

			0x158 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */

			0x15c (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */

		>;

	};

};



&spi0 {

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;

	status = "okay";



	serial_flash: m25p80@0 {

		compatible = "m25p80";

		spi-max-frequency = <48000000>;

		reg = <0x0>;

		m25p,fast-read;

		status = "disabled";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "xload";

			reg = <0x0 0x20000>;

		};

		partition@1 {

			label = "barebox";

			reg = <0x20000 0x80000>;

		};

		partition@2 {

			label = "bareboxenv";

			reg = <0xa0000 0x20000>;

		};

		partition@3 {

			label = "oftree";

			reg = <0xc0000 0x20000>;

		};

		partition@4 {

			label = "kernel";

			reg = <0xe0000 0x0>;

		};

	};

};

arch/arm/boot/dts/am335x-wega-rdk.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 Phytec Messtechnik GmbH

 * Author: Teresa Remmet <t.remmet@phytec.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/dts-v1/;



#include "am335x-phycore-som.dtsi"

#include "am335x-wega.dtsi"



/* SoM */

&i2c_eeprom {

	status = "okay";

};



&i2c_rtc {

	status = "okay";

};

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

0 → 100644
+151 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 Phytec Messtechnik GmbH

 * Author: Teresa Remmet <t.remmet@phytec.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/ {

	model = "Phytec AM335x phyBOARD-WEGA";

	compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";



};



/* CAN Busses */

&am33xx_pinmux {

	dcan1_pins: pinmux_dcan1 {

		pinctrl-single,pins = <

			0x168 (PIN_OUTPUT_PULLUP | MUX_MODE2) /* uart0_ctsn.d_can1_tx */

			0x16c (PIN_INPUT_PULLUP | MUX_MODE2) /* uart0_rtsn.d_can1_rx */

		>;

	};

};



&dcan1 {

	pinctrl-names = "default";

	pinctrl-0 = <&dcan1_pins>;

	status = "okay";

};



/* Ethernet */

&am33xx_pinmux {

	ethernet1_pins: pinmux_ethernet1 {

		pinctrl-single,pins = <

			0x40 (PIN_OUTPUT | MUX_MODE1)		/* gpmc_a0.mii2_txen */

			0x44 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a1.mii2_rxdv */

			0x48 (PIN_OUTPUT | MUX_MODE1)		/* gpmc_a2.mii2_txd3 */

			0x4c (PIN_OUTPUT | MUX_MODE1)		/* gpmc_a3.mii2_txd2 */

			0x50 (PIN_OUTPUT | MUX_MODE1)		/* gpmc_a4.mii2_txd1 */

			0x54 (PIN_OUTPUT | MUX_MODE1)		/* gpmc_a5.mii2_txd0 */

			0x58 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a6.mii2_txclk */

			0x5c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a7.mii2_rxclk */

			0x60 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a8.mii2_rxd3 */

			0x64 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a9.mii2_rxd2 */

			0x68 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a10.mii2_rxd1 */

			0x6c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_a11.mii2_rxd0 */

			0x74 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_wpn.mii2_rxerr */

			0x78 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* gpmc_ben1.mii2_col */

		>;

	};

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <1>;

	phy-mode = "mii";

	dual_emac_res_vlan = <2>;

};



&mac {

	slaves = <2>;

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;

	dual_emac = <1>;

};



/* MMC */

&am33xx_pinmux {

	mmc1_pins: pinmux_mmc1 {

		pinctrl-single,pins = <

			0x0F0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat3.mmc0_dat3 */

			0x0F4 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat2.mmc0_dat2 */

			0x0F8 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat1.mmc0_dat1 */

			0x0FC (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat0.mmc0_dat0 */

			0x100 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_clk.mmc0_clk */

			0x104 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_cmd.mmc0_cmd */

			0x160 (PIN_INPUT_PULLUP | MUX_MODE7)	/* spi0_cs1.mmc0_sdcd */

		>;

	};

};



&mmc1 {

	vmmc-supply = <&vmmc_reg>;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



/* UARTs */

&am33xx_pinmux {

	uart0_pins: pinmux_uart0 {

		pinctrl-single,pins = <

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

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

		>;

	};



	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */

			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */

			0x178 (PIN_INPUT | MUX_MODE0)		/* uart1_ctsn.uart1_ctsn */

			0x17c (PIN_OUTPUT_PULLDOWN | MUX_MODE0)		/* uart1_rtsn.uart1_rtsn */

		>;

	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;

	status = "okay";

};



/* USB */

&cppi41dma {

	status = "okay";

};



&usb_ctrl_mod {

	status = "okay";

};



&usb {

	status = "okay";

};



&usb0 {

	dr_mode = "peripheral";

	status = "okay";

};



&usb0_phy {

	status = "okay";

};



&usb1 {

	dr_mode = "host";

	status = "okay";

};



&usb1_phy {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE