[PATCH 5/6] ARM: dts: am57xx: cl-som-am57x: fix CPSW EMAC pinmux
Fix CPSW EMAC pinmux Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index cb9a518..9e0153a 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -167,7 +167,7 @@ DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d20.rgmii1_rd3 */ DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d21.rgmii1_rd2 */ DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d22.rgmii1_rd1 */ - DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLUP | MUX_MODE3) /* vin2a_d23.rgmii1_rd0 */ + DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d23.rgmii1_rd0 */ >; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/6] ARM: dts: am57xx: cl-som-am57x: set of non critical DT fixes
This pacth set apply a set of non critical DT fixes for CompuLab CL-SOM-AM57x SoM * Improve Eth functionality * Pinmux fix for several devices * Improve SPI flash access * Set USB2 in HOST mode to enable connection of keyboard/mouse on eval board Dmitry Lifshitz (6): ARM: dts: am57xx: sbc-am57x: fix SB-SOM EEPROM I2C address ARM: dts: am57xx: cl-som-am57x: set HOST mode for USB2 ARM: dts: am57xx: cl-som-am57x: update SPI Flash frequency ARM: dts: am57xx: sbc-am57x: fix UART3 pinmux ARM: dts: am57xx: cl-som-am57x: fix CPSW EMAC pinmux ARM: dts: am57xx: sbc-am57x: correct Eth PHY settings arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 12 ++-- arch/arm/boot/dts/am57xx-sbc-am57x.dts| 8 2 files changed, 10 insertions(+), 10 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/6] ARM: dts: am57xx: cl-som-am57x: set HOST mode for USB2
Setup USB2 to act in "HOST" mode by default. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index c538826..513ec62 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -588,7 +588,7 @@ }; { - dr_mode = "peripheral"; + dr_mode = "host"; }; { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] ARM: dts: am57xx: sbc-am57x: fix UART3 pinmux
Fix UART3 pinmux. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 0f1d425..988e996 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -25,8 +25,8 @@ _pmx_core { uart3_pins_default: uart3_pins_default { pinctrl-single,pins = < - DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */ - DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ + DRA7XX_CORE_IOPAD(0x3648, PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd */ + DRA7XX_CORE_IOPAD(0x364c, PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd */ >; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] ARM: dts: am57xx: sbc-am57x: correct Eth PHY settings
Update Eth PHY settings to make it possible to run both phys at 1Gbps. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 9e0153a..8d93882 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -559,13 +559,13 @@ _emac0 { phy_id = <_mdio>, <0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-txid"; dual_emac_res_vlan = <0>; }; _emac1 { phy_id = <_mdio>, <1>; - phy-mode = "rgmii"; + phy-mode = "rgmii-txid"; dual_emac_res_vlan = <1>; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] ARM: dts: am57xx: sbc-am57x: fix SB-SOM EEPROM I2C address
Fix SB-SOM EEPROM I2C address Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 77bb8e1..0f1d425 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -108,9 +108,9 @@ pinctrl-0 = <_pins_default>; clock-frequency = <40>; - eeprom_base: atmel@50 { + eeprom_base: atmel@54 { compatible = "atmel,24c08"; - reg = <0x50>; + reg = <0x54>; pagesize = <16>; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/6] ARM: dts: am57xx: cl-som-am57x: update SPI Flash frequency
On-board SPI flash cat act at 48Mhz SPI bus frequency. Update the DT frequency property. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 513ec62..cb9a518 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -492,14 +492,14 @@ pinctrl-names = "default"; pinctrl-0 = <_pins>; - spi-max-frequency = <2000>; + spi-max-frequency = <4800>; spi_flash: spi_flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "spansion,m25p80", "jedec,spi-nor"; reg = <0>; /* CS0 */ - spi-max-frequency = <2000>; + spi-max-frequency = <4800>; partition@0 { label = "uboot"; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V3 01/19] ARM: dts: am57xx: cl-som-am57x: add basic module support
Add support for CompuLab CM-SOM-AM57X board. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ Add basic DT support for standalone module (without a carrier board): * Memory configuration * Heartbeat led * I2C1 and I2C4 * PMIC * SATA Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v3: * Move PMIC to I2C4 * Reformat subject v2: * Fixed voltages (for OPP_HIGH) for VDD_GPU, VDD_IVA, VDD_DSPEVE * Added comments for VDDA_1V8_PHYA/B * Add "regulator-always-on" property for ldousb_reg .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 274 + 3 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index da84372..dd53c90 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -156,6 +156,9 @@ Boards: - AM437x SK EVM: AM437x StarterKit Evaluation Module compatible = "ti,am437x-sk-evm", "ti,am4372", "ti,am43" +- AM57XX CL-SOM-AM57x + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" + - DRA742 EVM: Software Development Board for DRA742 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5492a24..803a020 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -477,8 +477,9 @@ dtb-$(CONFIG_SOC_OMAP5) += \ omap5-sbc-t54.dtb \ omap5-uevm.dtb dtb-$(CONFIG_SOC_DRA7XX) += \ - dra7-evm.dtb \ am57xx-beagle-x15.dtb \ + am57xx-cl-som-am57x.dtb \ + dra7-evm.dtb \ dra72-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-lacie-d2-network.dtb \ diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts new file mode 100644 index 000..087d62e --- /dev/null +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -0,0 +1,274 @@ +/* + * Support for CompuLab CL-SOM-AM57x System-on-Module + * + * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * Author: Dmitry Lifshitz <lifsh...@compulab.co.il> + * + * 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 +#include +#include "dra74x.dtsi" + +/ { + model = "CompuLab CL-SOM-AM57x"; + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + memory { + device_type = "memory"; + reg = <0x8000 0x2000>; /* 512 MB - minimal configuration */ + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + led@0 { + label = "cl-som-am57x:green"; + gpios = < 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; +}; + +_pmx_core { + leds_pins_default: leds_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14) /* gpmc_a15.gpio2_5 */ + >; + }; + + i2c1_pins_default: i2c1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda.sda */ + DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl.scl */ + >; + }; + + i2c4_pins_default: i2c4_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36ac, PIN_INPUT| MUX_MODE10) /* mcasp1_acl.i2c4_sda */ + DRA7XX_CORE_IOPAD(0x36b0, PIN_INPUT| MUX_MODE10) /* mcasp1_fsr.i2c4_scl */ + >; + }; + + tps659038_pins_default: tps659038_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeu
[PATCH V3 15/19] ARM: dts: am57xx: sbc-am57x: add GPIO expander support
Add PCA9555 GPIO expander support (over I2C5 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v3: * No fuctional changes * Reformat subject v2: * Fixed patch subject/description arch/arm/boot/dts/am57xx-sbc-am57x.dts | 7 +++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index a3588ba..edce6c6 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -89,4 +89,11 @@ reg = <0x50>; pagesize = <16>; }; + + pca9555: pca9555@20 { + compatible = "nxp,pca9555"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 09/19] ARM: dts: am57xx: cl-som-am57x: add touchscreen support
Add ADS7846 touchscreen support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 44 +++ 1 file changed, 44 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index c603136..a75c382 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -43,6 +43,13 @@ regulator-min-microvolt = <330>; regulator-max-microvolt = <330>; }; + + ads7846reg: fixedregulator-ads7846-reg { + compatible = "regulator-fixed"; + regulator-name = "ads7846-reg"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + }; }; _pmx_core { @@ -183,6 +190,12 @@ DRA7XX_CORE_IOPAD(0x3594, PIN_INPUT | MUX_MODE15) >; }; + + ads7846_pins: pinmux_ads7846_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3464, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpmc_a9.gpio1_31 */ + >; + }; }; { @@ -451,6 +464,37 @@ reg = <0x10 0x0>; }; }; + + /* touch controller */ + ads7846@0 { + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + compatible = "ti,ads7846"; + vcc-supply = <>; + + reg = <1>; /* CS1 */ + spi-max-frequency = <150>; + + interrupt-parent = <>; + interrupts = <31 0>; + pendown-gpio = < 31 0>; + + + ti,x-min = /bits/ 16 <0x0>; + ti,x-max = /bits/ 16 <0x0fff>; + ti,y-min = /bits/ 16 <0x0>; + ti,y-max = /bits/ 16 <0x0fff>; + + ti,x-plate-ohms = /bits/ 16 <180>; + ti,pressure-max = /bits/ 16 <255>; + + ti,debounce-max = /bits/ 16 <30>; + ti,debounce-tol = /bits/ 16 <10>; + ti,debounce-rep = /bits/ 16 <1>; + + linux,wakeup; + }; }; { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 18/19] ARM: dts: am57xx: sbc-am57x: add HDMI support
Add HDMI video output support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Fix HDMI lanes polarity * Reformat subject arch/arm/boot/dts/am57xx-sbc-am57x.dts | 42 ++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 8e4c0fd..77bb8e1 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -18,6 +18,7 @@ aliases { display0 = + display1 = }; }; @@ -60,6 +61,19 @@ DRA7XX_CORE_IOPAD(0x3564, PIN_OUTPUT | MUX_MODE14) /* vin2a_vsync0.gpio4_0 */ >; }; + + hdmi_pins: pinmux_hdmi_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3808, PIN_INPUT | MUX_MODE1) /* i2c2_sda.hdmi1_ddc_scl */ + DRA7XX_CORE_IOPAD(0x380c, PIN_INPUT | MUX_MODE1) /* i2c2_scl.hdmi1_ddc_sda */ + >; + }; + + hdmi_conn_pins: pinmux_hdmi_conn_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x37b8, PIN_INPUT | MUX_MODE14) /* spi1_cs2.gpio7_12 */ + >; + }; }; { @@ -135,3 +149,31 @@ }; }; }; + + { + status = "ok"; + vdda-supply = <_reg>; + + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + port { + hdmi_out: endpoint { + remote-endpoint = <_connector_in>; + lanes = <1 0 3 2 5 4 7 6>; + }; + }; +}; + +_conn { + pinctrl-names = "default"; + pinctrl-0 = <_conn_pins>; + + hpd-gpios = < 12 GPIO_ACTIVE_HIGH>; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <_out>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 16/19] ARM: dts: am57xx: sbc-am57x: add LCD support
Startek-kd050c 800x480 LCD panel timings are described in compulab-sb-som.dtsi. Add appropriate DT endpoints to connect DPI output and LCD. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-sbc-am57x.dts | 38 ++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index edce6c6..8e4c0fd 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -15,6 +15,10 @@ / { model = "CompuLab CL-SOM-AM57x on SB-SOM-AM57x"; compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + aliases { + display0 = + }; }; _pmx_core { @@ -50,6 +54,12 @@ DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT| MUX_MODE10) /* mcasp1_axr1.i2c5_scl */ >; }; + + lcd_pins_default: lcd_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3564, PIN_OUTPUT | MUX_MODE14) /* vin2a_vsync0.gpio4_0 */ + >; + }; }; { @@ -97,3 +107,31 @@ #gpio-cells = <2>; }; }; + + { + status = "ok"; + + vdda_video-supply = <_reg>; + + port { + dpi_lcd_out: endpoint@0 { + remote-endpoint = <_in>; + data-lines = <24>; + }; + }; +}; + + { + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + enable-gpios = < 14 GPIO_ACTIVE_HIGH +0 GPIO_ACTIVE_HIGH>; + + port { + lcd_in: endpoint { + remote-endpoint = <_lcd_out>; + data-lines = <24>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 10/19] ARM: dts: am57xx: cl-som-am57x: add analog audio support
Add analog audio DT nodes: 1. simple-audio-card node 2. wm8731 codec node 3. MCASP3 pinmux Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 67 +++ 1 file changed, 67 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index a75c382..b2c4451 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -50,6 +50,33 @@ regulator-min-microvolt = <330>; regulator-max-microvolt = <330>; }; + + sound0: sound@0 { + compatible = "simple-audio-card"; + simple-audio-card,name = "CL-SOM-AM57x-Sound-Card"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <_master>; + simple-audio-card,frame-master = <_master>; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Microphone", "Microphone Jack", + "Line", "Line Jack"; + simple-audio-card,routing = + "Headphone Jack", "RHPOUT", + "Headphone Jack", "LHPOUT", + "LLINEIN", "Line Jack", + "MICIN", "Mic Bias", + "Mic Bias", "Microphone Jack"; + + dailink0_master: simple-audio-card,cpu { + sound-dai = <>; + }; + + simple-audio-card,codec { + sound-dai = <>; + system-clock-frequency = <1200>; + }; + }; }; _pmx_core { @@ -196,6 +223,24 @@ DRA7XX_CORE_IOPAD(0x3464, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpmc_a9.gpio1_31 */ >; }; + + mcasp3_pins_default: mcasp3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx.mcasp3_aclkx */ + DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_fsx.mcasp3_fsx */ + DRA7XX_CORE_IOPAD(0x372c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr0.mcasp3_axr0 */ + DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr1.mcasp3_axr1 */ + >; + }; + + mcasp3_pins_sleep: mcasp3_pins_sleep { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x372c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT | MUX_MODE15) + >; + }; }; { @@ -392,6 +437,13 @@ reg = <0x50>; pagesize = <16>; }; + + wm8731: wm8731@1a { + #sound-dai-cells = <0>; + compatible = "wlf,wm8731"; + reg = <0x1a>; + status = "okay"; + }; }; { @@ -538,3 +590,18 @@ { dr_mode = "peripheral"; }; + + { + #sound-dai-cells = <0>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <_pins_default>; + pinctrl-1 = <_pins_sleep>; + status = "okay"; + + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + /* 4 serializers */ + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 1 2 0 0 + >; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V3 04/19] ARM: dts: am57xx: cl-som-am57x: add EEPROM support
On-board EEPROM chip is used for storing a board production info. Add module EEPROM support (over I2C4 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- v3: * No fuctional changes * Reformat subject v2: * Fix EEPROM chip model arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 2074fd4..1badfa9 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -261,6 +261,12 @@ compatible = "emmicro,em3027"; reg = <0x56>; }; + + eeprom_module: atmel@50 { + compatible = "atmel,24c08"; + reg = <0x50>; + pagesize = <16>; + }; }; { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V3 06/19] ARM: dts: am57xx: cl-som-am57x: add spi-flash support
On-board spi-flash chip is used as a main boot device. Add spi-flash chip support (over QSPI bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v3: * Modify "compatible" property to match a proper flash driver * Drop RX/TX bus with properties * Reformat subject v2: * Add "spi-max-frequency" property for node. arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 42 +++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index ef94845..f7e163a 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -93,6 +93,17 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ >; }; + + qspi1_pins: pinmux_qspi1_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3474, PIN_INPUT | MUX_MODE1) /* gpmc_a13.qspi1_rtclk */ + DRA7XX_CORE_IOPAD(0x3480, PIN_INPUT | MUX_MODE1) /* gpmc_a16.qspi1_d0 */ + DRA7XX_CORE_IOPAD(0x3484, PIN_INPUT | MUX_MODE1) /* gpmc_a17.qspi1_d1 */ + DRA7XX_CORE_IOPAD(0x3488, PIN_INPUT | MUX_MODE1) /* qpmc_a18.qspi1_sclk */ + DRA7XX_CORE_IOPAD(0x34b8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs2.qspi1_cs0 */ + DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ + >; + }; }; { @@ -331,3 +342,34 @@ ti,non-removable; cap-mmc-dual-data-rate; }; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + spi-max-frequency = <2000>; + + spi_flash: spi_flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spansion,m25p80", "jedec,spi-nor"; + reg = <0>; /* CS0 */ + spi-max-frequency = <2000>; + + partition@0 { + label = "uboot"; + reg = <0x0 0xc>; + }; + + partition@c { + label = "uboot environment"; + reg = <0xc 0x4>; + }; + + partition@10 { + label = "reserved"; + reg = <0x10 0x0>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 08/19] ARM: dts: am57xx: cl-som-am57x: add USB support
Add USB support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 16 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index fe4baba..c603136 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -478,3 +478,19 @@ pinctrl-0 = <_mdio_pins_default>; pinctrl-1 = <_mdio_pins_sleep>; }; + +_phy1 { + phy-supply = <_reg>; +}; + +_phy2 { + phy-supply = <_reg>; +}; + + { + dr_mode = "host"; +}; + + { + dr_mode = "peripheral"; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 00/19] Add support for CL-SOM-AM57X and SBC-AM57X
SBC-AM57X boards. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. SBC-AM57x is a single board computer, implemented with the CL-SOM-AM57x computer-on-module providing most of the functions, and SB-SOM-AM57x carrier board providing additional peripheral functions and connectors. The SBC-AM57x has the following features: CPU:Texas Instruments Sitara AM5728 dual-core ARM Cortex-A15, 1.5GHz or Texas Instruments Sitara AM5718 single-core ARM Cortex-A15, 1.5GHz RAM:DDR3, 512MB – 4GB Storage:NAND flash, 512MB - 1GB or eMMC flash, 4GB - 32GB SPI-flash 2MB Ethernet: Up to 2x 10/100/1000Mbps Ethernet ports (MAC+PHY) WiFi/BT:802.11b/g/n WiFi interface (TI WiLink 8 WL1801 chipset) or Dual-band 2x2 802.11a/b/g/n WiFi interface (TI WiLink 8 WL1837 chipset) Analog Audio: Audio codec with stereo output, stereo input and microphone support More details can be found here: https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ https://www.compulab.co.il/products/sbcs/sbc-am57x-ti-am5728-am5718-single-board-computer/ This series is based on the following patch set ("Add support for sbc-t43" Nikita Kiryanov): https://www.mail-archive.com/linux-omap@vger.kernel.org/msg121905.html Changes in V2: - Removed unnecessary line breaks in end of file and elsewhere - Changed subject lines to start with "ARM: dts:" - PMIC moved from I2C1 to I2C4 - Fixed SPI flash compatible string - Skipped resetting ETH PHYs - Fixed HDMI lanes polarity Dmitry Lifshitz (19): ARM: dts: am57xx: cl-som-am57x: add basic module support ARM: dts: am57xx: cl-som-am57x: dts: add RTC support ARM: dts: am57xx: cl-som-am57x: add I2C3 support ARM: dts: am57xx: cl-som-am57x: add EEPROM support ARM: dts: am57xx: cl-som-am57x: add eMMC support ARM: dts: am57xx: cl-som-am57x: add spi-flash support ARM: dts: am57xx: cl-som-am57x: add dual EMAC support ARM: dts: am57xx: cl-som-am57x: add USB support ARM: dts: am57xx: cl-som-am57x: add touchscreen support ARM: dts: am57xx: cl-som-am57x: add analog audio support ARM: dts: am57xx: sbc-am57x: add basic board support ARM: dts: am57xx: cl-som-am57x: add MMC1 support ARM: dts: am57xx: sbc-am57x: add usb vbus pinmux ARM: dts: am57xx: sbc-am57x: add EEPROM support ARM: dts: am57xx: sbc-am57x: add GPIO expander support ARM: dts: am57xx: sbc-am57x: add LCD support ARM: dts: am57xx: compulab-sb-som: add HDMI connector ARM: dts: am57xx: sbc-am57x: add HDMI support ARM: dts: am57xx: cl-som-am57x: skip resetting ETH PHYs .../devicetree/bindings/arm/omap/omap.txt | 6 + arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 617 + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 179 ++ arch/arm/boot/dts/compulab-sb-som.dtsi | 7 + 5 files changed, 812 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V3 12/19] ARM: dts: am57xx: cl-som-am57x: add MMC1 support
Add MMC1 support, used for SD/MMC card. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v3: * No fuctional changes * Reformat subject v2: * Fix duplicate SD Card Detect pinmux arch/arm/boot/dts/am57xx-sbc-am57x.dts | 25 + 1 file changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 804ad72..93852e2 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -24,6 +24,19 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ >; }; + + mmc1_pins_default: mmc1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ + DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ + DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ + DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ + DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ + DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ + DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14) /* mmc1_sdcd.gpio6_27 */ + DRA7XX_CORE_IOPAD(0x377c, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ + >; + }; }; { @@ -34,3 +47,15 @@ pinctrl-names = "default"; pinctrl-0 = <_pins_default>; }; + + { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + vmmc-supply = <_reg>; + bus-width = <4>; + cd-gpios = < 27 GPIO_ACTIVE_LOW>; + wp-gpios = < 28 GPIO_ACTIVE_HIGH>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 05/19] ARM: dts: am57xx: cl-som-am57x: add eMMC support
CM-SOM-AM57X has two options of main storage devices - eMMC or NAND. Add eMMC chip support (over MMC2 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 34 +++ 1 file changed, 34 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 1badfa9..ef94845 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -36,6 +36,13 @@ default-state = "off"; }; }; + + vdd_3v3: fixedregulator-vdd_3v3 { + compatible = "regulator-fixed"; + regulator-name = "vdd_3v3"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + }; }; _pmx_core { @@ -71,6 +78,21 @@ DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ >; }; + + mmc2_pins_default: mmc2_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */ + DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */ + DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */ + DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */ + DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */ + DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */ + DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */ + DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */ + DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */ + DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ + >; + }; }; { @@ -297,3 +319,15 @@ status = "okay"; }; }; + + { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + vmmc-supply = <_3v3>; + bus-width = <8>; + ti,non-removable; + cap-mmc-dual-data-rate; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 13/19] ARM: dts: am57xx: sbc-am57x: add usb vbus pinmux
usb1_drvvbus pin is used to Drive-VBUS enable to external charge pump/power switch. Add a pinmux for that pin. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-sbc-am57x.dts | 11 +++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 93852e2..17a1972 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -37,6 +37,12 @@ DRA7XX_CORE_IOPAD(0x377c, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ >; }; + + usb1_pins: pinmux_usb1_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */ + >; + }; }; { @@ -59,3 +65,8 @@ cd-gpios = < 27 GPIO_ACTIVE_LOW>; wp-gpios = < 28 GPIO_ACTIVE_HIGH>; }; + + { + pinctrl-names = "default"; + pinctrl-0 = <_pins>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 02/19] ARM: dts: am57xx: cl-som-am57x: dts: add RTC support
Add EM3027 RTC chip support (over I2C4 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes. * Refactor patch with respect to the previous changes in I2C4 node structure. * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 5 + 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 087d62e..58156a9 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -242,6 +242,11 @@ #gpio-cells = <2>; }; }; + + rtc0: rtc@56 { + compatible = "emmicro,em3027"; + reg = <0x56>; + }; }; { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 11/19] ARM: dts: am57xx: sbc-am57x: add basic board support
SBC-AM57x is a single board computer designed for industrial and embedded applications. It is based on the Texas Instruments Sitara AM57x system-on-chip family. SBC-AM57x is implemented with the CL-SOM-AM57x computer-on-module providing most of the functions, and SB-SOM-AM57x carrier board providing additional peripheral functions and connectors. https://www.compulab.co.il/products/sbcs/sbc-am57x-ti-am5728-am5718-single-board-computer/ https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ Add basic board support, including UART3, used as a serial console. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject .../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 36 ++ 3 files changed, 40 insertions(+) create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index dd53c90..42cdad1 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -159,6 +159,9 @@ Boards: - AM57XX CL-SOM-AM57x compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" +- AM57XX SBC-AM57x + compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" + - DRA742 EVM: Software Development Board for DRA742 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 803a020..4c73ab9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -479,6 +479,7 @@ dtb-$(CONFIG_SOC_OMAP5) += \ dtb-$(CONFIG_SOC_DRA7XX) += \ am57xx-beagle-x15.dtb \ am57xx-cl-som-am57x.dtb \ + am57xx-sbc-am57x.dtb \ dra7-evm.dtb \ dra72-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += \ diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts new file mode 100644 index 000..804ad72 --- /dev/null +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -0,0 +1,36 @@ +/* + * Support for CompuLab SBC-AM57x single board computer + * + * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * Author: Dmitry Lifshitz <lifsh...@compulab.co.il> + * + * 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 "am57xx-cl-som-am57x.dts" +#include "compulab-sb-som.dtsi" + +/ { + model = "CompuLab CL-SOM-AM57x on SB-SOM-AM57x"; + compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; +}; + +_pmx_core { + uart3_pins_default: uart3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */ + DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ + >; + }; +}; + + { + status = "okay"; + interrupts-extended = <_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <_pmx_core 0x3f8>; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 17/19] ARM: dts: am57xx: compulab-sb-som: add HDMI connector
Add HDMI connector node without a valid input endpoint. CompuLab SB-SOM is a carrier board, hence the endpoint should be added in the board DT with a valid HDMI output. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/compulab-sb-som.dtsi | 7 +++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/compulab-sb-som.dtsi b/arch/arm/boot/dts/compulab-sb-som.dtsi index 402a143..93d7e23 100644 --- a/arch/arm/boot/dts/compulab-sb-som.dtsi +++ b/arch/arm/boot/dts/compulab-sb-som.dtsi @@ -39,4 +39,11 @@ pixelclk-active = <1>; }; }; + + hdmi_conn: connector@0 { + compatible = "hdmi-connector"; + label = "hdmi"; + + type = "a"; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 03/19] ARM: dts: am57xx: cl-som-am57x: add I2C3 support
Enable I2C3 bus and add appropriate pinmux. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * No fuctional changes * Refactor patch with respect to the previous changes in I2C4 node structure * Reformat subject arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 14 ++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 58156a9..2074fd4 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -52,6 +52,13 @@ >; }; + i2c3_pins_default: i2c3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36a4, PIN_INPUT| MUX_MODE10) /* mcasp1_aclkx.i2c3_sda */ + DRA7XX_CORE_IOPAD(0x36a8, PIN_INPUT| MUX_MODE10) /* mcasp1_fsx.i2c3_scl */ + >; + }; + i2c4_pins_default: i2c4_pins_default { pinctrl-single,pins = < DRA7XX_CORE_IOPAD(0x36ac, PIN_INPUT| MUX_MODE10) /* mcasp1_acl.i2c4_sda */ @@ -73,6 +80,13 @@ clock-frequency = <40>; }; + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; +}; + { status = "okay"; pinctrl-names = "default"; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V2 14/19] ARM: dts: am57xx: sbc-am57x: add EEPROM support
On-board EEPROM chip is used for storing a board production info. Add carrier board EEPROM support (over I2C5 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- v2: * No fuctional changes * Reformat subject arch/arm/boot/dts/am57xx-sbc-am57x.dts | 20 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 17a1972..a3588ba 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -43,6 +43,13 @@ DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */ >; }; + + i2c5_pins_default: i2c5_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36b4, PIN_INPUT| MUX_MODE10) /* mcasp1_axr0.i2c5_sda */ + DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT| MUX_MODE10) /* mcasp1_axr1.i2c5_scl */ + >; + }; }; { @@ -70,3 +77,16 @@ pinctrl-names = "default"; pinctrl-0 = <_pins>; }; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; + + eeprom_base: atmel@50 { + compatible = "atmel,24c08"; + reg = <0x50>; + pagesize = <16>; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH V3 07/19] ARM: dts: am57xx: cl-som-am57x: add dual EMAC support
Add dual EMAC support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v3: * No fuctional changes * Reformat subject v2: * Fix pinmux comments for RGMII0/1 clock/data lines * Fix pinmux for MDIO bus clock/data lines * Fix PHYs addresses arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 105 ++ 1 file changed, 105 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index f7e163a..fe4baba 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -104,6 +104,85 @@ DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ >; }; + + cpsw_pins_default: cpsw_pins_default { + pinctrl-single,pins = < + /* Slave at addr 0x0 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_OUTPUT | MUX_MODE0) /* rgmii0_tclk */ + DRA7XX_CORE_IOPAD(0x3654, PIN_OUTPUT | MUX_MODE0) /* rgmii0_tctl */ + DRA7XX_CORE_IOPAD(0x3658, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td3 */ + DRA7XX_CORE_IOPAD(0x365c, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td2 */ + DRA7XX_CORE_IOPAD(0x3660, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td1 */ + DRA7XX_CORE_IOPAD(0x3664, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td0 */ + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rclk */ + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rctl */ + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd3 */ + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd2 */ + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd1 */ + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd0 */ + + /* Slave at addr 0x1 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_OUTPUT | MUX_MODE3) /* vin2a_d12.rgmii1_tclk */ + DRA7XX_CORE_IOPAD(0x359c, PIN_OUTPUT | MUX_MODE3) /* vin2a_d13.rgmii1_tctl */ + DRA7XX_CORE_IOPAD(0x35a0, PIN_OUTPUT | MUX_MODE3) /* vin2a_d14.rgmii1_td3 */ + DRA7XX_CORE_IOPAD(0x35a4, PIN_OUTPUT | MUX_MODE3) /* vin2a_d15.rgmii1_td2 */ + DRA7XX_CORE_IOPAD(0x35a8, PIN_OUTPUT | MUX_MODE3) /* vin2a_d16.rgmii1_td1 */ + DRA7XX_CORE_IOPAD(0x35ac, PIN_OUTPUT | MUX_MODE3) /* vin2a_d17.rgmii1_td0 */ + DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d18.rgmii1_rclk */ + DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d19.rgmii1_rctl */ + DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d20.rgmii1_rd3 */ + DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d21.rgmii1_rd2 */ + DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d22.rgmii1_rd1 */ + DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLUP | MUX_MODE3) /* vin2a_d23.rgmii1_rd0 */ + >; + }; + + cpsw_pins_sleep: cpsw_pins_sleep { + pinctrl-single,pins = < + /* Slave 1 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3654, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3658, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x365c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3660, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3664, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT | MUX_MODE15) + + /* Slave 2 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x359c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a0, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a4, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a8
[PATCH 19/19] ARM: dts: am57xx: cl-som-am57x: skip resetting ETH PHYs
ETH PHYs setup on CL-SOM-AM57X is established in U-Boot along with bringing them out of reset. This is done by toggling GPIOs belonging to GPIO2/3 controllers on AM57xx. Skip resetting ETH PHYs, by adding "ti,no-reset-on-init" to GPIO2/3 controllers DT nodes. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 10 ++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index b2c4451..c538826 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -605,3 +605,13 @@ 1 2 0 0 >; }; + + { + status = "okay"; + ti,no-reset-on-init; +}; + + { + status = "okay"; + ti,no-reset-on-init; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 01/18] ARM: am57xx: cl-som-am57x: dts: add basic module support
Hi Tony, On 11/30/2015 11:54 PM, Tony Lindgren wrote: * Dmitry Lifshitz <lifsh...@compulab.co.il> [151130 06:27]: +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts + tps659038_pmic { + compatible = "ti,tps659038-pmic"; + + regulators { + smps12_reg: smps12 { + /* VDD_MPU */ + regulator-name = "smps12"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <125>; + regulator-always-on; + regulator-boot-on; + }; + + smps3_reg: smps3 { + /* VDD_DDR */ + regulator-name = "smps3"; + regulator-min-microvolt = <150>; + regulator-max-microvolt = <150>; + regulator-always-on; + regulator-boot-on; + }; + + smps45_reg: smps45 { + /* VDD_DSPEVE */ + regulator-name = "smps45"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <125>; + regulator-always-on; + regulator-boot-on; + }; + + smps6_reg: smps6 { + /* VDD_GPU */ + regulator-name = "smps6"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <125>; + regulator-always-on; + regulator-boot-on; + }; + + smps7_reg: smps7 { + /* VDD_CORE */ + regulator-name = "smps7"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <116>; + regulator-always-on; + regulator-boot-on; + }; + + smps8_reg: smps8 { + /* VDD_IVA */ + regulator-name = "smps8"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <125>; + regulator-always-on; + regulator-boot-on; + }; + + smps9_reg: smps9 { + /* PMIC_3V3 */ + regulator-name = "smps9"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + regulator-always-on; + regulator-boot-on; + }; + + + ldo1_reg: ldo1 { + /* VDD_SD / VDDSHV8 */ + regulator-name = "ldo1"; + regulator-min-microvolt = <180>; + regulator-max-microvolt = <330>; + regulator-boot-on; + regulator-always-on; + }; + + ldo2_reg: ldo2 { + /* VDD_1V8 */ + regulator-name = "ldo2"; + regulator-min-microvolt = <180>; + regulator-max-microvolt = <180>; + regulator-always-on; + regulator-boot-on; + }; + + ldo3_reg: ldo3 { + /* VDDA_1V8_PHYA - supplies VDDA_SATA,
Re: [PATCH 01/18] ARM: am57xx: cl-som-am57x: dts: add basic module support
On 11/29/2015 07:06 PM, Nishanth Menon wrote: On 11/29/2015 06:10 AM, Dmitry Lifshitz wrote: [...] +}; + +leds { +compatible = "gpio-leds"; +pinctrl-names = "default"; +pinctrl-0 = <_pins_default>; + +led@0 { +label = "cl-som-am57x:green"; +gpios = < 5 GPIO_ACTIVE_HIGH>; +linux,default-trigger = "heartbeat"; +default-state = "off"; +}; +}; +}; + +_pmx_core { +leds_pins_default: leds_pins_default { +pinctrl-single,pins = < +DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14)/* gpmc_a15.gpio2_5 */ +>; +}; + +i2c1_pins_default: i2c1_pins_default { +pinctrl-single,pins = < +DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0)/* i2c1_sda.sda */ +DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0)/* i2c1_scl.scl */ +>; +}; + +tps659038_pins_default: tps659038_pins_default { +pinctrl-single,pins = < +DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ +>; +}; Generic comment: As per requirements of the SoC -> all pinctrl must be done in bootloader. this was a recommendation that came in too late for TI platforms that got introduced in upstream, but that cleanup should eventually take place as well. Please, could you provide a reference to those recommendations. Do you mean pinctrl for PMIC pins only? You might want to ask your TI support contact for IODelay recommendations. TRM mentions that pinmuxing must be performed under IO isolation. There are silicon constraints in DRA7/AM57xx family, which were not present previously. Ok. I understand. This might take time... Since we'd like to have this in for 4.5, what would you recommend? Should I drop the muxes from this patch set? All the muxes? Or should we merge this (as it works correctly) in our tests and check on this later after investigation with TI? Also, in theory, there might be pins shared between two or more different functionalities and remuxed during runtime. Can this kind of thing be supported on AM57x? +tps659038: tps659038@58 { +compatible = "ti,tps659038"; +reg = <0x58>; +interrupt-parent = <>; +interrupts = <0 IRQ_TYPE_LEVEL_LOW>; Also See: https://patchwork.kernel.org/patch/7596541/ -> Documentation/devicetree/bindings/i2c/i2c.txt -> since you seem to have a PMIC with power button, you might be able to get wakeup source also there. Do you mean just adding "wakeup-source" property? According to Documentation/devicetree/bindings/i2c/i2c.txt the primary interrupt will be used as wakeup interrupt. I think you might have to describe a "wakeup" interrupt -> which will be similar in description to the one you used to describe uart wakeup capability. Ok. Thanks! Well, we are not there yet. I think it would be better to work this out when I will work on the suspend/resume. [..] +pinctrl-names = "default"; +pinctrl-0 = <_pins_default>; + +#interrupt-cells = <2>; +interrupt-controller; + +ti,system-power-controller; Assuming powerhold signal and BOOT0,1 is proper here, else poweroff will never work. Please, could you provide more details regarding this issue. well, if poweroff command does not completely power off your board, you may want to investigate further. overall, the better circuit configuration is the X15 configuration: https://github.com/beagleboard/beagleboard-x15/blob/master/BeagleBoard-X15_RevA2.pdf Pay close attention to the PMIC GPIO_&/POWERHOLD signal. Also notice the extra reset circuit involved. Again, a topic that you should probably discuss with your TI support contact person. Ok. Thanks for the explanation! Indeed it does not currently work. I will forward your comments to the h/w designer. [...] Regards, Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 01/18] ARM: am57xx: cl-som-am57x: dts: add basic module support
Add support for CompuLab CM-SOM-AM57X board. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ Add basic DT support for standalone module (without a carrier board): * Memory configuration * Heartbeat led * I2C1 bus * PMIC * SATA Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Fixed voltages (for OPP_HIGH) for VDD_GPU, VDD_IVA, VDD_DSPEVE * Added comments for VDDA_1V8_PHYA/B * Add "regulator-always-on" property for ldousb_reg .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 260 + 3 files changed, 265 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index da84372..dd53c90 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -156,6 +156,9 @@ Boards: - AM437x SK EVM: AM437x StarterKit Evaluation Module compatible = "ti,am437x-sk-evm", "ti,am4372", "ti,am43" +- AM57XX CL-SOM-AM57x + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" + - DRA742 EVM: Software Development Board for DRA742 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5492a24..803a020 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -477,8 +477,9 @@ dtb-$(CONFIG_SOC_OMAP5) += \ omap5-sbc-t54.dtb \ omap5-uevm.dtb dtb-$(CONFIG_SOC_DRA7XX) += \ - dra7-evm.dtb \ am57xx-beagle-x15.dtb \ + am57xx-cl-som-am57x.dtb \ + dra7-evm.dtb \ dra72-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-lacie-d2-network.dtb \ diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts new file mode 100644 index 000..840eba6 --- /dev/null +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -0,0 +1,260 @@ +/* + * Support for CompuLab CL-SOM-AM57x System-on-Module + * + * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * Author: Dmitry Lifshitz <lifsh...@compulab.co.il> + * + * 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 +#include +#include "dra74x.dtsi" + +/ { + model = "CompuLab CL-SOM-AM57x"; + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + memory { + device_type = "memory"; + reg = <0x8000 0x2000>; /* 512 MB - minimal configuration */ + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + led@0 { + label = "cl-som-am57x:green"; + gpios = < 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; +}; + +_pmx_core { + leds_pins_default: leds_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14) /* gpmc_a15.gpio2_5 */ + >; + }; + + i2c1_pins_default: i2c1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda.sda */ + DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl.scl */ + >; + }; + + tps659038_pins_default: tps659038_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ + >; + }; +}; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; + + tps659038: tps659038@58 { + compatible = "ti,tps659038"; + reg = <0x58>; + interrupt-parent = &
[PATCH v2 06/18] ARM: am57xx: cl-som-am57x: dts: add spi-flash support
On-board spi-flash chip is used as a main boot device. Add spi-flash chip support (over QSPI bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Add "spi-max-frequency" property for node. arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 43 +++ 1 file changed, 43 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 196e7c7..9042185 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -93,6 +93,17 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ >; }; + + qspi1_pins: pinmux_qspi1_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3474, PIN_INPUT | MUX_MODE1) /* gpmc_a13.qspi1_rtclk */ + DRA7XX_CORE_IOPAD(0x3480, PIN_INPUT | MUX_MODE1) /* gpmc_a16.qspi1_d0 */ + DRA7XX_CORE_IOPAD(0x3484, PIN_INPUT | MUX_MODE1) /* gpmc_a17.qspi1_d1 */ + DRA7XX_CORE_IOPAD(0x3488, PIN_INPUT | MUX_MODE1) /* qpmc_a18.qspi1_sclk */ + DRA7XX_CORE_IOPAD(0x34b8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs2.qspi1_cs0 */ + DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ + >; + }; }; { @@ -332,3 +343,35 @@ cap-mmc-dual-data-rate; }; + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + spi-max-frequency = <2000>; + + spi_flash: spi_flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; /* CS0 */ + spi-max-frequency = <2000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + + partition@0 { + label = "uboot"; + reg = <0x0 0xc>; + }; + + partition@c { + label = "uboot environment"; + reg = <0xc 0x4>; + }; + + partition@10 { + label = "reserved"; + reg = <0x10 0x0>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 07/18] ARM: am57xx: cl-som-am57x: dts: add dual EMAC support
Add dual EMAC support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Fix pinmux comments for RGMII0/1 clock/data lines * Fix pinmux for MDIO bus clock/data lines * Fix PHYs addresses arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 105 ++ 1 file changed, 105 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 9042185..1efa090 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -104,6 +104,85 @@ DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ >; }; + + cpsw_pins_default: cpsw_pins_default { + pinctrl-single,pins = < + /* Slave at addr 0x0 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_OUTPUT | MUX_MODE0) /* rgmii0_tclk */ + DRA7XX_CORE_IOPAD(0x3654, PIN_OUTPUT | MUX_MODE0) /* rgmii0_tctl */ + DRA7XX_CORE_IOPAD(0x3658, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td3 */ + DRA7XX_CORE_IOPAD(0x365c, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td2 */ + DRA7XX_CORE_IOPAD(0x3660, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td1 */ + DRA7XX_CORE_IOPAD(0x3664, PIN_OUTPUT | MUX_MODE0) /* rgmii0_td0 */ + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rclk */ + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rctl */ + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd3 */ + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd2 */ + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd1 */ + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rgmii0_rd0 */ + + /* Slave at addr 0x1 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_OUTPUT | MUX_MODE3) /* vin2a_d12.rgmii1_tclk */ + DRA7XX_CORE_IOPAD(0x359c, PIN_OUTPUT | MUX_MODE3) /* vin2a_d13.rgmii1_tctl */ + DRA7XX_CORE_IOPAD(0x35a0, PIN_OUTPUT | MUX_MODE3) /* vin2a_d14.rgmii1_td3 */ + DRA7XX_CORE_IOPAD(0x35a4, PIN_OUTPUT | MUX_MODE3) /* vin2a_d15.rgmii1_td2 */ + DRA7XX_CORE_IOPAD(0x35a8, PIN_OUTPUT | MUX_MODE3) /* vin2a_d16.rgmii1_td1 */ + DRA7XX_CORE_IOPAD(0x35ac, PIN_OUTPUT | MUX_MODE3) /* vin2a_d17.rgmii1_td0 */ + DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d18.rgmii1_rclk */ + DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d19.rgmii1_rctl */ + DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d20.rgmii1_rd3 */ + DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d21.rgmii1_rd2 */ + DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d22.rgmii1_rd1 */ + DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLUP | MUX_MODE3) /* vin2a_d23.rgmii1_rd0 */ + >; + }; + + cpsw_pins_sleep: cpsw_pins_sleep { + pinctrl-single,pins = < + /* Slave 1 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3654, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3658, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x365c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3660, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3664, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT | MUX_MODE15) + + /* Slave 2 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x359c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a0, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a4, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a8, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35ac
[PATCH v2 15/18] ARM: am57xx: sbc-am57x: dts: add GPIO expander support
Add PCA9555 GPIO expander support (over I2C5 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Fixed patch subject/description arch/arm/boot/dts/am57xx-sbc-am57x.dts | 7 +++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index a3588ba..edce6c6 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -89,4 +89,11 @@ reg = <0x50>; pagesize = <16>; }; + + pca9555: pca9555@20 { + compatible = "nxp,pca9555"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 12/18] ARM: am57xx: cl-som-am57x: dts: add MMC1 support
Add MMC1 support, used for SD/MMC card. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- v2: * Fix duplicate SD Card Detect pinmux arch/arm/boot/dts/am57xx-sbc-am57x.dts | 25 + 1 file changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 804ad72..93852e2 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -24,6 +24,19 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ >; }; + + mmc1_pins_default: mmc1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ + DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ + DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ + DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ + DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ + DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ + DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14) /* mmc1_sdcd.gpio6_27 */ + DRA7XX_CORE_IOPAD(0x377c, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ + >; + }; }; { @@ -34,3 +47,15 @@ pinctrl-names = "default"; pinctrl-0 = <_pins_default>; }; + + { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + vmmc-supply = <_reg>; + bus-width = <4>; + cd-gpios = < 27 GPIO_ACTIVE_LOW>; + wp-gpios = < 28 GPIO_ACTIVE_HIGH>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 04/18] ARM: am57xx: cl-som-am57x: dts: add EEPROM support
On-board EEPROM chip is used for storing a board production info. Add module EEPROM support (over I2C4 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- v2: * Fix EEPROM chip model arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 9f15dda..695f250 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -290,6 +290,12 @@ compatible = "emmicro,em3027"; reg = <0x56>; }; + + eeprom_module: atmel@50 { + compatible = "atmel,24c08"; + reg = <0x50>; + pagesize = <16>; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 01/18] ARM: am57xx: cl-som-am57x: dts: add basic module support
Hi Nishanth, Thank you for the provided feedback. On 11/25/2015 11:36 PM, Nishanth Menon wrote: On 11/25/2015 12:39 AM, Dmitry Lifshitz wrote: [...] diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts new file mode 100644 index 000..b11d7da --- /dev/null +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts [...] +/ { + model = "CompuLab CL-SOM-AM57x"; + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + memory { + device_type = "memory"; + reg = <0x8000 0x2000>; /* 512 MB - minimal configuration */ I think if you like to enable LPAE, the format might look a little different.. We would like to have a basic HW support in the mainline. It might be enhanced later, once we get to work on LPAE stuff. + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + led@0 { + label = "cl-som-am57x:green"; + gpios = < 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; +}; + +_pmx_core { + leds_pins_default: leds_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14) /* gpmc_a15.gpio2_5 */ + >; + }; + + i2c1_pins_default: i2c1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda.sda */ + DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl.scl */ + >; + }; + + tps659038_pins_default: tps659038_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ + >; + }; Generic comment: As per requirements of the SoC -> all pinctrl must be done in bootloader. this was a recommendation that came in too late for TI platforms that got introduced in upstream, but that cleanup should eventually take place as well. Please, could you provide a reference to those recommendations. Do you mean pinctrl for PMIC pins only? +}; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; + + tps659038: tps659038@58 { + compatible = "ti,tps659038"; + reg = <0x58>; + interrupt-parent = <>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; Also See: https://patchwork.kernel.org/patch/7596541/ -> Documentation/devicetree/bindings/i2c/i2c.txt -> since you seem to have a PMIC with power button, you might be able to get wakeup source also there. Do you mean just adding "wakeup-source" property? According to Documentation/devicetree/bindings/i2c/i2c.txt the primary interrupt will be used as wakeup interrupt. + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + #interrupt-cells = <2>; + interrupt-controller; + + ti,system-power-controller; Assuming powerhold signal and BOOT0,1 is proper here, else poweroff will never work. Please, could you provide more details regarding this issue. + + tps659038_pmic { + compatible = "ti,tps659038-pmic"; + + regulators { + smps12_reg: smps12 { + /* VDD_MPU */ + regulator-name = "smps12"; + regulator-min-microvolt = < 85>; + regulator-max-microvolt = <125>; + regulator-always-on; + regulator-boot-on; + }; + + smps3_reg: smps3 { + /* VDD_DDR */ + regulator-name = "smps3"; + regulator-min-microvolt = <150>; + regulator-max-microvolt = <150>; + regulator-always-on; + regulator-boot-on; + }; + + smps45_
[PATCH 15/18] ARM: am57xx: sbc-am57x: dts: add GPIO extender support
Add PCA9555 GPIO extender support (over I2C5 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 7 +++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 7b65efb..8b7c0b5 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -90,4 +90,11 @@ reg = <0x50>; pagesize = <16>; }; + + pca9555: pca9555@20 { + compatible = "nxp,pca9555"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 18/18] ARM: am57xx: sbc-am57x: dts: add HDMI support
Add HDMI video output support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 41 ++ 1 file changed, 41 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 13555aa..4b29223 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -18,6 +18,7 @@ aliases { display0 = + display1 = }; }; @@ -61,6 +62,19 @@ DRA7XX_CORE_IOPAD(0x3564, PIN_OUTPUT | MUX_MODE14) /* vin2a_vsync0.gpio4_0 */ >; }; + + hdmi_pins: pinmux_hdmi_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3808, PIN_INPUT | MUX_MODE1) /* i2c2_sda.hdmi1_ddc_scl */ + DRA7XX_CORE_IOPAD(0x380c, PIN_INPUT | MUX_MODE1) /* i2c2_scl.hdmi1_ddc_sda */ + >; + }; + + hdmi_conn_pins: pinmux_hdmi_conn_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x37b8, PIN_INPUT | MUX_MODE14) /* spi1_cs2.gpio7_12 */ + >; + }; }; { @@ -136,3 +150,30 @@ }; }; }; + + { + status = "ok"; + vdda-supply = <_reg>; + + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + port { + hdmi_out: endpoint { + remote-endpoint = <_connector_in>; + }; + }; +}; + +_conn { + pinctrl-names = "default"; + pinctrl-0 = <_conn_pins>; + + hpd-gpios = < 12 GPIO_ACTIVE_HIGH>; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <_out>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 16/18] ARM: am57xx: sbc-am57x: dts: add LCD support
Startek-kd050c 800x480 LCD panel timings are described in compulab-sb-som.dtsi. Add appropriate DT endpoints to connect DPI output and LCD. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 38 ++ 1 file changed, 38 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 8b7c0b5..13555aa 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -15,6 +15,10 @@ / { model = "CompuLab CL-SOM-AM57x on SB-SOM-AM57x"; compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + aliases { + display0 = + }; }; _pmx_core { @@ -51,6 +55,12 @@ DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT| MUX_MODE10) /* mcasp1_axr1.i2c5_scl */ >; }; + + lcd_pins_default: lcd_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3564, PIN_OUTPUT | MUX_MODE14) /* vin2a_vsync0.gpio4_0 */ + >; + }; }; { @@ -98,3 +108,31 @@ #gpio-cells = <2>; }; }; + + { + status = "ok"; + + vdda_video-supply = <_reg>; + + port { + dpi_lcd_out: endpoint@0 { + remote-endpoint = <_in>; + data-lines = <24>; + }; + }; +}; + + { + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + enable-gpios = < 14 GPIO_ACTIVE_HIGH +0 GPIO_ACTIVE_HIGH>; + + port { + lcd_in: endpoint { + remote-endpoint = <_lcd_out>; + data-lines = <24>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 07/18] ARM: am57xx: cl-som-am57x: dts: add dual EMAC support
Add dual EMAC support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 105 ++ 1 file changed, 105 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index cf2328d..a838ea4 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -104,6 +104,85 @@ DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ >; }; + + cpsw_pins_default: cpsw_pins_default { + pinctrl-single,pins = < + /* Slave 1 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_OUTPUT | MUX_MODE0) /* rgmii1_tclk */ + DRA7XX_CORE_IOPAD(0x3654, PIN_OUTPUT | MUX_MODE0) /* rgmii1_tctl */ + DRA7XX_CORE_IOPAD(0x3658, PIN_OUTPUT | MUX_MODE0) /* rgmii1_td3 */ + DRA7XX_CORE_IOPAD(0x365c, PIN_OUTPUT | MUX_MODE0) /* rgmii1_td2 */ + DRA7XX_CORE_IOPAD(0x3660, PIN_OUTPUT | MUX_MODE0) /* rgmii1_td1 */ + DRA7XX_CORE_IOPAD(0x3664, PIN_OUTPUT | MUX_MODE0) /* rgmii1_td0 */ + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT | MUX_MODE0) /* rgmii1_rclk */ + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT | MUX_MODE0) /* rgmii1_rctl */ + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT | MUX_MODE0) /* rgmii1_rd3 */ + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT | MUX_MODE0) /* rgmii1_rd2 */ + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT | MUX_MODE0) /* rgmii1_rd1 */ + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT | MUX_MODE0) /* rgmii1_rd0 */ + + /* Slave 2 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_OUTPUT | MUX_MODE3) /* rgmii2_tclk */ + DRA7XX_CORE_IOPAD(0x359c, PIN_OUTPUT | MUX_MODE3) /* rgmii2_tctl */ + DRA7XX_CORE_IOPAD(0x35a0, PIN_OUTPUT | MUX_MODE3) /* rgmii2_td3 */ + DRA7XX_CORE_IOPAD(0x35a4, PIN_OUTPUT | MUX_MODE3) /* rgmii2_td2 */ + DRA7XX_CORE_IOPAD(0x35a8, PIN_OUTPUT | MUX_MODE3) /* rgmii2_td1 */ + DRA7XX_CORE_IOPAD(0x35ac, PIN_OUTPUT | MUX_MODE3) /* rgmii2_td0 */ + DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT | MUX_MODE3) /* rgmii2_rclk */ + DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT | MUX_MODE3) /* rgmii2_rctl */ + DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT | MUX_MODE3) /* rgmii2_rd3 */ + DRA7XX_CORE_IOPAD(0x35bc, PIN_INPUT | MUX_MODE3) /* rgmii2_rd2 */ + DRA7XX_CORE_IOPAD(0x35c0, PIN_INPUT | MUX_MODE3) /* rgmii2_rd1 */ + DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT | MUX_MODE3) /* rgmii2_rd0 */ + >; + }; + + cpsw_pins_sleep: cpsw_pins_sleep { + pinctrl-single,pins = < + /* Slave 1 */ + DRA7XX_CORE_IOPAD(0x3650, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3654, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3658, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x365c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3660, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3664, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3668, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x366c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3670, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3674, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3678, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x367c, PIN_INPUT | MUX_MODE15) + + /* Slave 2 */ + DRA7XX_CORE_IOPAD(0x3598, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x359c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a0, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a4, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35a8, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35ac, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35b0, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35b4, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35b8, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x35bc
[PATCH 05/18] ARM: am57xx: cl-som-am57x: dts: add eMMC support
CM-SOM-AM57X has two options of main storage devices - eMMC or NAND. Add eMMC chip support (over MMC2 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 33 +++ 1 file changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index b6919a7..ed50a75 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -36,6 +36,13 @@ default-state = "off"; }; }; + + vdd_3v3: fixedregulator-vdd_3v3 { + compatible = "regulator-fixed"; + regulator-name = "vdd_3v3"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + }; }; _pmx_core { @@ -71,6 +78,21 @@ DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ >; }; + + mmc2_pins_default: mmc2_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */ + DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */ + DRA7XX_CORE_IOPAD(0x34a0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a24.mmc2_dat0 */ + DRA7XX_CORE_IOPAD(0x34a4, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a25.mmc2_dat1 */ + DRA7XX_CORE_IOPAD(0x34a8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a26.mmc2_dat2 */ + DRA7XX_CORE_IOPAD(0x34ac, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a27.mmc2_dat3 */ + DRA7XX_CORE_IOPAD(0x348c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a19.mmc2_dat4 */ + DRA7XX_CORE_IOPAD(0x3490, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a20.mmc2_dat5 */ + DRA7XX_CORE_IOPAD(0x3494, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a21.mmc2_dat6 */ + DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ + >; + }; }; { @@ -297,4 +319,15 @@ }; }; + { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + vmmc-supply = <_3v3>; + bus-width = <8>; + ti,non-removable; + cap-mmc-dual-data-rate; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 08/18] ARM: am57xx: cl-som-am57x: dts: add USB support
Add USB support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 16 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index a838ea4..eba12a4 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -477,3 +477,19 @@ pinctrl-0 = <_mdio_pins_default>; pinctrl-1 = <_mdio_pins_sleep>; }; + +_phy1 { + phy-supply = <_reg>; +}; + +_phy2 { + phy-supply = <_reg>; +}; + + { + dr_mode = "host"; +}; + + { + dr_mode = "peripheral"; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 17/18] ARM: am57xx: compulab-sb-som: dts: add HDMI connector
Add HDMI connector node without a valid input endpoint. CompuLab SB-SOM is a carrier board, hence the endpoint should be added in the board DT with a valid HDMI output. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/compulab-sb-som.dtsi | 7 +++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/compulab-sb-som.dtsi b/arch/arm/boot/dts/compulab-sb-som.dtsi index 402a143..93d7e23 100644 --- a/arch/arm/boot/dts/compulab-sb-som.dtsi +++ b/arch/arm/boot/dts/compulab-sb-som.dtsi @@ -39,4 +39,11 @@ pixelclk-active = <1>; }; }; + + hdmi_conn: connector@0 { + compatible = "hdmi-connector"; + label = "hdmi"; + + type = "a"; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 13/18] ARM: am57xx: sbc-am57x: dts: add usb vbus pinmux
usb1_drvvbus pin is used to Drive-VBUS enable to external charge pump/power switch. Add a pinmux for that pin. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 11 +++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 67e7f4a..b92650b 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -38,6 +38,12 @@ DRA7XX_CORE_IOPAD(0x3770, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ >; }; + + usb1_pins: pinmux_usb1_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */ + >; + }; }; { @@ -60,3 +66,8 @@ cd-gpios = < 27 GPIO_ACTIVE_LOW>; wp-gpios = < 28 GPIO_ACTIVE_HIGH>; }; + + { + pinctrl-names = "default"; + pinctrl-0 = <_pins>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 01/18] ARM: am57xx: cl-som-am57x: dts: add basic module support
Add support for CompuLab CM-SOM-AM57X board. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ Add basic DT support for standalone module (without a carrier board): * Memory configuration * Heartbeat led * I2C1 bus * PMIC * SATA Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- .../devicetree/bindings/arm/omap/omap.txt | 3 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 259 + 3 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index da84372..dd53c90 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -156,6 +156,9 @@ Boards: - AM437x SK EVM: AM437x StarterKit Evaluation Module compatible = "ti,am437x-sk-evm", "ti,am4372", "ti,am43" +- AM57XX CL-SOM-AM57x + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" + - DRA742 EVM: Software Development Board for DRA742 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5492a24..803a020 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -477,8 +477,9 @@ dtb-$(CONFIG_SOC_OMAP5) += \ omap5-sbc-t54.dtb \ omap5-uevm.dtb dtb-$(CONFIG_SOC_DRA7XX) += \ - dra7-evm.dtb \ am57xx-beagle-x15.dtb \ + am57xx-cl-som-am57x.dtb \ + dra7-evm.dtb \ dra72-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-lacie-d2-network.dtb \ diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts new file mode 100644 index 000..b11d7da --- /dev/null +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -0,0 +1,259 @@ +/* + * Support for CompuLab CL-SOM-AM57x System-on-Module + * + * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * Author: Dmitry Lifshitz <lifsh...@compulab.co.il> + * + * 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 +#include +#include "dra74x.dtsi" + +/ { + model = "CompuLab CL-SOM-AM57x"; + compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; + + memory { + device_type = "memory"; + reg = <0x8000 0x2000>; /* 512 MB - minimal configuration */ + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + led@0 { + label = "cl-som-am57x:green"; + gpios = < 5 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; +}; + +_pmx_core { + leds_pins_default: leds_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14) /* gpmc_a15.gpio2_5 */ + >; + }; + + i2c1_pins_default: i2c1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda.sda */ + DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl.scl */ + >; + }; + + tps659038_pins_default: tps659038_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ + >; + }; +}; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; + + tps659038: tps659038@58 { + compatible = "ti,tps659038"; + reg = <0x58>; + interrupt-parent = <>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-names = "default"; + pinctrl-0 = <
[PATCH 02/18] ARM: am57xx: cl-som-am57x: dts: add RTC support
Add EM3027 RTC chip support (over I2C4 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 21 + 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index b11d7da..773e5389 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -52,6 +52,13 @@ >; }; + i2c4_pins_default: i2c4_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36ac, PIN_INPUT| MUX_MODE10) /* mcasp1_acl.i2c4_sda */ + DRA7XX_CORE_IOPAD(0x36b0, PIN_INPUT| MUX_MODE10) /* mcasp1_fsr.i2c4_scl */ + >; + }; + tps659038_pins_default: tps659038_pins_default { pinctrl-single,pins = < DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */ @@ -257,3 +264,17 @@ status = "okay"; }; }; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <10>; + + rtc0: rtc@56 { + compatible = "emmicro,em3027"; + reg = <0x56>; + }; +}; + + -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 06/18] ARM: am57xx: cl-som-am57x: dts: add spi-flash support
On-board spi-flash chip is used as a main boot device. Add spi-flash chip support (over QSPI bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 41 +++ 1 file changed, 41 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index ed50a75..cf2328d 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -93,6 +93,17 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ >; }; + + qspi1_pins: pinmux_qspi1_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3474, PIN_INPUT | MUX_MODE1) /* gpmc_a13.qspi1_rtclk */ + DRA7XX_CORE_IOPAD(0x3480, PIN_INPUT | MUX_MODE1) /* gpmc_a16.qspi1_d0 */ + DRA7XX_CORE_IOPAD(0x3484, PIN_INPUT | MUX_MODE1) /* gpmc_a17.qspi1_d1 */ + DRA7XX_CORE_IOPAD(0x3488, PIN_INPUT | MUX_MODE1) /* qpmc_a18.qspi1_sclk */ + DRA7XX_CORE_IOPAD(0x34b8, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs2.qspi1_cs0 */ + DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ + >; + }; }; { @@ -331,3 +342,33 @@ cap-mmc-dual-data-rate; }; + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + spi_flash: spi_flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + reg = <0>; /* CS0 */ + spi-max-frequency = <2000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + + partition@0 { + label = "uboot"; + reg = <0x0 0xc>; + }; + + partition@c { + label = "uboot environment"; + reg = <0xc 0x4>; + }; + + partition@10 { + label = "reserved"; + reg = <0x10 0x0>; + }; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 09/18] ARM: am57xx: cl-som-am57x: dts: add touchscreen support
Add ADS7846 touchscreen support. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 44 +++ 1 file changed, 44 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index eba12a4..1830d4f 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -43,6 +43,13 @@ regulator-min-microvolt = <330>; regulator-max-microvolt = <330>; }; + + ads7846reg: fixedregulator-ads7846-reg { + compatible = "regulator-fixed"; + regulator-name = "ads7846-reg"; + regulator-min-microvolt = <330>; + regulator-max-microvolt = <330>; + }; }; _pmx_core { @@ -183,6 +190,12 @@ DRA7XX_CORE_IOPAD(0x3640, PIN_INPUT | MUX_MODE15) >; }; + + ads7846_pins: pinmux_ads7846_pins { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3464, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpmc_a9.gpio1_31 */ + >; + }; }; { @@ -450,6 +463,37 @@ reg = <0x10 0x0>; }; }; + + /* touch controller */ + ads7846@0 { + pinctrl-names = "default"; + pinctrl-0 = <_pins>; + + compatible = "ti,ads7846"; + vcc-supply = <>; + + reg = <1>; /* CS1 */ + spi-max-frequency = <150>; + + interrupt-parent = <>; + interrupts = <31 0>; + pendown-gpio = < 31 0>; + + + ti,x-min = /bits/ 16 <0x0>; + ti,x-max = /bits/ 16 <0x0fff>; + ti,y-min = /bits/ 16 <0x0>; + ti,y-max = /bits/ 16 <0x0fff>; + + ti,x-plate-ohms = /bits/ 16 <180>; + ti,pressure-max = /bits/ 16 <255>; + + ti,debounce-max = /bits/ 16 <30>; + ti,debounce-tol = /bits/ 16 <10>; + ti,debounce-rep = /bits/ 16 <1>; + + linux,wakeup; + }; }; { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 04/18] ARM: am57xx: cl-som-am57x: dts: add EEPROM support
On-board EEPROM chip is used for storing a board production info. Add module EEPROM support (over I2C4 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index eb9b81b..b6919a7 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -289,6 +289,12 @@ compatible = "emmicro,em3027"; reg = <0x56>; }; + + eeprom_module: atmel@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; }; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 00/18] Add support for CL-SOM-AM57X and SBC-AM57X
This patch series adds support for CompuLab CL-SOM-AM57X and SBC-AM57X boards. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. SBC-AM57x is a single board computer, implemented with the CL-SOM-AM57x computer-on-module providing most of the functions, and SB-SOM-AM57x carrier board providing additional peripheral functions and connectors. The SBC-AM57x has the following features: CPU:Texas Instruments Sitara AM5728 dual-core ARM Cortex-A15, 1.5GHz or Texas Instruments Sitara AM5718 single-core ARM Cortex-A15, 1.5GHz RAM:DDR3, 512MB – 4GB Storage:NAND flash, 512MB - 1GB or eMMC flash, 4GB - 32GB SPI-flash 2MB Ethernet: Up to 2x 10/100/1000Mbps Ethernet ports (MAC+PHY) WiFi/BT:802.11b/g/n WiFi interface (TI WiLink 8 WL1801 chipset) or Dual-band 2x2 802.11a/b/g/n WiFi interface (TI WiLink 8 WL1837 chipset) Analog Audio: Audio codec with stereo output, stereo input and microphone support More details can be found here: https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ https://www.compulab.co.il/products/sbcs/sbc-am57x-ti-am5728-am5718-single-board-computer/ This series is based on the following patch set ("Add support for sbc-t43" Nikita Kiryanov): https://www.mail-archive.com/linux-omap@vger.kernel.org/msg121614.html Dmitry Lifshitz (18): ARM: am57xx: cl-som-am57x: dts: add basic module support ARM: am57xx: cl-som-am57x: dts: add RTC support ARM: am57xx: cl-som-am57x: dts: add I2C3 support ARM: am57xx: cl-som-am57x: dts: add EEPROM support ARM: am57xx: cl-som-am57x: dts: add eMMC support ARM: am57xx: cl-som-am57x: dts: add spi-flash support ARM: am57xx: cl-som-am57x: dts: add dual EMAC support ARM: am57xx: cl-som-am57x: dts: add USB support ARM: am57xx: cl-som-am57x: dts: add touchscreen support ARM: am57xx: cl-som-am57x: dts: add analog audio support ARM: am57xx: sbc-am57x: dts: add basic board support ARM: am57xx: cl-som-am57x: dts: add MMC1 support ARM: am57xx: sbc-am57x: dts: add usb vbus pinmux ARM: am57xx: sbc-am57x: dts: add EEPROM support ARM: am57xx: sbc-am57x: dts: add GPIO extender support ARM: am57xx: sbc-am57x: dts: add LCD support ARM: am57xx: compulab-sb-som: dts: add HDMI connector ARM: am57xx: sbc-am57x: dts: add HDMI support .../devicetree/bindings/arm/omap/omap.txt | 6 + arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 606 + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 179 ++ arch/arm/boot/dts/compulab-sb-som.dtsi | 7 + 5 files changed, 801 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 03/18] ARM: am57xx: cl-som-am57x: dts: add I2C3 support
Enable I2C3 bus and add appropriate pinmux. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 14 ++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 773e5389..eb9b81b 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -52,6 +52,13 @@ >; }; + i2c3_pins_default: i2c3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36a4, PIN_INPUT| MUX_MODE10) /* mcasp1_aclkx.i2c3_sda */ + DRA7XX_CORE_IOPAD(0x36a8, PIN_INPUT| MUX_MODE10) /* mcasp1_fsx.i2c3_scl */ + >; + }; + i2c4_pins_default: i2c4_pins_default { pinctrl-single,pins = < DRA7XX_CORE_IOPAD(0x36ac, PIN_INPUT| MUX_MODE10) /* mcasp1_acl.i2c4_sda */ @@ -265,6 +272,13 @@ }; }; + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; +}; + { status = "okay"; pinctrl-names = "default"; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 14/18] ARM: am57xx: sbc-am57x: dts: add EEPROM support
On-board EEPROM chip is used for storing a board production info. Add carrier board EEPROM support (over I2C5 bus). Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 20 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index b92650b..7b65efb 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -44,6 +44,13 @@ DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */ >; }; + + i2c5_pins_default: i2c5_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x36b4, PIN_INPUT| MUX_MODE10) /* mcasp1_axr0.i2c5_sda */ + DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT| MUX_MODE10) /* mcasp1_axr1.i2c5_scl */ + >; + }; }; { @@ -71,3 +78,16 @@ pinctrl-names = "default"; pinctrl-0 = <_pins>; }; + + { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + clock-frequency = <40>; + + eeprom_base: atmel@50 { + compatible = "atmel,24c08"; + reg = <0x50>; + pagesize = <16>; + }; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 12/18] ARM: am57xx: cl-som-am57x: dts: add MMC1 support
Add MMC1 support, used for SD/MMC card. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-sbc-am57x.dts | 26 ++ 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts index 804ad72..67e7f4a 100644 --- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -24,6 +24,20 @@ DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ >; }; + + mmc1_pins_default: mmc1_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x376c, PIN_INPUT | MUX_MODE14) /* mmc1sdcd.gpio219 */ + DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */ + DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */ + DRA7XX_CORE_IOPAD(0x375c, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat0.dat0 */ + DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat1.dat1 */ + DRA7XX_CORE_IOPAD(0x3764, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat2.dat2 */ + DRA7XX_CORE_IOPAD(0x3768, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_dat3.dat3 */ + DRA7XX_CORE_IOPAD(0x3760, PIN_INPUT | MUX_MODE14) /* mmc1_sdcd.gpio6_27 */ + DRA7XX_CORE_IOPAD(0x3770, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ + >; + }; }; { @@ -34,3 +48,15 @@ pinctrl-names = "default"; pinctrl-0 = <_pins_default>; }; + + { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; + + vmmc-supply = <_reg>; + bus-width = <4>; + cd-gpios = < 27 GPIO_ACTIVE_LOW>; + wp-gpios = < 28 GPIO_ACTIVE_HIGH>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 10/18] ARM: am57xx: cl-som-am57x: dts: add analog audio support
Add analog audio DT nodes: 1. simple-audio-card node 2. wm8731 codec node 3. MCASP3 pinmux Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 67 +++ 1 file changed, 67 insertions(+) diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 1830d4f..f7bec0d 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -50,6 +50,33 @@ regulator-min-microvolt = <330>; regulator-max-microvolt = <330>; }; + + sound0: sound@0 { + compatible = "simple-audio-card"; + simple-audio-card,name = "CL-SOM-AM57x-Sound-Card"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <_master>; + simple-audio-card,frame-master = <_master>; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Microphone", "Microphone Jack", + "Line", "Line Jack"; + simple-audio-card,routing = + "Headphone Jack", "RHPOUT", + "Headphone Jack", "LHPOUT", + "LLINEIN", "Line Jack", + "MICIN", "Mic Bias", + "Mic Bias", "Microphone Jack"; + + dailink0_master: simple-audio-card,cpu { + sound-dai = <>; + }; + + simple-audio-card,codec { + sound-dai = <>; + system-clock-frequency = <1200>; + }; + }; }; _pmx_core { @@ -196,6 +223,24 @@ DRA7XX_CORE_IOPAD(0x3464, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpmc_a9.gpio1_31 */ >; }; + + mcasp3_pins_default: mcasp3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx.mcasp3_aclkx */ + DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_fsx.mcasp3_fsx */ + DRA7XX_CORE_IOPAD(0x372c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr0.mcasp3_axr0 */ + DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr1.mcasp3_axr1 */ + >; + }; + + mcasp3_pins_sleep: mcasp3_pins_sleep { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x372c, PIN_INPUT | MUX_MODE15) + DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT | MUX_MODE15) + >; + }; }; { @@ -420,6 +465,13 @@ reg = <0x50>; pagesize = <16>; }; + + wm8731: wm8731@1a { + #sound-dai-cells = <0>; + compatible = "wlf,wm8731"; + reg = <0x1a>; + status = "okay"; + }; }; { @@ -537,3 +589,18 @@ { dr_mode = "peripheral"; }; + + { + #sound-dai-cells = <0>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <_pins_default>; + pinctrl-1 = <_pins_sleep>; + status = "okay"; + + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + /* 4 serializers */ + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 1 2 0 0 + >; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 11/18] ARM: am57xx: sbc-am57x: dts: add basic board support
SBC-AM57x is a single board computer designed for industrial and embedded applications. It is based on the Texas Instruments Sitara AM57x system-on-chip family. SBC-AM57x is implemented with the CL-SOM-AM57x computer-on-module providing most of the functions, and SB-SOM-AM57x carrier board providing additional peripheral functions and connectors. https://www.compulab.co.il/products/sbcs/sbc-am57x-ti-am5728-am5718-single-board-computer/ https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5728-am5718-system-on-module/ Add basic board support, including UART3, used as a serial console. Signed-off-by: Dmitry Lifshitz <lifsh...@compulab.co.il> Acked-by: Igor Grinberg <grinb...@compulab.co.il> --- .../devicetree/bindings/arm/omap/omap.txt | 3 ++ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 36 ++ 3 files changed, 40 insertions(+) create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index dd53c90..42cdad1 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -159,6 +159,9 @@ Boards: - AM57XX CL-SOM-AM57x compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" +- AM57XX SBC-AM57x + compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7" + - DRA742 EVM: Software Development Board for DRA742 compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7" diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 803a020..4c73ab9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -479,6 +479,7 @@ dtb-$(CONFIG_SOC_OMAP5) += \ dtb-$(CONFIG_SOC_DRA7XX) += \ am57xx-beagle-x15.dtb \ am57xx-cl-som-am57x.dtb \ + am57xx-sbc-am57x.dtb \ dra7-evm.dtb \ dra72-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += \ diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts new file mode 100644 index 000..804ad72 --- /dev/null +++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts @@ -0,0 +1,36 @@ +/* + * Support for CompuLab SBC-AM57x single board computer + * + * Copyright (C) 2015 CompuLab Ltd. - http://www.compulab.co.il/ + * Author: Dmitry Lifshitz <lifsh...@compulab.co.il> + * + * 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 "am57xx-cl-som-am57x.dts" +#include "compulab-sb-som.dtsi" + +/ { + model = "CompuLab CL-SOM-AM57x on SB-SOM-AM57x"; + compatible = "compulab,sbc-am57x", "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; +}; + +_pmx_core { + uart3_pins_default: uart3_pins_default { + pinctrl-single,pins = < + DRA7XX_CORE_IOPAD(0x37f8, PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */ + DRA7XX_CORE_IOPAD(0x37fc, PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */ + >; + }; +}; + + { + status = "okay"; + interrupts-extended = <_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>, + <_pmx_core 0x3f8>; + + pinctrl-names = "default"; + pinctrl-0 = <_pins_default>; +}; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] ARM: dts: cm-t3x: add NAND support
Hi Roger, On 12/29/2014 03:06 PM, Roger Quadros wrote: Hi Dmitry, On 28/12/14 16:30, Dmitry Lifshitz wrote: CM-T3517, CM-T3530 and CM-T3730 features NAND storage chip connected to GPMC bus. Add GPMC DT entry into the root DT file omap3-cm-t3x.dtsi, common for all three modules. NAND timings are calculated to be safe for CM-T3x devices as it works now in non DT boot (in this case the timings are updated by U-Boot). I didn't get this part. You provide the GPMC timings in the DT now so they will override u-boot configured timings. In the board files for CM-T3x modules we did not override NAND timings configured in U-Boot. Now, with DT boot, we do not want to rely on boot loader settings wherever is possible. So, we specify the timings explicitly. In order to avoid regression, the timings setup is the same as we do in U-Boot. Update GPMC ranges in boards DT files to include all connected devices. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2 * Update GPMC ranges with NAND values in omap3-cm-t3x30.dtsi. * Add commit message details arch/arm/boot/dts/omap3-cm-t3x.dtsi | 58 + arch/arm/boot/dts/omap3-cm-t3x30.dtsi |3 +- arch/arm/boot/dts/omap3-sbc-t3517.dts |4 ++ arch/arm/boot/dts/omap3-sbc-t3530.dts | 10 ++ arch/arm/boot/dts/omap3-sbc-t3730.dts |5 ++- 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 6ea6d46..4d091ca 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -259,3 +259,61 @@ pinctrl-names = default; pinctrl-0 = mcbsp2_pins; }; + +gpmc { + ranges = 0 0 0x 0x0100; Isn't this ranges property redundant as it will be overridden by the board specific dts? + + nand@0,0 { + reg = 0 0 4;/* CS0, offset 0, IO size 4 */ + nand-bus-width = 8; + gpmc,device-width = 1; + ti,nand-ecc-opt = sw; any particular reason for sticking with sw? Isn't it better to use at least ham1 or migrate to stronger schemes like bch4 or bch8? ham1 scheme is compatible with ROM loader so the boot partition could be flashed from Linux. For bch4/8 you will have to keep boot partition/s locked from Linux access as we don't yet support mixed ECC schemes among partitions. The regression issue should be considered here. Our customers have thousands of boards running rootfs with sw ecc. Updating the kernel is not a reason for reformatting the NAND. + + gpmc,cs-on-ns = 0; + gpmc,cs-rd-off-ns = 120; + gpmc,cs-wr-off-ns = 120; + + gpmc,adv-on-ns = 0; + gpmc,adv-rd-off-ns = 120; + gpmc,adv-wr-off-ns = 120; + + gpmc,we-on-ns = 6; + gpmc,we-off-ns = 90; + + gpmc,oe-on-ns = 6; + gpmc,oe-off-ns = 90; + + gpmc,page-burst-access-ns = 6; + gpmc,access-ns = 72; + gpmc,cycle2cycle-delay-ns = 60; + + gpmc,rd-cycle-ns = 120; + gpmc,wr-cycle-ns = 120; + gpmc,wr-access-ns = 186; + gpmc,wr-data-mux-bus-ns = 90; + + #address-cells = 1; + #size-cells = 1; + + partition@0 { + label = xloader; + reg = 0 0x8; + }; + partition@0x8 { + label = uboot; + reg = 0x8 0x1e; + }; + partition@0x26 { + label = uboot environment; + reg = 0x26 0x4; + }; + partition@0x2a { + label = linux; + reg = 0x2a 0x40; + }; + partition@0x6a { + label = rootfs; + reg = 0x6a 0x1f88; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 9a4a3ab..d9e92b6 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -50,7 +50,8 @@ #include omap-gpmc-smsc911x.dtsi gpmc { - ranges = 5 0 0x2c00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ Isn't this ranges property redundant as it will anyways be overridden by the board specific dts? The ranges are specified here (and other files below) by design. We built a tree like structure to organize DT files - d234e4239 ARM: dts: sbc-t3x: refactor DT support It allows to inherit/override properties common for different boards. Our customers do not have to deal with a correct GPMC ranges settings, once they base
[PATCH] ARM: dts: cm-t3x: add NAND support
Add NAND support Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 58 + arch/arm/boot/dts/omap3-sbc-t3517.dts |4 ++ arch/arm/boot/dts/omap3-sbc-t3530.dts | 10 ++ arch/arm/boot/dts/omap3-sbc-t3730.dts |5 ++- 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 6ea6d46..4d091ca 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -259,3 +259,61 @@ pinctrl-names = default; pinctrl-0 = mcbsp2_pins; }; + +gpmc { + ranges = 0 0 0x 0x0100; + + nand@0,0 { + reg = 0 0 4; /* CS0, offset 0, IO size 4 */ + nand-bus-width = 8; + gpmc,device-width = 1; + ti,nand-ecc-opt = sw; + + gpmc,cs-on-ns = 0; + gpmc,cs-rd-off-ns = 120; + gpmc,cs-wr-off-ns = 120; + + gpmc,adv-on-ns = 0; + gpmc,adv-rd-off-ns = 120; + gpmc,adv-wr-off-ns = 120; + + gpmc,we-on-ns = 6; + gpmc,we-off-ns = 90; + + gpmc,oe-on-ns = 6; + gpmc,oe-off-ns = 90; + + gpmc,page-burst-access-ns = 6; + gpmc,access-ns = 72; + gpmc,cycle2cycle-delay-ns = 60; + + gpmc,rd-cycle-ns = 120; + gpmc,wr-cycle-ns = 120; + gpmc,wr-access-ns = 186; + gpmc,wr-data-mux-bus-ns = 90; + + #address-cells = 1; + #size-cells = 1; + + partition@0 { + label = xloader; + reg = 0 0x8; + }; + partition@0x8 { + label = uboot; + reg = 0x8 0x1e; + }; + partition@0x26 { + label = uboot environment; + reg = 0x26 0x4; + }; + partition@0x2a { + label = linux; + reg = 0x2a 0x40; + }; + partition@0x6a { + label = rootfs; + reg = 0x6a 0x1f88; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap3-sbc-t3517.dts b/arch/arm/boot/dts/omap3-sbc-t3517.dts index 1798653..c2d5c28 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3517.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts @@ -69,3 +69,7 @@ }; }; +gpmc { + ranges = 4 0 0x2d00 0x0100, /* SB-T35 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ +}; diff --git a/arch/arm/boot/dts/omap3-sbc-t3530.dts b/arch/arm/boot/dts/omap3-sbc-t3530.dts index c994f0f..834bc78 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3530.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3530.dts @@ -26,14 +26,10 @@ }; }; -/* - * The following ranges correspond to SMSC9x eth chips on CM-T3530 CoM and - * SB-T35 baseboard respectively. - * This setting includes both chips in SBC-T3530 board device tree. - */ gpmc { - ranges = 5 0 0x2c00 0x0100, -4 0 0x2d00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x Eth */ +4 0 0x2d00 0x0100, /* SB-T35 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ }; mmc1 { diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts index 5bdddf2..73c7bf4 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3730.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts @@ -27,8 +27,9 @@ }; gpmc { - ranges = 5 0 0x2c00 0x0100, -4 0 0x2d00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x Eth */ +4 0 0x2d00 0x0100, /* SB-T35 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ }; dss { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] ARM: dts: cm-t3x: add NAND support
CM-T3517, CM-T3530 and CM-T3730 features NAND storage chip connected to GPMC bus. Add GPMC DT entry into the root DT file omap3-cm-t3x.dtsi, common for all three modules. NAND timings are calculated to be safe for CM-T3x devices as it works now in non DT boot (in this case the timings are updated by U-Boot). Update GPMC ranges in boards DT files to include all connected devices. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2 * Update GPMC ranges with NAND values in omap3-cm-t3x30.dtsi. * Add commit message details arch/arm/boot/dts/omap3-cm-t3x.dtsi | 58 + arch/arm/boot/dts/omap3-cm-t3x30.dtsi |3 +- arch/arm/boot/dts/omap3-sbc-t3517.dts |4 ++ arch/arm/boot/dts/omap3-sbc-t3530.dts | 10 ++ arch/arm/boot/dts/omap3-sbc-t3730.dts |5 ++- 5 files changed, 70 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 6ea6d46..4d091ca 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -259,3 +259,61 @@ pinctrl-names = default; pinctrl-0 = mcbsp2_pins; }; + +gpmc { + ranges = 0 0 0x 0x0100; + + nand@0,0 { + reg = 0 0 4; /* CS0, offset 0, IO size 4 */ + nand-bus-width = 8; + gpmc,device-width = 1; + ti,nand-ecc-opt = sw; + + gpmc,cs-on-ns = 0; + gpmc,cs-rd-off-ns = 120; + gpmc,cs-wr-off-ns = 120; + + gpmc,adv-on-ns = 0; + gpmc,adv-rd-off-ns = 120; + gpmc,adv-wr-off-ns = 120; + + gpmc,we-on-ns = 6; + gpmc,we-off-ns = 90; + + gpmc,oe-on-ns = 6; + gpmc,oe-off-ns = 90; + + gpmc,page-burst-access-ns = 6; + gpmc,access-ns = 72; + gpmc,cycle2cycle-delay-ns = 60; + + gpmc,rd-cycle-ns = 120; + gpmc,wr-cycle-ns = 120; + gpmc,wr-access-ns = 186; + gpmc,wr-data-mux-bus-ns = 90; + + #address-cells = 1; + #size-cells = 1; + + partition@0 { + label = xloader; + reg = 0 0x8; + }; + partition@0x8 { + label = uboot; + reg = 0x8 0x1e; + }; + partition@0x26 { + label = uboot environment; + reg = 0x26 0x4; + }; + partition@0x2a { + label = linux; + reg = 0x2a 0x40; + }; + partition@0x6a { + label = rootfs; + reg = 0x6a 0x1f88; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 9a4a3ab..d9e92b6 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -50,7 +50,8 @@ #include omap-gpmc-smsc911x.dtsi gpmc { - ranges = 5 0 0x2c00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ smsc1: ethernet@gpmc { compatible = smsc,lan9221, smsc,lan9115; diff --git a/arch/arm/boot/dts/omap3-sbc-t3517.dts b/arch/arm/boot/dts/omap3-sbc-t3517.dts index 1798653..c2d5c28 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3517.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts @@ -69,3 +69,7 @@ }; }; +gpmc { + ranges = 4 0 0x2d00 0x0100, /* SB-T35 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ +}; diff --git a/arch/arm/boot/dts/omap3-sbc-t3530.dts b/arch/arm/boot/dts/omap3-sbc-t3530.dts index c994f0f..834bc78 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3530.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3530.dts @@ -26,14 +26,10 @@ }; }; -/* - * The following ranges correspond to SMSC9x eth chips on CM-T3530 CoM and - * SB-T35 baseboard respectively. - * This setting includes both chips in SBC-T3530 board device tree. - */ gpmc { - ranges = 5 0 0x2c00 0x0100, -4 0 0x2d00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x Eth */ +4 0 0x2d00 0x0100, /* SB-T35 SMSC9x Eth */ +0 0 0x 0x0100; /* CM-T3x NAND */ }; mmc1 { diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts index 5bdddf2..73c7bf4 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3730.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts @@ -27,8 +27,9 @@ }; gpmc { - ranges = 5 0 0x2c00 0x0100, -4 0 0x2d00 0x0100; + ranges = 5 0 0x2c00 0x0100, /* CM-T3x30 SMSC9x
[PATCH 3/4] ARM: dts: sbc-t3x: add TV out display alias
Add display alias for TV out. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-sbc-t3517.dts |1 + arch/arm/boot/dts/omap3-sbc-t3530.dts |1 + arch/arm/boot/dts/omap3-sbc-t3730.dts |1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-sbc-t3517.dts b/arch/arm/boot/dts/omap3-sbc-t3517.dts index 4ec5d86..1798653 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3517.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; /* Only one GPMC smsc9220 on SBC-T3517, CM-T3517 uses am35x Ethernet */ diff --git a/arch/arm/boot/dts/omap3-sbc-t3530.dts b/arch/arm/boot/dts/omap3-sbc-t3530.dts index 8dfc1df..c994f0f 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3530.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3530.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; }; diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts index 6b69864..5bdddf2 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3730.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/4] ARM: dts: sbc-t3x: add audio and TV out support
Add support for more SBC-T3x single board computers features: * Audio on CM-T3x30 * TV out on CM-T3x This patch set adds missing I2C1 pinmux required for CM-T3x EEPROM and CM-T3x30 audio support. Dmitry Lifshitz (4): ARM: dts: cm-t3x: add I2C1 pinmux ARM: dts: cm-t3x: add TV out support ARM: dts: sbc-t3x: add TV out display alias ARM: dts: sbc-t3x30: add audio support arch/arm/boot/dts/omap3-cm-t3x.dtsi | 48 + arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 18 arch/arm/boot/dts/omap3-sb-t35.dtsi | 16 +++ arch/arm/boot/dts/omap3-sbc-t3517.dts |1 + arch/arm/boot/dts/omap3-sbc-t3530.dts |1 + arch/arm/boot/dts/omap3-sbc-t3730.dts |1 + 6 files changed, 85 insertions(+), 0 deletions(-) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/4] ARM: dts: cm-t3x: add TV out support
Add TV out support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 22 ++ arch/arm/boot/dts/omap3-cm-t3x30.dtsi |4 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 620a3f4..63bea24 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -56,6 +56,17 @@ regulator-min-microvolt = 330; regulator-max-microvolt = 330; }; + + tv0: connector@1 { + compatible = svideo-connector; + label = tv; + + port { + tv_connector_in: endpoint { + remote-endpoint = venc_out; + }; + }; + }; }; omap3_pmx_core { @@ -221,3 +232,14 @@ linux,wakeup; }; }; + +venc { + status = ok; + + port { + venc_out: endpoint { + remote-endpoint = tv_connector_in; + ti,channels = 2; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 3cbaf98..9cc7185 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -66,6 +66,10 @@ #include twl4030_omap3.dtsi #include dt-bindings/input/input.h +venc { + vdda-supply = vdac; +}; + mmc1 { vmmc-supply = vmmc1; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/4] ARM: dts: sbc-t3x30: add audio support
Add audio related DT nodes Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 16 arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 14 ++ arch/arm/boot/dts/omap3-sb-t35.dtsi | 16 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 63bea24..6ea6d46 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -155,6 +155,15 @@ OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ ; }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */ + OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */ + OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */ + OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */ + ; + }; }; uart3 { @@ -243,3 +252,10 @@ }; }; }; + +mcbsp2 { + status = ok; + + pinctrl-names = default; + pinctrl-0 = mcbsp2_pins; +}; diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 9cc7185..9a4a3ab 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -10,6 +10,14 @@ cpu0-supply = vcc; }; }; + + sound { + compatible = ti,omap-twl4030; + ti,model = cm-t35; + + ti,mcbsp = mcbsp2; + ti,codec = twl_audio; + }; }; omap3_pmx_core { @@ -59,6 +67,12 @@ reg = 0x48; interrupts = 7; /* SYS_NIRQ cascaded to intc */ interrupt-parent = intc; + + twl_audio: audio { + compatible = ti,twl4030-audio; + codec { + }; + }; }; }; diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index aff733e..827f614 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi @@ -43,6 +43,16 @@ }; }; }; + + audio_amp: audio_amp { + compatible = regulator-fixed; + regulator-name = audio_amp; + pinctrl-names = default; + pinctrl-0 = sb_t35_audio_amp; + gpio = gpio2 29 GPIO_ACTIVE_LOW; /* gpio_61 */ + enable-active-low; + regulator-always-on; + }; }; omap3_pmx_core { @@ -65,6 +75,12 @@ OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ ; }; + + sb_t35_audio_amp: pinmux_sb_t35_audio_amp { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4) /* gpmc_nbe1.gpio_61 */ + ; + }; }; i2c3 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/4] ARM: dts: cm-t3x: add I2C1 pinmux
Add missing I2C1 pinmux setup. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 3a98ce1..620a3f4 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -137,6 +137,13 @@ OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */ ; }; + + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ + OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ + ; + }; }; uart3 { @@ -155,6 +162,9 @@ }; i2c1 { + pinctrl-names = default; + pinctrl-0 = i2c1_pins; + clock-frequency = 40; at24@50 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/9] ARM: dts: cm-t3x: add ADS7846 touchscreen support
Add ADS7846 touchscreen support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 57 +++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index e4c0c56..3636fed 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -49,6 +49,13 @@ compatible = usb-nop-xceiv; vcc-supply = hsusb2_power; }; + + ads7846reg: ads7846-reg { + compatible = regulator-fixed; + regulator-name = ads7846-reg; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + }; }; omap3_pmx_core { @@ -115,6 +122,21 @@ OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0) /* dss_data5.dss_data5 */ ; }; + + ads7846_pins: pinmux_ads7846_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20ba, PIN_INPUT_PULLUP | MUX_MODE4) /* gpmc_ncs6.gpio_57 */ + ; + }; + + mcspi1_pins: pinmux_mcspi1_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x21c8, PIN_INPUT | MUX_MODE0) /* mcspi1_clk */ + OMAP3_CORE1_IOPAD(0x21ca, PIN_INPUT | MUX_MODE0) /* mcspi1_simo */ + OMAP3_CORE1_IOPAD(0x21cc, PIN_INPUT | MUX_MODE0) /* mcspi1_somi */ + OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */ + ; + }; }; uart3 { @@ -147,3 +169,38 @@ usbhsehci { phys = hsusb1_phy hsusb2_phy; }; + +mcspi1 { + pinctrl-names = default; + pinctrl-0 = mcspi1_pins; + + /* touch controller */ + ads7846@0 { + pinctrl-names = default; + pinctrl-0 = ads7846_pins; + + compatible = ti,ads7846; + vcc-supply = ads7846reg; + + reg = 0; /* CS0 */ + spi-max-frequency = 150; + + interrupt-parent = gpio2; + interrupts = 25 0;/* gpio_57 */ + pendown-gpio = gpio2 25 0; + + ti,x-min = /bits/ 16 0x0; + ti,x-max = /bits/ 16 0x0fff; + ti,y-min = /bits/ 16 0x0; + ti,y-max = /bits/ 16 0x0fff; + + ti,x-plate-ohms = /bits/ 16 180; + ti,pressure-max = /bits/ 16 255; + + ti,debounce-max = /bits/ 16 30; + ti,debounce-tol = /bits/ 16 10; + ti,debounce-rep = /bits/ 16 1; + + linux,wakeup; + }; +}; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/9] ARM: dts: cm-t3x: cleanup comments indentation
Fix comment style Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index b074673..e4c0c56 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -107,12 +107,12 @@ dss_dpi_pins_cm_t35x: pinmux_dss_dpi_pins_cm_t35x { pinctrl-single,pins = - OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0) /* dss_data0.dss_data0 */ - OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0) /* dss_data1.dss_data1 */ - OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0) /* dss_data2.dss_data2 */ - OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0) /* dss_data3.dss_data3 */ - OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0) /* dss_data4.dss_data4 */ - OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0) /* dss_data5.dss_data5 */ + OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0) /* dss_data0.dss_data0 */ + OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0) /* dss_data1.dss_data1 */ + OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0) /* dss_data2.dss_data2 */ + OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0) /* dss_data3.dss_data3 */ + OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0) /* dss_data4.dss_data4 */ + OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0) /* dss_data5.dss_data5 */ ; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 7/9] ARM: dts: sbc-t3x: add TV out display alias
Add display alias for TV out. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-sbc-t3517.dts |1 + arch/arm/boot/dts/omap3-sbc-t3530.dts |1 + arch/arm/boot/dts/omap3-sbc-t3730.dts |1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-sbc-t3517.dts b/arch/arm/boot/dts/omap3-sbc-t3517.dts index 4ec5d86..1798653 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3517.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; /* Only one GPMC smsc9220 on SBC-T3517, CM-T3517 uses am35x Ethernet */ diff --git a/arch/arm/boot/dts/omap3-sbc-t3530.dts b/arch/arm/boot/dts/omap3-sbc-t3530.dts index 8dfc1df..c994f0f 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3530.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3530.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; }; diff --git a/arch/arm/boot/dts/omap3-sbc-t3730.dts b/arch/arm/boot/dts/omap3-sbc-t3730.dts index 6b69864..5bdddf2 100644 --- a/arch/arm/boot/dts/omap3-sbc-t3730.dts +++ b/arch/arm/boot/dts/omap3-sbc-t3730.dts @@ -11,6 +11,7 @@ aliases { display0 = dvi0; + display1 = tv0; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/9] ARM: dts: cm-t3x: add EEPROM support
Add at24 EEPROM chip support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 3636fed..58205f0 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -155,12 +155,22 @@ }; i2c1 { + pinctrl-names = default; + pinctrl-0 = i2c1_pins; + clock-frequency = 40; + + at24@50 { + compatible = at24,24c02; + pagesize = 16; + reg = 0x50; + }; }; i2c3 { clock-frequency = 40; }; + usbhshost { port1-mode = ehci-phy; port2-mode = ehci-phy; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/9] ARM: dts: sb-t35: add EEPROM support
Add at24 EEPROM chip support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-sb-t35.dtsi | 20 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index b1cb577..aff733e 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi @@ -58,6 +58,26 @@ OMAP3_CORE1_IOPAD(0x20b4, PIN_OUTPUT | MUX_MODE4) /* gpmc_ncs3.gpio_54 */ ; }; + + i2c3_pins: pinmux_i2c3_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_scl */ + OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ + ; + }; +}; + +i2c3 { + pinctrl-names = default; + pinctrl-0 = i2c3_pins; + + clock-frequency = 40; + + at24@50 { + compatible = at24,24c02; + pagesize = 16; + reg = 0x50; + }; }; gpmc { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 9/9] ARM: dts: cm-t3x30: add keypad support
Add twl4030 matrtix keypad support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 17 + 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index bcd896f..3a91204 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -78,6 +78,7 @@ #include twl4030.dtsi #include twl4030_omap3.dtsi +#include dt-bindings/input/input.h mmc1 { vmmc-supply = vmmc1; @@ -89,6 +90,22 @@ ti,pullups = 0x01; }; +twl_keypad { + linux,keymap = + MATRIX_KEY(0x00, 0x01, KEY_A) + MATRIX_KEY(0x00, 0x02, KEY_B) + MATRIX_KEY(0x00, 0x03, KEY_LEFT) + + MATRIX_KEY(0x01, 0x01, KEY_UP) + MATRIX_KEY(0x01, 0x02, KEY_ENTER) + MATRIX_KEY(0x01, 0x03, KEY_DOWN) + + MATRIX_KEY(0x02, 0x01, KEY_RIGHT) + MATRIX_KEY(0x02, 0x02, KEY_C) + MATRIX_KEY(0x02, 0x03, KEY_D) + ; +}; + hsusb1_phy { reset-gpios = twl_gpio 6 GPIO_ACTIVE_LOW; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 8/9] ARM: dts: sbc-t3x30: add audio support
Add audio related DT nodes Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 16 arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 14 ++ arch/arm/boot/dts/omap3-sb-t35.dtsi | 16 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 1a8262c..7e510e0 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -148,6 +148,15 @@ OMAP3_CORE1_IOPAD(0x21ce, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcspi1_cs0 */ ; }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0) /* mcbsp2_fsx */ + OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0) /* mcbsp2_clkx */ + OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0) /* mcbsp2_dr */ + OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0) /* mcbsp2_dx */ + ; + }; }; uart3 { @@ -238,3 +247,10 @@ }; }; }; + +mcbsp2 { + status = ok; + + pinctrl-names = default; + pinctrl-0 = mcbsp2_pins; +}; diff --git a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi index 25ba083..bcd896f 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x30.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x30.dtsi @@ -10,6 +10,14 @@ cpu0-supply = vcc; }; }; + + sound { + compatible = ti,omap-twl4030; + ti,model = cm-t35; + + ti,mcbsp = mcbsp2; + ti,codec = twl_audio; + }; }; omap3_pmx_core { @@ -59,6 +67,12 @@ reg = 0x48; interrupts = 7; /* SYS_NIRQ cascaded to intc */ interrupt-parent = intc; + + twl_audio: audio { + compatible = ti,twl4030-audio; + codec { + }; + }; }; }; diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi index aff733e..827f614 100644 --- a/arch/arm/boot/dts/omap3-sb-t35.dtsi +++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi @@ -43,6 +43,16 @@ }; }; }; + + audio_amp: audio_amp { + compatible = regulator-fixed; + regulator-name = audio_amp; + pinctrl-names = default; + pinctrl-0 = sb_t35_audio_amp; + gpio = gpio2 29 GPIO_ACTIVE_LOW; /* gpio_61 */ + enable-active-low; + regulator-always-on; + }; }; omap3_pmx_core { @@ -65,6 +75,12 @@ OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */ ; }; + + sb_t35_audio_amp: pinmux_sb_t35_audio_amp { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20c8, PIN_OUTPUT | MUX_MODE4) /* gpmc_nbe1.gpio_61 */ + ; + }; }; i2c3 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/9] ARM: dts: sbc-t3x: add more features support
Add support for more SBC-T3x single board computers features: * CM-T3x CoM and SB-T35 baseboard EEPROMs * TV out * Touchscreen * CM-T3x30 audio * CM-T3x30 keypad Dmitry Lifshitz (9): ARM: dts: cm-t3x: cleanup comments indentation ARM: dts: cm-t3x: add ADS7846 touchscreen support ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk ARM: dts: cm-t3x: add EEPROM support ARM: dts: sb-t35: add EEPROM support ARM: dts: cm-t3x: add TV out support ARM: dts: sbc-t3x: add TV out display alias ARM: dts: sbc-t3x30: add audio support ARM: dts: cm-t3x30: add keypad support arch/arm/boot/dts/omap3-cm-t3x.dtsi | 119 +++-- arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 31 + arch/arm/boot/dts/omap3-sb-t35.dtsi | 36 ++ arch/arm/boot/dts/omap3-sbc-t3517.dts |1 + arch/arm/boot/dts/omap3-sbc-t3530.dts |1 + arch/arm/boot/dts/omap3-sbc-t3730.dts |1 + arch/arm/mach-omap2/pdata-quirks.c|3 - 7 files changed, 183 insertions(+), 9 deletions(-) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/9] ARM: dts: cm-t3x: add TV out support
Add TV out support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 24 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index 58205f0..1a8262c 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -56,6 +56,17 @@ regulator-min-microvolt = 330; regulator-max-microvolt = 330; }; + + tv0: connector@1 { + compatible = svideo-connector; + label = tv; + + port { + tv_connector_in: endpoint { + remote-endpoint = venc_out; + }; + }; + }; }; omap3_pmx_core { @@ -214,3 +225,16 @@ linux,wakeup; }; }; + +venc { + status = ok; + + vdda-supply = vdac; + + port { + venc_out: endpoint { + remote-endpoint = tv_connector_in; + ti,channels = 2; + }; + }; +}; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/9] ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk
Remove ADS7846 touchscreen pdata quirk for CM-T3x CoMs Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/mach-omap2/pdata-quirks.c |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index e72f0fc..02080c0 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -131,13 +131,11 @@ static void __init omap3_sbc_t3730_legacy_init(void) { omap3_sbc_t3x_usb_hub_init(167, sb-t35 usb hub); legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136); - omap_ads7846_init(1, 57, 0, NULL); } static void __init omap3_sbc_t3530_legacy_init(void) { omap3_sbc_t3x_usb_hub_init(167, sb-t35 usb hub); - omap_ads7846_init(1, 57, 0, NULL); } struct ti_st_plat_data wilink_pdata = { @@ -249,7 +247,6 @@ static void __init omap3_sbc_t3517_legacy_init(void) hsmmc2_internal_input_clk(); omap3_sbc_t3517_wifi_init(); legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 145); - omap_ads7846_init(1, 57, 0, NULL); } static void __init am3517_evm_legacy_init(void) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] ARM: dts: sbc-t3x: add DVI display data
Add DSS related pinmux and display data nodes required to support DVI video out on SBC-T3530, SBC-T3730 and SBC-T3517. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: * Make use of OMAP3_WKUP_IOPAD() macro * Move common DSS pinmux of CM-T3517 and CM-T3530 into omap3-cm-t3x.dtsi. arch/arm/boot/dts/omap3-cm-t3517.dts | 11 +++ arch/arm/boot/dts/omap3-cm-t3530.dts | 11 +++ arch/arm/boot/dts/omap3-cm-t3730.dts | 24 arch/arm/boot/dts/omap3-cm-t3x.dtsi | 39 ++ arch/arm/boot/dts/omap3-sb-t35.dtsi | 49 + arch/arm/boot/dts/omap3-sbc-t3517.dts | 14 + arch/arm/boot/dts/omap3-sbc-t3530.dts | 14 + arch/arm/boot/dts/omap3-sbc-t3730.dts | 14 + 8 files changed, 176 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts index d00502f..0ab748c 100644 --- a/arch/arm/boot/dts/omap3-cm-t3517.dts +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts @@ -134,3 +134,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t35x + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3530.dts b/arch/arm/boot/dts/omap3-cm-t3530.dts index d145849..8dd14fc 100644 --- a/arch/arm/boot/dts/omap3-cm-t3530.dts +++ b/arch/arm/boot/dts/omap3-cm-t3530.dts @@ -46,3 +46,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t35x + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts index b3f9a50..46eadb2 100644 --- a/arch/arm/boot/dts/omap3-cm-t3730.dts +++ b/arch/arm/boot/dts/omap3-cm-t3730.dts @@ -31,6 +31,19 @@ }; }; +omap3_pmx_wkup { + dss_dpi_pins_cm_t3730: pinmux_dss_dpi_pins_cm_t3730 { + pinctrl-single,pins = + OMAP3_WKUP_IOPAD(0x2a08, PIN_OUTPUT | MUX_MODE3) /* sys_boot0.dss_data18 */ + OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE3) /* sys_boot1.dss_data19 */ + OMAP3_WKUP_IOPAD(0x2a10, PIN_OUTPUT | MUX_MODE3) /* sys_boot3.dss_data20 */ + OMAP3_WKUP_IOPAD(0x2a12, PIN_OUTPUT | MUX_MODE3) /* sys_boot4.dss_data21 */ + OMAP3_WKUP_IOPAD(0x2a14, PIN_OUTPUT | MUX_MODE3) /* sys_boot5.dss_data22 */ + OMAP3_WKUP_IOPAD(0x2a16, PIN_OUTPUT | MUX_MODE3) /* sys_boot6.dss_data23 */ + ; + }; +}; + omap3_pmx_core { mmc2_pins: pinmux_mmc2_pins { @@ -61,3 +74,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t3730 + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index c671a22..b074673 100644 --- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi +++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi @@ -76,6 +76,45 @@ OMAP3_CORE1_IOPAD(0x21e2, PIN_OUTPUT | MUX_MODE4) /* sys_clkout2.gpio_186 */ ; }; + + dss_dpi_pins_common: pinmux_dss_dpi_pins_common { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */ + OMAP3_CORE1_IOPAD(0x20d6, PIN_OUTPUT | MUX_MODE0) /* dss_hsync.dss_hsync */ + OMAP3_CORE1_IOPAD(0x20d8, PIN_OUTPUT | MUX_MODE0) /* dss_vsync.dss_vsync */ + OMAP3_CORE1_IOPAD(0x20da, PIN_OUTPUT | MUX_MODE0) /* dss_acbias.dss_acbias */ + + OMAP3_CORE1_IOPAD(0x20e8, PIN_OUTPUT | MUX_MODE0) /* dss_data6.dss_data6 */ + OMAP3_CORE1_IOPAD(0x20ea, PIN_OUTPUT | MUX_MODE0) /* dss_data7.dss_data7 */ + OMAP3_CORE1_IOPAD(0x20ec, PIN_OUTPUT | MUX_MODE0) /* dss_data8.dss_data8 */ + OMAP3_CORE1_IOPAD(0x20ee, PIN_OUTPUT | MUX_MODE0) /* dss_data9.dss_data9 */ + OMAP3_CORE1_IOPAD(0x20f0, PIN_OUTPUT | MUX_MODE0) /* dss_data10.dss_data10 */ + OMAP3_CORE1_IOPAD(0x20f2, PIN_OUTPUT | MUX_MODE0) /* dss_data11.dss_data11 */ + OMAP3_CORE1_IOPAD(0x20f4, PIN_OUTPUT | MUX_MODE0) /* dss_data12.dss_data12 */ + OMAP3_CORE1_IOPAD(0x20f6, PIN_OUTPUT | MUX_MODE0) /* dss_data13.dss_data13 */ + OMAP3_CORE1_IOPAD(0x20f8, PIN_OUTPUT | MUX_MODE0) /* dss_data14.dss_data14 */ + OMAP3_CORE1_IOPAD(0x20fa
[PATCH] ARM: dts: sbc-t3x: add DVI display data
Add DSS related pinmux and display data nodes required to support DVI video out on SBC-T3530, SBC-T3730 and SBC-T3517. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap3-cm-t3517.dts | 22 +++ arch/arm/boot/dts/omap3-cm-t3530.dts | 22 +++ arch/arm/boot/dts/omap3-cm-t3730.dts | 24 arch/arm/boot/dts/omap3-cm-t3x.dtsi | 28 +++ arch/arm/boot/dts/omap3-sb-t35.dtsi | 49 + arch/arm/boot/dts/omap3-sbc-t3517.dts | 14 + arch/arm/boot/dts/omap3-sbc-t3530.dts | 14 + arch/arm/boot/dts/omap3-sbc-t3730.dts | 14 + 8 files changed, 187 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts index d00502f..65abe17 100644 --- a/arch/arm/boot/dts/omap3-cm-t3517.dts +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts @@ -93,6 +93,17 @@ OMAP3_CORE1_IOPAD(0x2184, PIN_OUTPUT | MUX_MODE4) /* mcbsp4_clkx.gpio_152 - USB HUB RST */ ; }; + + dss_dpi_pins_cm_t3517: pinmux_dss_dpi_pins_cm_t3517 { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0) /* dss_data0.dss_data0 */ + OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0) /* dss_data1.dss_data1 */ + OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0) /* dss_data2.dss_data2 */ + OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0) /* dss_data3.dss_data3 */ + OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0) /* dss_data4.dss_data4 */ + OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0) /* dss_data5.dss_data5 */ + ; + }; }; hsusb1_phy { @@ -134,3 +145,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t3517 + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3530.dts b/arch/arm/boot/dts/omap3-cm-t3530.dts index d145849..c1465a4 100644 --- a/arch/arm/boot/dts/omap3-cm-t3530.dts +++ b/arch/arm/boot/dts/omap3-cm-t3530.dts @@ -36,6 +36,17 @@ OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT | MUX_MODE1) /* sdmmc2_dat7.sdmmc2_clkin */ ; }; + + dss_dpi_pins_cm_t3530: pinmux_dss_dpi_pins_cm_t3530 { + pinctrl-single,pins = + OMAP3_CORE1_IOPAD(0x20dc, PIN_OUTPUT | MUX_MODE0) /* dss_data0.dss_data0 */ + OMAP3_CORE1_IOPAD(0x20de, PIN_OUTPUT | MUX_MODE0) /* dss_data1.dss_data1 */ + OMAP3_CORE1_IOPAD(0x20e0, PIN_OUTPUT | MUX_MODE0) /* dss_data2.dss_data2 */ + OMAP3_CORE1_IOPAD(0x20e2, PIN_OUTPUT | MUX_MODE0) /* dss_data3.dss_data3 */ + OMAP3_CORE1_IOPAD(0x20e4, PIN_OUTPUT | MUX_MODE0) /* dss_data4.dss_data4 */ + OMAP3_CORE1_IOPAD(0x20e6, PIN_OUTPUT | MUX_MODE0) /* dss_data5.dss_data5 */ + ; + }; }; mmc2 { @@ -46,3 +57,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t3530 + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts index b3f9a50..4b36d80 100644 --- a/arch/arm/boot/dts/omap3-cm-t3730.dts +++ b/arch/arm/boot/dts/omap3-cm-t3730.dts @@ -31,6 +31,19 @@ }; }; +omap3_pmx_wkup { + dss_dpi_pins_cm_t3730: pinmux_dss_dpi_pins_cm_t3730 { + pinctrl-single,pins = + 0x0a (PIN_OUTPUT | MUX_MODE3) /* sys_boot0.dss_data18 */ + 0x0c (PIN_OUTPUT | MUX_MODE3) /* sys_boot1.dss_data19 */ + 0x10 (PIN_OUTPUT | MUX_MODE3) /* sys_boot3.dss_data20 */ + 0x12 (PIN_OUTPUT | MUX_MODE3) /* sys_boot4.dss_data21 */ + 0x14 (PIN_OUTPUT | MUX_MODE3) /* sys_boot5.dss_data22 */ + 0x16 (PIN_OUTPUT | MUX_MODE3) /* sys_boot6.dss_data23 */ + ; + }; +}; + omap3_pmx_core { mmc2_pins: pinmux_mmc2_pins { @@ -61,3 +74,14 @@ bus-width = 4; cap-power-off-card; }; + +dss { + status = ok; + + pinctrl-names = default; + pinctrl-0 = + dss_dpi_pins_common + dss_dpi_pins_cm_t3730 + ; +}; + diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi index c671a22..6b6c2f4 100644
[PATCH v2 3/6] ARM: dts: cm-t54: add HDMI/DVI display data
Add DSS related pinmux and display data nodes required to support HDMI and DVI video out on CM-T54. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: * Fixed comment style issue for mux mode. Follow the convention mode0_name.modeX_name for pins which mux mode differs from MUX_MODE0 * Moved aliases node to the top of dts file arch/arm/boot/dts/omap5-cm-t54.dts | 158 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 44a9f23..d2f241d 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -16,6 +16,11 @@ reg = 0x8000 0x7F00; /* 2048 MB */ }; + aliases { + display0 = hdmi0; + display1 = dvi0; + }; + vmmcsd_fixed: fixed-regulator-mmcsd { compatible = regulator-fixed; regulator-name = vmmcsd_fixed; @@ -66,6 +71,64 @@ default-state = off; }; }; + + hdmi0: connector@0 { + compatible = hdmi-connector; + label = hdmi; + + type = a; + + pinctrl-names = default; + pinctrl-0 = hdmi_conn_pins; + + hpd-gpios = gpio7 1 GPIO_ACTIVE_HIGH; /* GPIO 193, HPD */ + + port { + hdmi_connector_in: endpoint { + remote-endpoint = hdmi_out; + }; + }; + }; + + tfp410: encoder@0 { + compatible = ti,tfp410; + + ports { + #address-cells = 1; + #size-cells = 0; + + port@0 { + reg = 0; + + tfp410_in: endpoint@0 { + remote-endpoint = dpi_dvi_out; + }; + }; + + port@1 { + reg = 1; + + tfp410_out: endpoint@0 { + remote-endpoint = dvi_connector_in; + }; + }; + }; + }; + + dvi0: connector@1 { + compatible = dvi-connector; + label = dvi; + + digital; + + ddc-i2c-bus = i2c2; + + port { + dvi_connector_in: endpoint { + remote-endpoint = tfp410_out; + }; + }; + }; }; omap5_pmx_core { @@ -88,6 +151,13 @@ ; }; + i2c2_pins: pinmux_i2c2_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x01b8, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ + OMAP5_IOPAD(0x01ba, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ + ; + }; + mmc1_pins: pinmux_mmc1_pins { pinctrl-single,pins = OMAP5_IOPAD(0x01e2, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_clk */ @@ -144,6 +214,53 @@ OMAP5_IOPAD(0x00b6, PIN_OUTPUT | MUX_MODE6) /* hsi2_acdata.gpio3_83 */ ; }; + + dss_hdmi_pins: pinmux_dss_hdmi_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x013c, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec */ + OMAP5_IOPAD(0x0140, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_scl */ + OMAP5_IOPAD(0x0142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda */ + ; + }; + + hdmi_conn_pins: pinmux_hdmi_conn_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x013e, PIN_INPUT | MUX_MODE6) /* hdmi_hpd.gpio7_193 */ + ; + }; + + dss_dpi_pins: pinmux_dss_dpi_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x0104, PIN_OUTPUT | MUX_MODE3) /* rfbi_data15.dispc_data15 */ + OMAP5_IOPAD(0x0106, PIN_OUTPUT | MUX_MODE3) /* rfbi_data14.dispc_data14 */ + OMAP5_IOPAD(0x0108, PIN_OUTPUT | MUX_MODE3) /* rfbi_data13.dispc_data13 */ + OMAP5_IOPAD(0x010a, PIN_OUTPUT | MUX_MODE3) /* rfbi_data12.dispc_data12 */ + OMAP5_IOPAD(0x010c, PIN_OUTPUT | MUX_MODE3) /* rfbi_data11.dispc_data11 */ + OMAP5_IOPAD(0x010e, PIN_OUTPUT | MUX_MODE3) /* rfbi_data10.dispc_data10 */ + OMAP5_IOPAD(0x0110, PIN_OUTPUT | MUX_MODE3) /* rfbi_data9.dispc_data9 */ + OMAP5_IOPAD(0x0112, PIN_OUTPUT | MUX_MODE3) /* rfbi_data8.dispc_data8 */ + OMAP5_IOPAD(0x0114, PIN_OUTPUT | MUX_MODE3) /* rfbi_data7.dispc_data7 */ + OMAP5_IOPAD(0x0116
[PATCH v2 5/6] ARM: dts: cm-t54: add ADS7846 touchscreen support
Add ADS7846 touchscreen support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: Fixed comment style issue for mux mode. arch/arm/boot/dts/omap5-cm-t54.dts | 61 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index e7afeb4..de76550 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -51,6 +51,13 @@ enable-active-high; }; + ads7846reg: ads7846-reg { + compatible = regulator-fixed; + regulator-name = ads7846-reg; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + }; + /* HS USB Host PHY on PORT 2 */ hsusb2_phy: hsusb2_phy { compatible = usb-nop-xceiv; @@ -164,6 +171,15 @@ }; }; +omap5_pmx_wkup { + + ads7846_pins: pinmux_ads7846_pins { + pinctrl-single,pins = + 0x02 (PIN_INPUT_PULLDOWN | MUX_MODE6) /* llib_wakereqin.gpio1_wk15 */ + ; + }; +}; + omap5_pmx_core { pinctrl-names = default; pinctrl-0 = @@ -300,6 +316,51 @@ OMAP5_IOPAD(0x013a, PIN_OUTPUT | MUX_MODE3) /* gpio6_187.dispc_data23 */ ; }; + + mcspi2_pins: pinmux_mcspi1_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x00fc, PIN_INPUT | MUX_MODE0) /* mcspi2_clk */ + OMAP5_IOPAD(0x00fe, PIN_INPUT | MUX_MODE0) /* mcspi2_simo */ + OMAP5_IOPAD(0x0100, PIN_INPUT | MUX_MODE0) /* mcspi2_somi */ + OMAP5_IOPAD(0x0102, PIN_INPUT | MUX_MODE0) /* mcspi2_cs0 */ + ; + }; +}; + +mcspi2 { + pinctrl-names = default; + pinctrl-0 = mcspi2_pins; + + /* touch controller */ + ads7846@0 { + pinctrl-names = default; + pinctrl-0 = ads7846_pins; + + compatible = ti,ads7846; + vcc-supply = ads7846reg; + + reg = 0; /* CS0 */ + spi-max-frequency = 150; + + interrupt-parent = gpio1; + interrupts = 15 0;/* gpio1_wk15 */ + pendown-gpio = gpio1 15 0; + + + ti,x-min = /bits/ 16 0x0; + ti,x-max = /bits/ 16 0x0fff; + ti,y-min = /bits/ 16 0x0; + ti,y-max = /bits/ 16 0x0fff; + + ti,x-plate-ohms = /bits/ 16 180; + ti,pressure-max = /bits/ 16 255; + + ti,debounce-max = /bits/ 16 30; + ti,debounce-tol = /bits/ 16 10; + ti,debounce-rep = /bits/ 16 1; + + linux,wakeup; + }; }; mmc1 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 6/6] ARM: dts: cm-t54: setup omap_dwc3
Add extcon and vbus-supply properties of DWC3 node. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: No changes arch/arm/boot/dts/omap5-cm-t54.dts |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index de76550..f712e23 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -631,6 +631,11 @@ phys = 0 hsusb2_phy hsusb3_phy; }; +usb3 { + extcon = extcon_usb3; + vbus-supply = smps10_out1_reg; +}; + cpu0 { cpu0-supply = smps123_reg; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 2/6] ARM: dts: cm-t54: fix mux mode comment style
Follow the comment style of mode0_name.modeX_name for pins which mux mode differs from MUX_MODE0. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: New patch arch/arm/boot/dts/omap5-cm-t54.dts |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 429471a..44a9f23 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -127,8 +127,8 @@ wlan_gpios_pins: pinmux_wlan_gpios_pins { pinctrl-single,pins = - OMAP5_IOPAD(0x019c, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* gpio4_109 */ - OMAP5_IOPAD(0x019e, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* gpio4_110 */ + OMAP5_IOPAD(0x019c, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* abemcpdm_ul_data.gpio4_109 */ + OMAP5_IOPAD(0x019e, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* abemcpdm_dl_data.gpio4_110 */ ; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/6] ARM: dts: sbc-t54: fix mux mode comment style
Follow the comment style of mode0_name.modeX_name for pins which mux mode differs from MUX_MODE0. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: New patch arch/arm/boot/dts/omap5-sbc-t54.dts |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap5-sbc-t54.dts b/arch/arm/boot/dts/omap5-sbc-t54.dts index 8e89793..337bbbc 100644 --- a/arch/arm/boot/dts/omap5-sbc-t54.dts +++ b/arch/arm/boot/dts/omap5-sbc-t54.dts @@ -19,8 +19,8 @@ mmc1_aux_pins: pinmux_mmc1_aux_pins { pinctrl-single,pins = - OMAP5_IOPAD(0x0174, PIN_INPUT_PULLUP | MUX_MODE6) /* gpio8_228 */ - OMAP5_IOPAD(0x0176, PIN_INPUT_PULLUP | MUX_MODE6) /* gpio8_229 */ + OMAP5_IOPAD(0x0174, PIN_INPUT_PULLUP | MUX_MODE6) /* timer5_pwm_evt.gpio8_228 */ + OMAP5_IOPAD(0x0176, PIN_INPUT_PULLUP | MUX_MODE6) /* timer6_pwm_evt.gpio8_229 */ ; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/6] ARM: dts: cm-t54: enable video out, touchscreen and USB3.0
Add CM-T54 DT nodes: * enable HDMI/DVI/LCD video output support * add ADS7846 touchscreen support * enchance DWC3 setup to enable power supply for USB3.0 OTG port v2: * Fixed comment style issue for mux mode. Follow the convention mode0_name.modeX_name for pins which mux mode differs from MUX_MODE0 * Moved aliases node to the top of dts file Dmitry Lifshitz (6): ARM: dts: sbc-t54: fix mux mode comment style ARM: dts: cm-t54: fix mux mode comment style ARM: dts: cm-t54: add HDMI/DVI display data ARM: dts: cm-t54: add Startek LCD support ARM: dts: cm-t54: add ADS7846 touchscreen support ARM: dts: cm-t54: setup omap_dwc3 arch/arm/boot/dts/omap5-cm-t54.dts | 272 ++- arch/arm/boot/dts/omap5-sbc-t54.dts |4 +- 2 files changed, 272 insertions(+), 4 deletions(-) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 4/6] ARM: dts: cm-t54: add Startek LCD support
Add DT support for Startek KD050C LCD 800x480 panel. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- v2: Rebased on top of the previous patch changes arch/arm/boot/dts/omap5-cm-t54.dts | 44 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index d2f241d..e7afeb4 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -19,6 +19,7 @@ aliases { display0 = hdmi0; display1 = dvi0; + display2 = lcd0; }; vmmcsd_fixed: fixed-regulator-mmcsd { @@ -72,6 +73,38 @@ }; }; + lcd0: display { +compatible = startek,startek-kd050c, panel-dpi; +label = lcd; + +pinctrl-names = default; +pinctrl-0 = lcd_pins; + +enable-gpios = gpio8 3 GPIO_ACTIVE_HIGH; + +panel-timing { +clock-frequency = 3300; +hactive = 800; +vactive = 480; +hfront-porch = 40; +hback-porch = 40; +hsync-len = 43; +vback-porch = 29; +vfront-porch = 13; +vsync-len = 3; +hsync-active = 0; +vsync-active = 0; +de-active = 1; +pixelclk-active = 1; +}; + +port { +lcd_in: endpoint { +remote-endpoint = dpi_lcd_out; +}; +}; +}; + hdmi0: connector@0 { compatible = hdmi-connector; label = hdmi; @@ -223,6 +256,12 @@ ; }; + lcd_pins: pinmux_lcd_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x0172, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* timer11_pwm_evt.gpio8_227 */ + ; + }; + hdmi_conn_pins: pinmux_hdmi_conn_pins { pinctrl-single,pins = OMAP5_IOPAD(0x013e, PIN_INPUT | MUX_MODE6) /* hdmi_hpd.gpio7_193 */ @@ -546,6 +585,11 @@ remote-endpoint = tfp410_in; data-lines = 24; }; + + dpi_lcd_out: endpoint@1 { + remote-endpoint = lcd_in; + data-lines = 24; + }; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/4] ARM: dts: cm-t54: add HDMI/DVI display data
Add DSS related pinmux and display data nodes required to support HDMI and DVI video out on CM-T54. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts | 158 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 429471a..9cb40d6 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -66,6 +66,69 @@ default-state = off; }; }; + + aliases { + display0 = hdmi0; + display1 = dvi0; + }; + + hdmi0: connector@0 { + compatible = hdmi-connector; + label = hdmi; + + type = a; + + pinctrl-names = default; + pinctrl-0 = hdmi_conn_pins; + + hpd-gpios = gpio7 1 GPIO_ACTIVE_HIGH; /* GPIO 193, HPD */ + + port { + hdmi_connector_in: endpoint { + remote-endpoint = hdmi_out; + }; + }; + }; + + tfp410: encoder@0 { + compatible = ti,tfp410; + + ports { + #address-cells = 1; + #size-cells = 0; + + port@0 { + reg = 0; + + tfp410_in: endpoint@0 { + remote-endpoint = dpi_dvi_out; + }; + }; + + port@1 { + reg = 1; + + tfp410_out: endpoint@0 { + remote-endpoint = dvi_connector_in; + }; + }; + }; + }; + + dvi0: connector@1 { + compatible = dvi-connector; + label = dvi; + + digital; + + ddc-i2c-bus = i2c2; + + port { + dvi_connector_in: endpoint { + remote-endpoint = tfp410_out; + }; + }; + }; }; omap5_pmx_core { @@ -88,6 +151,13 @@ ; }; + i2c2_pins: pinmux_i2c2_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x01b8, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ + OMAP5_IOPAD(0x01ba, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ + ; + }; + mmc1_pins: pinmux_mmc1_pins { pinctrl-single,pins = OMAP5_IOPAD(0x01e2, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_clk */ @@ -144,6 +214,53 @@ OMAP5_IOPAD(0x00b6, PIN_OUTPUT | MUX_MODE6) /* hsi2_acdata.gpio3_83 */ ; }; + + dss_hdmi_pins: pinmux_dss_hdmi_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x013c, PIN_INPUT_PULLUP | MUX_MODE0) /* hdmi_cec.hdmi_cec */ + OMAP5_IOPAD(0x0140, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_scl.hdmi_ddc_scl */ + OMAP5_IOPAD(0x0142, PIN_INPUT | MUX_MODE0) /* hdmi_ddc_sda.hdmi_ddc_sda */ + ; + }; + + hdmi_conn_pins: pinmux_hdmi_conn_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x013e, PIN_INPUT | MUX_MODE6) /* hdmi_hpd.gpio7_193 */ + ; + }; + + dss_dpi_pins: pinmux_dss_dpi_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x0104, PIN_OUTPUT | MUX_MODE3) /* dispc_data15 */ + OMAP5_IOPAD(0x0106, PIN_OUTPUT | MUX_MODE3) /* dispc_data14 */ + OMAP5_IOPAD(0x0108, PIN_OUTPUT | MUX_MODE3) /* dispc_data13 */ + OMAP5_IOPAD(0x010a, PIN_OUTPUT | MUX_MODE3) /* dispc_data12 */ + OMAP5_IOPAD(0x010c, PIN_OUTPUT | MUX_MODE3) /* dispc_data11 */ + OMAP5_IOPAD(0x010e, PIN_OUTPUT | MUX_MODE3) /* dispc_data10 */ + OMAP5_IOPAD(0x0110, PIN_OUTPUT | MUX_MODE3) /* dispc_data9 */ + OMAP5_IOPAD(0x0112, PIN_OUTPUT | MUX_MODE3) /* dispc_data8 */ + OMAP5_IOPAD(0x0114, PIN_OUTPUT | MUX_MODE3) /* dispc_data7 */ + OMAP5_IOPAD(0x0116, PIN_OUTPUT | MUX_MODE3) /* dispc_data6 */ + OMAP5_IOPAD(0x0118, PIN_OUTPUT | MUX_MODE3) /* dispc_data5 */ + OMAP5_IOPAD(0x011a, PIN_OUTPUT | MUX_MODE3) /* dispc_data4 */ + OMAP5_IOPAD(0x011c, PIN_OUTPUT | MUX_MODE3) /* dispc_data3 */ + OMAP5_IOPAD(0x011e, PIN_OUTPUT | MUX_MODE3) /* dispc_data2 */ + OMAP5_IOPAD(0x0120, PIN_OUTPUT | MUX_MODE3) /* dispc_data1
[PATCH 4/4] ARM: dts: cm-t54: setup omap_dwc3
Add extcon and vbus-supply properties of DWC3 node. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 9cfcad5..855cb88a 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -631,6 +631,11 @@ phys = 0 hsusb2_phy hsusb3_phy; }; +usb3 { + extcon = extcon_usb3; + vbus-supply = smps10_out1_reg; +}; + cpu0 { cpu0-supply = smps123_reg; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/4] ARM: dts: cm-t54: add Startek LCD support
Add DT support for Startek KD050C LCD 800x480 panel. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts | 44 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 9cb40d6..588cc2a 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -70,8 +70,41 @@ aliases { display0 = hdmi0; display1 = dvi0; + display2 = lcd0; }; + lcd0: display { +compatible = startek,startek-kd050c, panel-dpi; +label = lcd; + +pinctrl-names = default; +pinctrl-0 = lcd_pins; + +enable-gpios = gpio8 3 GPIO_ACTIVE_HIGH; + +panel-timing { +clock-frequency = 3300; +hactive = 800; +vactive = 480; +hfront-porch = 40; +hback-porch = 40; +hsync-len = 43; +vback-porch = 29; +vfront-porch = 13; +vsync-len = 3; +hsync-active = 0; +vsync-active = 0; +de-active = 1; +pixelclk-active = 1; +}; + +port { +lcd_in: endpoint { +remote-endpoint = dpi_lcd_out; +}; +}; +}; + hdmi0: connector@0 { compatible = hdmi-connector; label = hdmi; @@ -223,6 +256,12 @@ ; }; + lcd_pins: pinmux_lcd_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x0172, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* timer11_pwm_evt.gpio8_227 */ + ; + }; + hdmi_conn_pins: pinmux_hdmi_conn_pins { pinctrl-single,pins = OMAP5_IOPAD(0x013e, PIN_INPUT | MUX_MODE6) /* hdmi_hpd.gpio7_193 */ @@ -546,6 +585,11 @@ remote-endpoint = tfp410_in; data-lines = 24; }; + + dpi_lcd_out: endpoint@1 { + remote-endpoint = lcd_in; + data-lines = 24; + }; }; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] ARM: dts: cm-t54: add ADS7846 touchscreen support
Add ADS7846 touchscreen support. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts | 61 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 588cc2a..9cfcad5 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -45,6 +45,13 @@ enable-active-high; }; + ads7846reg: ads7846-reg { + compatible = regulator-fixed; + regulator-name = ads7846-reg; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + }; + /* HS USB Host PHY on PORT 2 */ hsusb2_phy: hsusb2_phy { compatible = usb-nop-xceiv; @@ -164,6 +171,15 @@ }; }; +omap5_pmx_wkup { + + ads7846_pins: pinmux_ads7846_pins { + pinctrl-single,pins = + 0x02 (PIN_INPUT_PULLDOWN | MUX_MODE6) /* llib_wakereqin.gpio1_wk15 */ + ; + }; +}; + omap5_pmx_core { pinctrl-names = default; pinctrl-0 = @@ -300,6 +316,51 @@ OMAP5_IOPAD(0x013a, PIN_OUTPUT | MUX_MODE3) /* dispc_data23 */ ; }; + + mcspi2_pins: pinmux_mcspi1_pins { + pinctrl-single,pins = + OMAP5_IOPAD(0x00fc, PIN_INPUT | MUX_MODE0) /* mcspi2_clk.mcspi2_clk */ + OMAP5_IOPAD(0x00fe, PIN_INPUT | MUX_MODE0) /* mcspi2_simo.mcspi2_simo */ + OMAP5_IOPAD(0x0100, PIN_INPUT | MUX_MODE0) /* mcspi2_somi.mcspi2_somi */ + OMAP5_IOPAD(0x0102, PIN_INPUT | MUX_MODE0) /* mcspi2_cs0.mcspi2_cs0 */ + ; + }; +}; + +mcspi2 { + pinctrl-names = default; + pinctrl-0 = mcspi2_pins; + + /* touch controller */ + ads7846@0 { + pinctrl-names = default; + pinctrl-0 = ads7846_pins; + + compatible = ti,ads7846; + vcc-supply = ads7846reg; + + reg = 0; /* CS0 */ + spi-max-frequency = 150; + + interrupt-parent = gpio1; + interrupts = 15 0;/* gpio1_wk15 */ + pendown-gpio = gpio1 15 0; + + + ti,x-min = /bits/ 16 0x0; + ti,x-max = /bits/ 16 0x0fff; + ti,y-min = /bits/ 16 0x0; + ti,y-max = /bits/ 16 0x0fff; + + ti,x-plate-ohms = /bits/ 16 180; + ti,pressure-max = /bits/ 16 255; + + ti,debounce-max = /bits/ 16 30; + ti,debounce-tol = /bits/ 16 10; + ti,debounce-rep = /bits/ 16 1; + + linux,wakeup; + }; }; mmc1 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/4] ARM: dts: cm-t54: enable video out, touchscreen and USB3.0
Add CM-T54 DT nodes: * enable HDMI/DVI/LCD video output support * add ADS7846 touchscreen support * enchance DWC3 setup to enable power supply for USB3.0 OTG port Dmitry Lifshitz (4): ARM: dts: cm-t54: add HDMI/DVI display data ARM: dts: cm-t54: add Startek LCD support ARM: dts: cm-t54: add ADS7846 touchscreen support ARM: dts: cm-t54: setup omap_dwc3 arch/arm/boot/dts/omap5-cm-t54.dts | 268 1 files changed, 268 insertions(+), 0 deletions(-) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] ARM: dts: omap5: Add dr_mode for dwc3
Hi, On 09/08/2014 04:24 PM, Felipe Balbi wrote: Hi, On Mon, Sep 08, 2014 at 02:34:33PM +0300, Dmitry Lifshitz wrote: Hi Felipe, Roger On 04/16/2014 07:16 PM, Felipe Balbi wrote: On Fri, Oct 11, 2013 at 05:46:12PM +0300, Roger Quadros wrote: Hi, On 10/10/2013 01:49 PM, Kishon Vijay Abraham I wrote: From: George Cherian george.cher...@ti.com Added dr_mode property in dwc3 and set its default mode to device. If there is a specific reason why this is not set to otg, we need to explain it here. AFAIK the port is meant to be used as OTG port. we still don't have the workaround for dual role ports, I've been working on it but still need to retest and make sure it's working fine before merging upstream. Does the OTG port suppose to work with OMAP5? I mean role switching mechanism? I'm testing kernel v3.16 with OMAP5 based board (CM-T54). If I set CONFIG_USB_DWC3_DUAL_ROLE, than nothing is going on when I plug some device/host cable into micro USB3.0 port (VBUS/ID detection with extcon events works fine). Dual role does not work. We allow the driver to the built with both Host and Peripheral support because some platforms have more than one port and building the driver with dual role allows us to make one port host and one peripheral. Please, can you provide some detail about platforms with several ports. How do that ports are connected to DWC3? Thanks, Dmitry -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] ARM: dts: omap5: Add dr_mode for dwc3
Hi Felipe, Roger On 04/16/2014 07:16 PM, Felipe Balbi wrote: On Fri, Oct 11, 2013 at 05:46:12PM +0300, Roger Quadros wrote: Hi, On 10/10/2013 01:49 PM, Kishon Vijay Abraham I wrote: From: George Cherian george.cher...@ti.com Added dr_mode property in dwc3 and set its default mode to device. If there is a specific reason why this is not set to otg, we need to explain it here. AFAIK the port is meant to be used as OTG port. we still don't have the workaround for dual role ports, I've been working on it but still need to retest and make sure it's working fine before merging upstream. Does the OTG port suppose to work with OMAP5? I mean role switching mechanism? I'm testing kernel v3.16 with OMAP5 based board (CM-T54). If I set CONFIG_USB_DWC3_DUAL_ROLE, than nothing is going on when I plug some device/host cable into micro USB3.0 port (VBUS/ID detection with extcon events works fine). CONFIG_USB_DWC3_HOST/CONFIG_USB_DWC3_GADGET bring port to appropriate mode and it works. What is the purpose of setting dr_mode = peripheral in omap5.dtsi, since it is overridden by config options in dwc3_probe()? Thank you in advance for the assistance, Dmitry -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] ARM: dts: omap5: Add dr_mode for dwc3
Hi Roger, Thank you for a quick reply. See, my reply below. On 09/08/2014 02:39 PM, Roger Quadros wrote: On 09/08/2014 02:34 PM, Dmitry Lifshitz wrote: Hi Felipe, Roger On 04/16/2014 07:16 PM, Felipe Balbi wrote: On Fri, Oct 11, 2013 at 05:46:12PM +0300, Roger Quadros wrote: Hi, On 10/10/2013 01:49 PM, Kishon Vijay Abraham I wrote: From: George Cherian george.cher...@ti.com Added dr_mode property in dwc3 and set its default mode to device. If there is a specific reason why this is not set to otg, we need to explain it here. AFAIK the port is meant to be used as OTG port. we still don't have the workaround for dual role ports, I've been working on it but still need to retest and make sure it's working fine before merging upstream. Does the OTG port suppose to work with OMAP5? I mean role switching mechanism? I'm testing kernel v3.16 with OMAP5 based board (CM-T54). If I set CONFIG_USB_DWC3_DUAL_ROLE, than nothing is going on when I plug some device/host cable into micro USB3.0 port (VBUS/ID detection with extcon events works fine). CONFIG_USB_DWC3_HOST/CONFIG_USB_DWC3_GADGET bring port to appropriate mode and it works. What is the purpose of setting dr_mode = peripheral in omap5.dtsi, since it is overridden by config options in dwc3_probe()? If dual role works it should be otg then. I'm not sure why it was set to peripheral. Maybe the role switching mechanism was not in place earlier. This is what I have when setting dr_mode = otg (and compiling with CONFIG_USB_DWC3_DUAL_ROLE): when load gadget driver and plugging host PC cable: root@cm-debian:~# modprobe g_ether using random self ethernet address using random host ethernet address usb0: HOST MAC fa:db:52:7f:95:c5 usb0: MAC be:75:8d:71:6d:02 using random self ethernet address using random host ethernet address g_ether gadget: Ethernet Gadget, version: Memorial Day 2008 g_ether gadget: g_ether ready root@cm-debian:~# [ cut here ] WARNING: CPU: 0 PID: 65 at /home/lifshitz/workroot/git-repo/OMAP5/omap5-kernel/drivers/bus/omap_l3_noc.c:147 l3_handle_target.isra.2+0x230/0x27c() 4400.ocp:L3 Standard Error: MASTER UN IDENTIFIED TARGET OCMRAM (Read): At Address: 0x : Data Access in User mode during Functional access Modules linked in: usb_f_eem g_ether usb_f_rndis libcomposite u_ether configfs rfcomm ecb btmrvl_sdio btmrvl bluetooth mwifiex_sdio mwifiex dwc3 ahci_platform libahci_platform libahci libata snd_soc_cm_t54 ads7846 dwc3_omap extcon_palmas rtc_palmas extcon_class at24 snd_soc_wm8731 snd_soc_omap_mcbsp CPU: 0 PID: 65 Comm: irq/39-palmas Tainted: GW 3.16.0-cm-t54+ #99 [c00156d0] (unwind_backtrace) from [c00124ac] (show_stack+0x10/0x14) [c00124ac] (show_stack) from [c05e29dc] (dump_stack+0x74/0x8c) [c05e29dc] (dump_stack) from [c0037dbc] (warn_slowpath_common+0x70/0x88) [c0037dbc] (warn_slowpath_common) from [c0037e68] (warn_slowpath_fmt+0x30/0x40) [c0037e68] (warn_slowpath_fmt) from [c02d88b8] (l3_handle_target.isra.2+0x230/0x27c) [c02d88b8] (l3_handle_target.isra.2) from [c02d89b0] (l3_interrupt_handler+0xac/0x13c) [c02d89b0] (l3_interrupt_handler) from [c007ea00] (handle_irq_event_percpu+0x7c/0x230) [c007ea00] (handle_irq_event_percpu) from [c007ebf8] (handle_irq_event+0x44/0x64) [c007ebf8] (handle_irq_event) from [c0081b78] (handle_fasteoi_irq+0xa8/0x134) [c0081b78] (handle_fasteoi_irq) from [c007e398] (generic_handle_irq+0x20/0x30) [c007e398] (generic_handle_irq) from [c000f4ac] (handle_IRQ+0x40/0x90) [c000f4ac] (handle_IRQ) from [c0008620] (gic_handle_irq+0x2c/0x60) [c0008620] (gic_handle_irq) from [c05eacc0] (__irq_svc+0x40/0x50) Exception stack(0xec939d80 to 0xec939dc8) 9d80: ecb729b0 2013 0001 ecb72800 eca1e000 ec939e44 9da0: ec939ed0 2013 ecb72818 ed005e14 ec939ec8 ec939dc8 bf015f54 c05ea548 9dc0: 8013 [c05eacc0] (__irq_svc) from [c05ea548] (_raw_spin_unlock_irqrestore+0x1c/0x20) [c05ea548] (_raw_spin_unlock_irqrestore) from [bf015f54] (extcon_update_state+0x144/0x1c4 [extcon_class]) [bf015f54] (extcon_update_state [extcon_class]) from [bf023288] (palmas_vbus_irq_handler+0x64/0xa0 [extcon_palmas]) [bf023288] (palmas_vbus_irq_handler [extcon_palmas]) from [c00815a8] (handle_nested_irq+0xa0/0x10c) [c00815a8] (handle_nested_irq) from [c03ab85c] (regmap_irq_thread+0x184/0x300) [c03ab85c] (regmap_irq_thread) from [c007f8b8] (irq_thread_fn+0x1c/0x40) [c007f8b8] (irq_thread_fn) from [c007f6a4] (irq_thread+0x120/0x15c) [c007f6a4] (irq_thread) from [c0056434] (kthread+0xdc/0xf0) [c0056434] (kthread) from [c000eb98] (ret_from_fork+0x14/0x3c) ---[ end trace 3b365a734f7f3202 ]--- palmas-usb 4807.i2c:palmas@48:palmas_usb: USB cable is attached when plugging storage device: root@cm-debian:~# dmesg | tail -n20 ... omap-dwc3 4a02.omap_dwc3: ID GND palmas-usb 4807.i2c:palmas@48:palmas_usb: USB-HOST cable is attached palmas-usb 4807.i2c:palmas@48:palmas_usb: USB cable is attached and nothing
[PATCH 1/2] ARM: dts: cm-t54: fix serial console power supply.
LDO8 regulator is used for act led and serial cosole power supply. Its DT status is declared as disabled, however the serial console was functional until Commit 318dbb02b (regulator: palmas: Fix SMPS enable/disable/is_enabled) wich properly turns off LDO8 on boot. Fix serial cosole power supply (and act led) on boot by turning LDO8 on. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index b8698ca..429471a 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -353,13 +353,12 @@ }; ldo8_reg: ldo8 { - /* VDD_3v0: Does not go anywhere */ + /* VDD_3V_GP: act led/serial console */ regulator-name = ldo8; regulator-min-microvolt = 300; regulator-max-microvolt = 300; + regulator-always-on; regulator-boot-on; - /* Unused */ - status = disabled; }; ldo9_reg: ldo9 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] ARM: dts: sbc-t54: fix model property
CM-T54 CoM can be used with various custom baseboards, other than SB-T54 (supplied with SBC-T54 single board computer). Update model property of SBC-T54 DT to clarify this. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-sbc-t54.dts |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/omap5-sbc-t54.dts b/arch/arm/boot/dts/omap5-sbc-t54.dts index aa98fea..8e89793 100644 --- a/arch/arm/boot/dts/omap5-sbc-t54.dts +++ b/arch/arm/boot/dts/omap5-sbc-t54.dts @@ -1,11 +1,11 @@ /* - * Suppport for CompuLab SBC-T54 with CM-T54 + * Suppport for CompuLab CM-T54 on SB-T54 baseboard */ #include omap5-cm-t54.dts / { - model = CompuLab SBC-T54 with CM-T54; + model = CompuLab CM-T54 on SB-T54; compatible = compulab,omap5-sbc-t54, compulab,omap5-cm-t54, ti,omap5; }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/2] fix cm-t54 serial console power supply
Essential fix of CM-T54 serial console power supply and minor update of SBC-T54 DT model property. Dmitry Lifshitz (2): ARM: dts: cm-t54: fix serial console power supply. ARM: dts: sbc-t54: fix model property arch/arm/boot/dts/omap5-cm-t54.dts |5 ++--- arch/arm/boot/dts/omap5-sbc-t54.dts |4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v14 0/6] mmc: omap_hsmmc: Enable SDIO IRQ
Hi, I did not find this patch set in Chris MMC tree. I did succeed to locate it in Linaro repo only. When it will be merged in the mainline? We are using SDIO IRQ patch with OMAP5 board and it is really useful. Andreas, thank you. Regards, Dmitry On 06/16/2014 12:26 PM, Ulf Hansson wrote: On 29 May 2014 10:27, Andreas Fenkart afenk...@gmail.com wrote: Hi Balaji, Tony, Ulf, all v14 - drop all ifdef/endif introduced by v13 -- rely on pinctrl_lookup_state to prevent ifdef CONFIG_PM -- benefit: all code is compile tested no matter the configuration -- drawback: require wake_irq/pinctrl configuration even when runtime suspend is not configured - drop runtime state from debugfs output - rebased onto current mmc-next 06732b84b4cf Thanks! Applied for next. Kind regards Ulf Hansson v13 - fix compile breaks if !CONFIG_PM - additional patch: install dummy pm runtime hooks if !CONFIG_PM_RUNTIME v12 - drop !CONFIG_OF compile break only exists when #undef CONFIG_OF after include headers 1/7(Sebastian Reichel) - do not emit falling back to polling if wake_irq not specified since MMC does not need it, and it might confuse users only emit if pinmux default/idle is not present or claiming the irq failed 2/7(Balaji) - dropped out-of-tree patches 6/7(Balaji) - mention ti,am33xx-hsmmc compatible section in bindings documentation 1/5 v11 - split !CONFIG_OF compile break into separate patch - enable IWE/CLKEXTFREE in CON/HCTL register needed for omap4 - '' vs '' in omap_hsmmc_resume, 1/5 (Andreas Müller) - #define DLEV_DAT instead of BIT(21) 2/5 (Balaji) - pinctrl_pm_select_default_state() removed, 4/5 (Balaji) - drop _irqsave/_irqrestore from omap_hsmmc_wake_irq handler since it can't be preempted by same priority omap_hsmmc_irq handler 1/5(Joel Fernandes) - replace devres_open_group by explicit devm_free calls 1/5 (Balaji) - disable_irq_nosync wake_irq since we handle it thread safe 1/5 (Balaji) - drop 'gpio_dat1' pinctrl states and rework documentation 5/5 (Balaji) v10 - bug fix on multi-core, untested - incorporated changes from Balaji - use devres / RAII mechanism to configure wake_up / sdio irq capabilities - drop pinctrl state 'active' rely on driver-model states 'default', 'idle' - add specific 'gpio_dat1' state for am335x SWAKEUP hack - reorganized patches; +1 patch multi-core bugfix / +1 for pinctrl - rebased 455c6fdbd21916 / cherry-picks from mmc-next v9 - extended comment about why wake-irq is needed - drop double '(' ')' around card_detect_irq - drop final '.' in in subject line of patch v8 - rebased on top of Tony Lindgrent...@atomide.com changes - improved changelog describing the earlier work - improved wakeup irq setup - works for am3730 es platform now - my changes on top: - compile tested with #undef CONFIG_OF - disable wake_irq in handler to prevent infinite loop - fixed typo and added comment about wake-irq v7 - rebase on 3.14.0-rc3-49726-g77e15ec - split omap_hsmmc_pin_init due to regression on omap-3730 platform v6 - rebase on Linux 3.13-rc3 - reformatting debugfs v5 - fix compile error introduced by last minute one line fix v4: - switch to interrupts-extended format - drop ti,swakeup-missing flag convert to comaptible section v3: - removed gpio_irq from platform_data v2: - incorparated changes as suggested by reviewers - simplified workaround for am335x, gpio will now only wake the module from runtime suspend, not handle the sdio irq itself Andreas Fenkart (6): mmc: omap_hsmmc: Enable SDIO interrupt mmc: omap_hsmmc: Extend debugfs by SDIO IRQ handling, runtime state mmc: omap_hsmmc: enable wakeup event for sdio OMAP4 mmc: omap_hsmmc: abort runtime suspend if pending sdio irq detected mmc: omap_hsmmc: switch default/idle pinctrl states in runtime hooks mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 54 drivers/mmc/host/omap_hsmmc.c | 283 ++-- include/linux/platform_data/mmc-omap.h |1 + 3 files changed, 317 insertions(+), 21 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: OMAP baseline test results for v3.15-rc8
Hi Paul, CM-T3517 is a bare-bone CoM without MMC/SD card slot (NAND option). MMC/SD card interface (and some other peripherals) are properties of the carrier base board SB-T35, which turns this CoM into fully functional board SBC-T3517. Please, use omap3-sbc-t3517.dtb target. Attached Linux v3.15-rc8 boot log using omap2plus_defconfig. On 06/02/2014 10:50 AM, Paul Walmsley wrote: Boot to userspace: FAIL ( 2/13): 2430sdp, cmt3517 skip ( 2/13): 5912osk, 4460varsomom Pass ( 9/13): 2420n800, 3517evm, 3530es3beagle, 3730beaglexm, 37xxevm, 4430es2panda, 4460pandaes, am335xbone, am335xbonelt Regards, Dmitry U-Boot 2009.11-cm-t3517-1 (Dec 10 2010 - 23:25:02) AM35xx-GP ES2.0, L3-165MHz CM-T3517 Module + LPDDR/NAND 128/512M I2C: ready DRAM: 256 MB NAND: 512 MiB In:serial Out: serial Err: serial PCB: 1.2 Die ID #7a640001016b29c60d00c020 Net: DaVinci EMAC, smc911x-0 Hit any key to stop autoboot: 0 CM-T3517 # sete bootargs 'console=ttyO2,115200n8 debug ignore_loglevel earlyprintk root=/dev/mmcblk0p2 rootwait init=/bin/sh nohlt' CM-T3517 # sete bootcmd 'tftp 0x8200 uImage-cm-t3517_wdt.bin bootm 0x8200' CM-T3517 # boot Using DaVinci EMAC device TFTP from server 192.168.11.10; our IP address is 192.168.6.204 Filename 'uImage-cm-t3517_wdt.bin'. Load address: 0x8200 Loading: # # T # # # ##T ### # ##T ### ###T ## T # # #T ##T ### # ## done Bytes transferred = 4769379 (48c663 hex) ## Booting kernel from Legacy Image at 8200 ... Image Name: Linux Image Type: ARM Linux Kernel Image (uncompressed) Data Size:4769315 Bytes = 4.5 MB Load Address: 80008000 Entry Point: 80008000 Verifying Checksum ... OK Loading Kernel Image ... OK OK Starting kernel ... [0.00] Booting Linux on physical CPU 0x0 [0.00] Linux version 3.15.0-rc8 (lifsh...@compulab.co.il) (gcc version 4.6.1 (Sourcery CodeBench Lite 2011.09-70) ) #4 SMP Mon Jun 2 11:19:33 IDT 2014 [0.00] CPU: ARMv7 Processor [411fc087] revision 7 (ARMv7), cr=10c5387d [0.00] CPU: PIPT / VIPT nonaliasing data cache, VIPT nonaliasing instruction cache [0.00] Machine model: CompuLab SBC-T3517 with CM-T3517 [0.00] debug: ignoring loglevel setting. [0.00] cma: CMA: reserved 16 MiB at 8e80 [0.00] Memory policy: Data cache writeback [0.00] On node 0 totalpages: 65280 [0.00] free_area_init_node: node 0, pgdat c092e8c0, node_mem_map cfcf2000 [0.00] Normal zone: 512 pages used for memmap [0.00] Normal zone: 0 pages reserved [0.00] Normal zone: 65280 pages, LIFO batch:15 [0.00] CPU: All CPU(s) started in SVC mode. [0.00] AM3517 ES1.1 (l2cache sgx neon ) [0.00] PERCPU: Embedded 9 pages/cpu @cfcaf000 s14080 r8192 d14592 u36864 [0.00] pcpu-alloc: s14080 r8192 d14592 u36864 alloc=9*4096 [0.00] pcpu-alloc: [0] 0 [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 64768 [0.00] Kernel command line: console=ttyO2,115200n8 debug ignore_loglevel earlyprintk root=/dev/mmcblk0p2 rootwait init=/bin/sh nohlt [0.00] PID hash table entries: 1024 (order: 0, 4096 bytes) [0.00] Dentry cache hash table entries: 32768 (order: 5, 131072 bytes) [0.00] Inode-cache hash table entries: 16384 (order: 4, 65536 bytes) [0.00] Memory: 227188K/261120K available (6111K kernel code, 664K rwdata, 2216K rodata, 393K init, 5522K bss, 33932K reserved, 0K highmem) [0.00] Virtual kernel memory layout: [0.00] vector : 0x - 0x1000 ( 4 kB) [0.00] fixmap : 0xfff0 - 0xfffe ( 896 kB) [0.00] vmalloc : 0xd080 - 0xff00 ( 744 MB) [0.00] lowmem : 0xc000 - 0xd000 ( 256 MB) [0.00] pkmap : 0xbfe0 - 0xc000 ( 2 MB) [0.00] modules :
[PATCH v2 2/2] ARM: dts: cm-t54: add WiFi/BT support
Add support of AW-NH387 (mwifiex) WiFi/BT chip connected to MMC3. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- Changes from V1: * Platform quirk for deasserting PDN and RST GPIOs of WiFi chip replaced by appropriate regulators in DT. arch/arm/boot/dts/omap5-cm-t54.dts | 53 +++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index 787c4aa..570130f 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -23,6 +23,28 @@ regulator-max-microvolt = 330; }; + vwlan_pdn_fixed: fixed-regulator-vwlan-pdn { + compatible = regulator-fixed; + regulator-name = vwlan_pdn_fixed; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + vin-supply = ldo2_reg; + gpio = gpio4 13 GPIO_ACTIVE_HIGH; /* gpio4_109 */ + startup-delay-us = 1000; + enable-active-high; + }; + + vwlan_fixed: fixed-regulator-vwlan { + compatible = regulator-fixed; + regulator-name = vwlan_fixed; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + vin-supply = vwlan_pdn_fixed; + gpio = gpio4 14 GPIO_ACTIVE_HIGH; /* gpio4_110 */ + startup-delay-us = 1000; + enable-active-high; + }; + /* HS USB Host PHY on PORT 2 */ hsusb2_phy: hsusb2_phy { compatible = usb-nop-xceiv; @@ -92,6 +114,24 @@ ; }; + mmc3_pins: pinmux_mmc3_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x29a4, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_clk */ + OMAP5_CORE_IOPAD(0x29a6, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_cmd */ + OMAP5_CORE_IOPAD(0x29a8, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data0 */ + OMAP5_CORE_IOPAD(0x29aa, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data1 */ + OMAP5_CORE_IOPAD(0x29ac, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data2 */ + OMAP5_CORE_IOPAD(0x29ae, PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data3 */ + ; + }; + + wlan_gpios_pins: pinmux_wlan_gpios_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x299c, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* gpio4_109 */ + OMAP5_CORE_IOPAD(0x299e, PIN_OUTPUT_PULLDOWN | MUX_MODE6) /* gpio4_110 */ + ; + }; + usbhost_pins: pinmux_usbhost_pins { pinctrl-single,pins = OMAP5_CORE_IOPAD(0x28c4, PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */ @@ -121,6 +161,17 @@ ti,non-removable; }; +mmc3 { + pinctrl-names = default; + pinctrl-0 = + mmc3_pins + wlan_gpios_pins + ; + vmmc-supply = vwlan_fixed; + bus-width = 4; + ti,non-removable; +}; + mmc4 { status = disabled; }; @@ -255,7 +306,7 @@ regulator-name = ldo2; regulator-min-microvolt = 330; regulator-max-microvolt = 330; - regulator-boot-on; + startup-delay-us = 1000; }; ldo3_reg: ldo3 { -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/2] ARM: dts: sbc-t54: add support for sbc-t54 with cm-t54
Add support for CompuLab CM-T54 CoM and SBC-T54 board: http://compulab.co.il/products/computer-on-modules/cm-t54/ http://compulab.co.il/products/sbcs/sbc-t54/ SBC-T54 is a single board computer based on OMAP5432 CPU. It is implemented with a CM-T54 CoM providing most of the functions, and SB-T54 carrier board providing connectors and several additional functions. Changes from V1: * Used OMAP5_CORE_IOPAD macros for pimnux settings * Added CD and WP support for SD/MMC card on SB-T54 * Platform quirk for deasserting PDN and RST GPIOs of WiFi chip replaced by appropriate regulators in DT. Dmitry Lifshitz (2): ARM: dts: sbc-t54: add support for sbc-t54 with cm-t54 ARM: dts: cm-t54: add WiFi/BT support arch/arm/boot/dts/Makefile |2 + arch/arm/boot/dts/omap5-cm-t54.dts | 414 +++ arch/arm/boot/dts/omap5-sbc-t54.dts | 52 + 3 files changed, 468 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/dts/omap5-cm-t54.dts create mode 100644 arch/arm/boot/dts/omap5-sbc-t54.dts -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/2] ARM: dts: sbc-t54: add support for sbc-t54 with cm-t54
Add support for CM-T54 CoM and SBC-T54 board: http://compulab.co.il/products/computer-on-modules/cm-t54/ http://compulab.co.il/products/sbcs/sbc-t54/ SBC-T54 is a single board computer based on OMAP5432 CPU. It is implemented with a CM-T54 CoM providing most of the functions, and SB-T54 carrier board providing connectors and several additional functions. Added basic support for: * PMIC * LED * MMC/SD * eMMC * USB * I2C1/4 * SB-T54 and CM-T54 EEPROMs * RTC Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- Changes from V1: * Used OMAP5_CORE_IOPAD macros for pimnux settings * Added CD and WP support for SD/MMC card on SB-T54 arch/arm/boot/dts/Makefile |2 + arch/arm/boot/dts/omap5-cm-t54.dts | 363 +++ arch/arm/boot/dts/omap5-sbc-t54.dts | 52 + 3 files changed, 417 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/dts/omap5-cm-t54.dts create mode 100644 arch/arm/boot/dts/omap5-sbc-t54.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0bdeba3..f7b2ec0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -277,6 +277,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap4-var-som.dtb \ omap4-sdp.dtb \ omap4-sdp-es23plus.dtb \ + omap5-cm-t54.dtb \ + omap5-sbc-t54.dtb \ omap5-uevm.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts new file mode 100644 index 000..787c4aa --- /dev/null +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -0,0 +1,363 @@ +/* + * Support for CompuLab CM-T54 + */ +/dts-v1/; + +#include omap5.dtsi +#include dt-bindings/interrupt-controller/irq.h +#include dt-bindings/interrupt-controller/arm-gic.h + +/ { + model = CompuLab CM-T54; + compatible = compulab,omap5-cm-t54, ti,omap5; + + memory { + device_type = memory; + reg = 0x8000 0x7F00; /* 2048 MB */ + }; + + vmmcsd_fixed: fixed-regulator-mmcsd { + compatible = regulator-fixed; + regulator-name = vmmcsd_fixed; + regulator-min-microvolt = 330; + regulator-max-microvolt = 330; + }; + + /* HS USB Host PHY on PORT 2 */ + hsusb2_phy: hsusb2_phy { + compatible = usb-nop-xceiv; + reset-gpios = gpio3 12 GPIO_ACTIVE_LOW; /* gpio3_76 HUB_RESET */ + }; + + /* HS USB Host PHY on PORT 3 */ + hsusb3_phy: hsusb3_phy { + compatible = usb-nop-xceiv; + reset-gpios = gpio3 19 GPIO_ACTIVE_LOW; /* gpio3_83 ETH_RESET */ + }; + + leds { + compatible = gpio-leds; + led@1 { + label = Heartbeat; + gpios = gpio3 16 GPIO_ACTIVE_HIGH; /* gpio3_80 ACT_LED */ + linux,default-trigger = heartbeat; + default-state = off; + }; + }; +}; + +omap5_pmx_core { + pinctrl-names = default; + pinctrl-0 = + led_gpio_pins + usbhost_pins + ; + + led_gpio_pins: pinmux_led_gpio_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x28b0, PIN_OUTPUT | MUX_MODE6) /* hsi2_caflag.gpio3_80 */ + ; + }; + + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x29f2, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_pmic_scl */ + OMAP5_CORE_IOPAD(0x29f4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_pmic_sda */ + ; + }; + + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x29e2, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_clk */ + OMAP5_CORE_IOPAD(0x29e4, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_cmd */ + OMAP5_CORE_IOPAD(0x29e6, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_data2 */ + OMAP5_CORE_IOPAD(0x29e8, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_data3 */ + OMAP5_CORE_IOPAD(0x29ea, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_data0 */ + OMAP5_CORE_IOPAD(0x29ec, PIN_INPUT_PULLUP | MUX_MODE0) /* sdcard_data1 */ + ; + }; + + mmc2_pins: pinmux_mmc2_pins { + pinctrl-single,pins = + OMAP5_CORE_IOPAD(0x2840, PIN_INPUT_PULLUP | MUX_MODE0) /* emmc_clk */ + OMAP5_CORE_IOPAD(0x2842, PIN_INPUT_PULLUP | MUX_MODE0) /* emmc_cmd */ + OMAP5_CORE_IOPAD(0x2844, PIN_INPUT_PULLUP | MUX_MODE0) /* emmc_data0 */ + OMAP5_CORE_IOPAD(0x2846, PIN_INPUT_PULLUP | MUX_MODE0) /* emmc_data1 */ + OMAP5_CORE_IOPAD(0x2848, PIN_INPUT_PULLUP | MUX_MODE0
[PATCH 0/2] ARM: dts: sbc-t54: add support for sbc-t54 with cm-t54
Add support for CompuLab CM-T54 CoM and SBC-T54 board: http://compulab.co.il/products/computer-on-modules/cm-t54/ http://compulab.co.il/products/sbcs/sbc-t54/ SBC-T54 is a single board computer based on OMAP5432 CPU. It is implemented with a CM-T54 CoM providing most of the functions, and SB-T54 carrier board providing connectors and several additional functions. Dmitry Lifshitz (2): ARM: dts: sbc-t54: add support for sbc-t54 with cm-t54 ARM: dts: cm-t54: add WiFi/BT support arch/arm/boot/dts/Makefile |2 + arch/arm/boot/dts/omap5-cm-t54.dts | 390 +++ arch/arm/boot/dts/omap5-sbc-t54.dts | 33 +++ arch/arm/mach-omap2/pdata-quirks.c | 10 + 4 files changed, 435 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/dts/omap5-cm-t54.dts create mode 100644 arch/arm/boot/dts/omap5-sbc-t54.dts -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] ARM: dts: cm-t54: add WiFi/BT support
Add support of AW-NH387 (mwifiex) WiFi/BT chip connected to MMC3. Signed-off-by: Dmitry Lifshitz lifsh...@compulab.co.il --- arch/arm/boot/dts/omap5-cm-t54.dts | 27 +++ arch/arm/mach-omap2/pdata-quirks.c | 10 ++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts index c87401f..27f5b7f 100644 --- a/arch/arm/boot/dts/omap5-cm-t54.dts +++ b/arch/arm/boot/dts/omap5-cm-t54.dts @@ -51,6 +51,7 @@ pinctrl-0 = led_gpio_pins usbhost_pins + wlan_reset_pins ; led_gpio_pins: pinmux_led_gpio_pins { @@ -92,6 +93,24 @@ ; }; + mmc3_pins: pinmux_mmc3_pins { + pinctrl-single,pins = + 0x164 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_clk */ + 0x166 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_cmd */ + 0x168 (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data0 */ + 0x16a (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data1 */ + 0x16c (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data2 */ + 0x16e (PIN_INPUT_PULLUP | MUX_MODE0) /* wlsdio_data3 */ + ; + }; + + wlan_reset_pins: pinmux_wlan_reset_pins { + pinctrl-single,pins = + 0x15c (PIN_OUTPUT | MUX_MODE6) /* abemcpdm_ul_data.gpio4_109 - WLAN_nPD */ + 0x15e (PIN_OUTPUT | MUX_MODE6) /* abemcpdm_dl_data.gpio4_110 - WLAN_nRESET */ + ; + }; + usbhost_pins: pinmux_usbhost_pins { pinctrl-single,pins = 0x084 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */ @@ -121,6 +140,14 @@ ti,non-removable; }; +mmc3 { + pinctrl-names = default; + pinctrl-0 = mmc3_pins; + vmmc-supply = ldo2_reg; + bus-width = 4; + ti,non-removable; +}; + mmc4 { status = disabled; }; diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index a114806..554ab37 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -205,6 +205,15 @@ static void __init omap5_uevm_legacy_init(void) { legacy_init_ehci_clk(auxclk1_ck); } + +static void __init omap5_cm_t54_legacy_init(void) +{ + gpio_request_one(109, GPIOF_OUT_INIT_HIGH, wlan_pdn); + gpio_export(109, 0); + + gpio_request_one(110, GPIOF_OUT_INIT_HIGH, wlan_rst); + gpio_export(110, 0); +} #endif static struct pcs_pdata pcs_pdata; @@ -286,6 +295,7 @@ static struct pdata_init pdata_quirks[] __initdata = { #endif #ifdef CONFIG_SOC_OMAP5 { ti,omap5-uevm, omap5_uevm_legacy_init, }, + { compulab,omap5-cm-t54, omap5_cm_t54_legacy_init, }, #endif { /* sentinel */ }, }; -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html