Commit ea4409cc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v3.19/dt-part2-updated' of... 

Merge tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren:

- Add DCAN support am335x, am437x and dra7

- Add devices for sb-t3x computers

- Add support for NovaTech OrionLXm

- Add n900 battery and si4713 support

* tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (26 commits)
  ARM: dts: am335x-evm: Add DCAN1 details
  ARM: dts: am33xx: Update DCAN nodes
  ARM: dts: am33xx: Add control module syscon node
  ARM: dts: am437x-gp: Add dcan support
  ARM: dts: am4372: Add DCAN nodes
  ARM: dts: am4372: Add control module syscon node
  ARM: dts: dra72-evm: Add CAN support
  ARM: dts: dra7-evm: Add CAN support
  ARM: dts: DRA7: Add DCAN nodes
  ARM: dts: dra7: Add syscon regmap for CORE CONTROL area
  ARM: dts: sbc-t3x30: add audio support
  ARM: dts: sbc-t3x: add TV out display alias
  ARM: dts: cm-t3x: add TV out support
  ARM: dts: cm-t3x: add I2C1 pinmux
  ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm
  ARM: dts: cm-t3x30: add keypad support
  ARM: dts: sb-t35: add EEPROM support
  ARM: dts: cm-t3x: add EEPROM support
  ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
  ARM: dts: cm-t3x: add ADS7846 touchscreen support
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bcc8cef7 f80ecaf5

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

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ Boards: 
- AM335X Bone : Low cost community board

  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"



- AM335X OrionLXm : Substation Automation Platform

  compatible = "novatech,am335x-lxm", "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
@@ -342,7 +342,8 @@ dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \ 
	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-nano.dtb \

	am335x-pepper.dtb

	am335x-pepper.dtb \

	am335x-lxm.dtb

dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \

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

+13 −0
Original line number Diff line number Diff line
@@ -307,6 +307,13 @@ 
			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */

		>;

	};



	dcan1_pins_default: dcan1_pins_default {

		pinctrl-single,pins = <

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

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

		>;

	};

};



&uart0 {
@@ -664,3 +671,9 @@ 
&aes {

	status = "okay";

};



&dcan1 {

	status = "disabled";	/* Enable only if Profile 1 is selected */

	pinctrl-names = "default";

	pinctrl-0 = <&dcan1_pins_default>;

};

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

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

 * Copyright (C) 2014 NovaTech LLC - http://www.novatechweb.com

 *

 * 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 "am33xx.dtsi"



/ {

	model = "NovaTech OrionLXm";

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



	cpus {

		cpu@0 {

			cpu0-supply = <&vdd1_reg>;

		};

	};



	memory {

		device_type = "memory";

		reg = <0x80000000 0x20000000>; /* 512 MB */

	};



	/* Power supply provides a fixed 5V @2A */

	vbat: fixedregulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "vbat";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

	};



	/* Power supply provides a fixed 3.3V @3A */

	vmmcsd_fixed: fixedregulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "vmmcsd_fixed";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

	};

};



&am33xx_pinmux {

	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat3 */

			0xf4 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat2 */

			0xf8 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat1 */

			0xfc (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat0 */

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

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

		>;

	};



	i2c0_pins: pinmux_i2c0_pins {

		pinctrl-single,pins = <

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

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

		>;

	};



	cpsw_default: cpsw_default {

		pinctrl-single,pins = <

			/* Slave 1 */

			0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_int */

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

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* rmii1_rxer */

			0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* rmii1_txen */

			0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* rmii1_td1 */

			0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)	/* rmii1_td0 */

			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* rmii1_rd1 */

			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* rmii1_rd0 */

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



			/* Slave 2 */

			0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* rmii2_txen */

			0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* rmii2_td1 */

			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* rmii2_td0 */

			0x68 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* rmii2_rd1 */

			0x6c (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* rmii2_rd0 */

			0x70 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* rmii2_crs_dv */

			0x74 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* rmii2_rxer */

			0x78 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_int */

			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE1)	/* rmii2_refclk */

		>;

	};



	cpsw_sleep: cpsw_sleep {

		pinctrl-single,pins = <

			/* Slave 1 reset value */

			0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_int */

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_crs_dv */

			0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_rxer */

			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_txen */

			0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_td1 */

			0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_td0 */

			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_rd1 */

			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_rd0 */

			0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii1_refclk */



			/* Slave 2 reset value*/

			0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_txen */

			0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_td1 */

			0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_td0 */

			0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_rd1 */

			0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_rd0 */

			0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_crs_dv */

			0x74 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_rxer */

			0x78 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_int */

			0x108 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* rmii2_refclk */

		>;

	};



	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)

		>;

	};



	emmc_pins: pinmux_emmc_pins {

		pinctrl-single,pins = <

			0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */

			0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */

			0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */

			0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */

			0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */

			0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */

			0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */

			0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */

			0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */

			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */

		>;

	};



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

		>;

	};

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;



	status = "okay";

	clock-frequency = <400000>;



	serial_config1: serial_config1@20 {

		compatible = "nxp,pca9539";

		reg = <0x20>;

	};



	serial_config2: serial_config2@21 {

		compatible = "nxp,pca9539";

		reg = <0x21>;

	};



	tps: tps@2d {

		compatible = "ti,tps65910";

		reg = <0x2d>;

	};

};



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



		vio_reg: regulator@1 {

			regulator-name = "vio_1v5,ddr";

			regulator-min-microvolt = <1500000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vdd1_reg: regulator@2 {

			regulator-name = "vdd1,mpu";

			regulator-min-microvolt = <600000>;

			regulator-max-microvolt = <1500000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vdd2_reg: regulator@3 {

			regulator-name = "vdd2_1v1,core";

			regulator-min-microvolt = <1100000>;

			regulator-max-microvolt = <1100000>;

			regulator-boot-on;

			regulator-always-on;

		};



		/* vdd3 - unused */



		/* vdig1 - unused */



		vdig2_reg: regulator@6 {

			regulator-name = "vdig2_1v8,vdds_pll";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

			regulator-always-on;

		};



		/* vpll - unused */



		vdac_reg: regulator@8 {

			regulator-name = "vdac_1v8,vdds";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vaux1_reg: regulator@9 {

			regulator-name = "vaux1_1v8,usb";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vaux2_reg: regulator@10 {

			regulator-name = "vaux2_3v3,io";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vaux33_reg: regulator@11 {

			regulator-name = "vaux33_3v3,usb";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-boot-on;

			regulator-always-on;

		};



		vmmc_reg: regulator@12 {

			regulator-name = "vmmc_3v3,io";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-boot-on;

			regulator-always-on;

		};

	};

};



&sham {

	status = "okay";

};



&aes {

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;



	status = "okay";

};



&usb {

	status = "okay";

};



&usb_ctrl_mod {

	status = "okay";

};



&usb0_phy {

	status = "okay";

};



&usb1_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};



&usb1 {

	status = "okay";

	dr_mode = "host";

};



&cppi41dma  {

	status = "okay";

};



&cpsw_emac0 {

	phy_id = <&davinci_mdio>, <5>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <2>;

};



&cpsw_emac1 {

	phy_id = <&davinci_mdio>, <4>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <3>;

};



&mac {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	dual_emac = <1>;

	status = "okay";

};



&davinci_mdio {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&vmmcsd_fixed>;

	bus-width = <4>;

	status = "okay";

};



&mmc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_pins>;

	vmmc-supply = <&vmmcsd_fixed>;

	bus-width = <8>;

	ti,non-removable;

	status = "okay";

};

arch/arm/boot/dts/am33xx.dtsi

+17 −8
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ 
		};

	};



	am33xx_control_module: control_module@4a002000 {

		compatible = "syscon";

		reg = <0x44e10000 0x7fc>;

	};



	am33xx_pinmux: pinmux@44e10800 {

		compatible = "pinctrl-single";

		reg = <0x44e10800 0x0238>;
@@ -339,20 +344,24 @@ 
			interrupts = <91>;

		};



		dcan0: d_can@481cc000 {

			compatible = "bosch,d_can";

		dcan0: can@481cc000 {

			compatible = "ti,am3352-d_can";

			ti,hwmods = "d_can0";

			reg = <0x481cc000 0x2000

				0x44e10644 0x4>;

			reg = <0x481cc000 0x2000>;

			clocks = <&dcan0_fck>;

			clock-names = "fck";

			syscon-raminit = <&am33xx_control_module 0x644 0>;

			interrupts = <52>;

			status = "disabled";

		};



		dcan1: d_can@481d0000 {

			compatible = "bosch,d_can";

		dcan1: can@481d0000 {

			compatible = "ti,am3352-d_can";

			ti,hwmods = "d_can1";

			reg = <0x481d0000 0x2000

				0x44e10644 0x4>;

			reg = <0x481d0000 0x2000>;

			clocks = <&dcan1_fck>;

			clock-names = "fck";

			syscon-raminit = <&am33xx_control_module 0x644 1>;

			interrupts = <55>;

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE