summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts5
-rw-r--r--arch/arm/boot/dts/dra7-evm-lcd10.dts13
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts153
-rw-r--r--arch/arm/boot/dts/dra7.dtsi44
-rw-r--r--arch/arm/boot/dts/dra72-evm.dts95
-rw-r--r--arch/arm/boot/dts/dra72x.dtsi28
-rw-r--r--arch/arm/boot/dts/dra74x.dtsi28
-rw-r--r--arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi19
-rw-r--r--arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi103
9 files changed, 423 insertions, 65 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 5c6f6a08198..506162dce9b 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -711,6 +711,11 @@
voltage-tolerance = <1>;
};
+&gpu {
+ gpu0-voltdm = <&voltdm_gpu>;
+ voltage-tolerance = <1>;
+};
+
&mac {
status = "okay";
pinctrl-names = "default", "sleep";
diff --git a/arch/arm/boot/dts/dra7-evm-lcd10.dts b/arch/arm/boot/dts/dra7-evm-lcd10.dts
index 361c20f3d72..54216e81d6a 100644
--- a/arch/arm/boot/dts/dra7-evm-lcd10.dts
+++ b/arch/arm/boot/dts/dra7-evm-lcd10.dts
@@ -9,6 +9,15 @@
#include "dra7-evm.dts"
#include "dra7xx-evm-lcd10.dtsi"
-&tlv320aic3106 {
- reg = <0x19>;
+/* override pinmux for tsc irq line on dra74x */
+&tsc_pins {
+ pinctrl-single,pins = <
+ 0x420 (PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpio1_2 */
+ >;
+};
+
+&ldc3001 {
+ interrupt-parent = <&gpio1>;
+ interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-0 = <&tsc_pins>;
};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index f00db0cb668..9bb768a29a4 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -53,6 +53,13 @@
reusable;
status = "okay";
};
+
+ /* Required by cmem driver used by radio */
+ cmem_radio: cmem@95400000 {
+ reg = <0x95400000 0x400000>;
+ no-map;
+ status = "okay";
+ };
};
extcon1: dra7x_usbid_extcon1 {
@@ -176,12 +183,19 @@
};
};
+ ocp {
+ gpu: gpu@0x56000000 {
+ gpu0-voltdm = <&voltdm_gpu>;
+ };
+ };
+
primary_sound: primary_sound {
compatible = "ti,dra7xx-evm-audio";
ti,model = "DRA7xx-EVM";
+ ti,always-on;
ti,audio-codec = <&tlv320aic3106>;
ti,mcasp-controller = <&mcasp3>;
- ti,codec-clock-rate = <5644800>;
+ ti,codec-clock-rate = <11289600>;
clocks = <&atl_clkin2_ck>;
clock-names = "mclk";
ti,audio-routing =
@@ -195,6 +209,14 @@
"LINE1L", "Line In",
"LINE1R", "Line In";
};
+
+ radio {
+ compatible = "ti,dra7xx_radio";
+ gpios = <&gpio6 20 0>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&radio_pins>;
+ };
};
&dra7_pmx_core {
@@ -480,6 +502,21 @@
>;
};
+ mcasp2_pins: pinmux_mcasp2_pins {
+ pinctrl-single,pins = <
+ 0x02F4 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_aclkx */
+ 0x02F8 (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_afsx */
+ 0x0304 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr0 */
+ 0x0308 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr1 */
+ 0x030C (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_axr2 */
+ 0x0310 (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_axr3 */
+ 0x0314 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr4 */
+ 0x0318 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr5 */
+ 0x031c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr6 */
+ 0x0320 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr7 */
+ >;
+ };
+
mcasp3_pins: pinmux_mcasp3_pins {
pinctrl-single,pins = <
0x324 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx */
@@ -497,6 +534,23 @@
0x330 (PIN_OFF_NONE)
>;
};
+
+ mcasp6_pins: pinmux_mcasp6_pins {
+ pinctrl-single,pins = <
+ 0x2d4 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mcasp6_axr0 */
+ 0x2d8 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcasp6_axr1 */
+ 0x2dc (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mcasp6_clkx */
+ 0x2e0 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcasp6_fsx */
+ >;
+ };
+
+ radio_pins: pinmux_radio_pins {
+ pinctrl-single,pins = <
+ 0x0334 (PIN_INPUT | MUX_MODE4) /* i2c4_sda */
+ 0x0338 (PIN_INPUT | MUX_MODE4) /* i2c4_scl */
+ 0x02A0 (PIN_INPUT | MUX_MODE14) /* gpio6_20 */
+ >;
+ };
};
&i2c1 {
@@ -638,64 +692,6 @@
#interrupt-cells = <2>;
};
- mxt244: touchscreen@4a {
- compatible = "atmel,mXT244";
- status = "okay";
- reg = <0x4a>;
- interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
- pinctrl-0 = <&tsc_pins>;
-
- atmel,config = <
- /* MXT244_GEN_COMMAND(6) */
- 0x00 0x00 0x00 0x00 0x00 0x00
- /* MXT244_GEN_POWER(7) */
- 0x20 0xff 0x32
- /* MXT244_GEN_ACQUIRE(8) */
- 0x0a 0x00 0x05 0x00 0x00 0x00 0x09 0x23
- /* MXT244_TOUCH_MULTI(9) */
- 0x00 0x00 0x00 0x13 0x0b 0x00 0x00 0x00 0x02 0x00
- 0x00 0x01 0x01 0x0e 0x0a 0x0a 0x0a 0x0a 0x00 0x00
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00
- /* MXT244_TOUCH_KEYARRAY(15) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00
- /* MXT244_COMMSCONFIG_T18(2) */
- 0x00 0x00
- /* MXT244_SPT_GPIOPWM(19) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00 0x00 0x00 0x00 0x00 0x00
- /* MXT244_PROCI_GRIPFACE(20) */
- 0x07 0x00 0x00 0x00 0x00 0x00 0x00 0x50 0x28 0x04
- 0x0f 0x0a
- /* MXT244_PROCG_NOISE(22) */
- 0x05 0x00 0x00 0x00 0x00 0x00 0x00 0x03 0x23 0x00
- 0x00 0x05 0x0f 0x19 0x23 0x2d 0x03
- /* MXT244_TOUCH_PROXIMITY(23) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00 0x00 0x00 0x00 0x00
- /* MXT244_PROCI_ONETOUCH(24) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- /* MXT244_SPT_SELFTEST(25) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- 0x00 0x00 0x00 0x00
- /* MXT244_PROCI_TWOTOUCH(27) */
- 0x00 0x00 0x00 0x00 0x00 0x00 0x00
- /* MXT244_SPT_CTECONFIG(28) */
- 0x00 0x00 0x02 0x08 0x10 0x00
- >;
-
- atmel,x_line = <18>;
- atmel,y_line = <12>;
- atmel,x_size = <800>;
- atmel,y_size = <480>;
- atmel,blen = <0x01>;
- atmel,threshold = <30>;
- atmel,voltage = <2800000>;
- atmel,orient = <0x4>;
- };
-
tlv320aic3106: tlv320aic3106@18 {
compatible = "ti,tlv320aic3106";
reg = <0x18>;
@@ -1116,12 +1112,33 @@
status = "okay";
+ atl1 {
+ bws = <DRA7_ATL_WS_MCASP2_FSX>;
+ aws = <DRA7_ATL_WS_MCASP6_FSX>;
+ };
+
atl2 {
bws = <DRA7_ATL_WS_MCASP2_FSX>;
aws = <DRA7_ATL_WS_MCASP3_FSX>;
};
};
+&mcasp2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcasp2_pins>;
+
+ fck_parent = "atl_clkin2_ck";
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <2>;
+ /* 8 serializer */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 1 1 1 1 1 1 1 1
+ >;
+};
+
&mcasp3 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mcasp3_pins>;
@@ -1138,3 +1155,21 @@
1 2 0 0
>;
};
+
+&mcasp6 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcasp6_pins>;
+
+ fck_parent = "atl_clkin1_ck";
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <8>;
+ /* 4 serializer */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 1 2 0 0
+ >;
+ tx-num-evt = <8>;
+ rx-num-evt = <8>;
+};
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index e65b69238d3..6486cf0ee98 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -825,6 +825,22 @@
status = "disabled";
};
+ gpu: gpu@0x56000000 {
+ compatible = "ti,omap4-gpu";
+ reg = <0x56000000 0xffff>;
+ interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+ ti,hwmods = "gpu";
+ operating-points = <
+ /* kHz uV */
+ 425600 1090000
+ 532000 1280000
+ >;
+ clocks = <&dpll_core_h14x2_ck>, <&dpll_per_h14x2_ck>,
+ <&dpll_gpu_m2_ck>, <&gpu_core_gclk_mux>,
+ <&gpu_hyd_gclk_mux>;
+ clock-names = "core", "per", "gpu", "gpu_core", "gpu_hyd";
+ };
+
i2c1: i2c@48070000 {
compatible = "ti,omap4-i2c";
reg = <0x48070000 0x100>;
@@ -1828,6 +1844,18 @@
status = "disabled";
};
+ mcasp2: mcasp@48464000 {
+ compatible = "ti,dra7-mcasp-audio";
+ ti,hwmods = "mcasp2";
+ reg = <0x48464000 0x2000>;
+ reg-names = "mpu";
+ dmas = <&sdma 131 &dmacb>, <&sdma 130 &dmacb>;
+ dma-names = "tx", "rx";
+ clocks = <&mcasp2_ahclkx_mux>;
+ clock-names = "fck";
+ status = "disabled";
+ };
+
mcasp3: mcasp@48468000 {
compatible = "ti,dra7-mcasp-audio";
ti,hwmods = "mcasp3";
@@ -1843,6 +1871,22 @@
status = "disabled";
};
+ mcasp6: mcasp@48474000 {
+ compatible = "ti,dra7-mcasp-audio";
+ ti,hwmods = "mcasp6";
+ reg = <0x48474000 0x2000>,
+ <0x4844c000 0x1000>;
+ reg-names = "mpu","dat";
+ interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "tx", "rx";
+ dmas = <&sdma 139 &dmacb>, <&sdma 138 &dmacb>;
+ dma-names = "tx", "rx";
+ clocks = <&mcasp6_ahclkx_mux>;
+ clock-names = "fck";
+ status = "disabled";
+ };
+
vip1: vip@0x48970000 {
compatible = "ti,vip1";
reg = <0x48970000 0x10000>,
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index fe8c3e7ca88..c747dd63ebd 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -96,6 +96,13 @@
reusable;
status = "okay";
};
+
+ /* Required by cmem driver used by radio */
+ cmem_radio: cmem@95400000 {
+ reg = <0x95400000 0x400000>;
+ no-map;
+ status = "okay";
+ };
};
extcon1: dra7x_usbid_extcon1 {
@@ -138,9 +145,10 @@
primary_sound: primary_sound {
compatible = "ti,dra7xx-evm-audio";
ti,model = "DRA7xx-EVM";
+ ti,always-on;
ti,audio-codec = <&tlv320aic3106>;
ti,mcasp-controller = <&mcasp3>;
- ti,codec-clock-rate = <5644800>;
+ ti,codec-clock-rate = <11289600>;
clocks = <&atl_clkin2_ck>;
clock-names = "mclk";
ti,audio-routing =
@@ -154,6 +162,14 @@
"LINE1L", "Line In",
"LINE1R", "Line In";
};
+
+ radio {
+ compatible = "ti,dra7xx_radio";
+ gpios = <&gpio6 20 0>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&radio_pins>;
+ };
};
&dra7_pmx_core {
@@ -310,6 +326,21 @@
>;
};
+ mcasp2_pins: pinmux_mcasp2_pins {
+ pinctrl-single,pins = <
+ 0x02F4 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_aclkx */
+ 0x02F8 (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_afsx */
+ 0x0304 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr0 */
+ 0x0308 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr1 */
+ 0x030C (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_axr2 */
+ 0x0310 (PIN_INPUT_SLEW | MUX_MODE0) /* mcasp2_axr3 */
+ 0x0314 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr4 */
+ 0x0318 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr5 */
+ 0x031c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr6 */
+ 0x0320 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp2_axr7 */
+ >;
+ };
+
mcasp3_pins: pinmux_mcasp3_pins {
pinctrl-single,pins = <
0x324 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx */
@@ -328,6 +359,15 @@
>;
};
+ mcasp6_pins: pinmux_mcasp6_pins {
+ pinctrl-single,pins = <
+ 0x2d4 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mcasp6_axr0 */
+ 0x2d8 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcasp6_axr1 */
+ 0x2dc (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mcasp6_clkx */
+ 0x2e0 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcasp6_fsx */
+ >;
+ };
+
usb1_pins: pinmux_usb1_pins {
pinctrl-single,pins = <
0x280 (PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */
@@ -340,6 +380,12 @@
>;
};
+ tsc_pins: pinmux_tsc_pins {
+ pinctrl-single,pins = <
+ 0x3D4 (PIN_INPUT_PULLUP | MUX_MODE14) /* dcan1_rx -> gpio1_15 */
+ >;
+ };
+
qspi1_pins: pinmux_qspi1_pins {
pinctrl-single,pins = <
0x74 (PIN_OUTPUT | MUX_MODE1) /* gpmc_a13.qspi1_rtclk */
@@ -365,6 +411,14 @@
0x418 (MUX_MODE15) /* wakeup0.off */
>;
};
+
+ radio_pins: pinmux_radio_pins {
+ pinctrl-single,pins = <
+ 0x0334 (PIN_INPUT | MUX_MODE4) /* i2c4_sda */
+ 0x0338 (PIN_INPUT | MUX_MODE4) /* i2c4_scl */
+ 0x02A0 (PIN_INPUT | MUX_MODE14) /* gpio6_20 */
+ >;
+ };
};
&i2c1 {
@@ -810,12 +864,33 @@
status = "okay";
+ atl1 {
+ bws = <DRA7_ATL_WS_MCASP2_FSX>;
+ aws = <DRA7_ATL_WS_MCASP6_FSX>;
+ };
+
atl2 {
bws = <DRA7_ATL_WS_MCASP2_FSX>;
aws = <DRA7_ATL_WS_MCASP3_FSX>;
};
};
+&mcasp2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcasp2_pins>;
+
+ fck_parent = "atl_clkin2_ck";
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <2>;
+ /* 8 serializer */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 1 1 1 1 1 1 1 1
+ >;
+};
+
&mcasp3 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mcasp3_pins>;
@@ -833,6 +908,24 @@
>;
};
+&mcasp6 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcasp6_pins>;
+
+ fck_parent = "atl_clkin1_ck";
+
+ status = "okay";
+
+ op-mode = <0>; /* MCASP_IIS_MODE */
+ tdm-slots = <8>;
+ /* 4 serializer */
+ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
+ 1 2 0 0
+ >;
+ tx-num-evt = <8>;
+ rx-num-evt = <8>;
+};
+
&omap_dwc3_1 {
extcon = <&extcon1>;
};
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index b5eb3266663..3001c518c76 100644
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -38,6 +38,34 @@
};
};
+ iva_coproc {
+ compatible = "ti,coproc";
+ clocks = <&dpll_iva_m2_ck>, <&dpll_iva_ck>;
+ clock-names = "fclk", "dpll";
+ clock-target-frequency = <532000000>;
+ operating-points = <
+ 388200 1055000
+ 430000 1150000
+ 532000 1250000
+ >;
+ coproc-voltdm = <&voltdm_ivahd>;
+ voltage-tolerance = <1>;
+ };
+
+ dsp_coproc {
+ compatible = "ti,coproc";
+ clocks = <&dpll_dsp_m2_ck>, <&dpll_dsp_ck>;
+ clock-names = "fclk", "dpll";
+ clock-target-frequency = <700000000>;
+ operating-points = <
+ 600000 1055000
+ 700000 1150000
+ 700000 1250000
+ >;
+ coproc-voltdm = <&voltdm_dspeve>;
+ voltage-tolerance = <1>;
+ };
+
thermal-zones {
#include "omap5-cpu-thermal.dtsi"
};
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
index 8a36afcd925..e43fc2bd8eb 100644
--- a/arch/arm/boot/dts/dra74x.dtsi
+++ b/arch/arm/boot/dts/dra74x.dtsi
@@ -43,6 +43,34 @@
};
};
+ iva_coproc {
+ compatible = "ti,coproc";
+ clocks = <&dpll_iva_m2_ck>, <&dpll_iva_ck>;
+ clock-names = "fclk", "dpll";
+ clock-target-frequency = <532000000>;
+ operating-points = <
+ 388200 1055000
+ 430000 1150000
+ 532000 1250000
+ >;
+ coproc-voltdm = <&voltdm_ivahd>;
+ voltage-tolerance = <1>;
+ };
+
+ dsp_coproc {
+ compatible = "ti,coproc";
+ clocks = <&dpll_dsp_m2_ck>, <&dpll_dsp_ck>;
+ clock-names = "fclk", "dpll";
+ clock-target-frequency = <700000000>;
+ operating-points = <
+ 600000 1055000
+ 700000 1150000
+ 700000 1250000
+ >;
+ coproc-voltdm = <&voltdm_dspeve>;
+ voltage-tolerance = <1>;
+ };
+
thermal-zones {
#include "omap5-cpu-thermal.dtsi"
};
diff --git a/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi b/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
index 1580a2c3147..46033410b66 100644
--- a/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
+++ b/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
@@ -26,6 +26,25 @@
};
};
};
+
+ ldc3001:ldc3001@18 {
+ compatible = "lgphilips,ldc3001";
+ status = "okay";
+ reg = <0x18>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-0 = <&tsc_pins>;
+ max-touch-points = <10>;
+ res-x = <1280>;
+ res-y = <800>;
+ };
+
+
+};
+
+/* audio codec i2c address moved to 0x19 for 10" display config */
+&tlv320aic3106 {
+ reg = <0x19>;
};
&dss {
diff --git a/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi b/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
index ded5ea579f1..bf5612f98ed 100644
--- a/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
+++ b/arch/arm/boot/dts/dra7xx-evm-lcd7.dtsi
@@ -6,8 +6,105 @@
* published by the Free Software Foundation.
*/
-#include "dra7xx-evm-lcd10.dtsi"
+/ {
+ aliases {
+ display0 = &tlc59108;
+ display1 = &hdmi0;
+ };
+};
+
+/* 7" display and tsc hooked to i2c1 */
+&i2c1 {
+ /* TLC chip for LCD panel power and backlight */
+ tlc59108: tlc59108@40 {
+ compatible = "ti,tlc59108-tfcs9700";
+ reg = <0x40>;
+ enable-gpios = <&pcf_lcd 13 GPIO_ACTIVE_LOW>; /* P15, CON_LCD_PWR_DN */
+
+ port {
+ tlc_in: endpoint {
+ remote-endpoint = <&dpi_out>;
+ };
+ };
+ };
+
+
+
+
+ mxt244: touchscreen@4a {
+ compatible = "atmel,mXT244";
+ status = "okay";
+ reg = <0x4a>;
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ pinctrl-0 = <&tsc_pins>;
+
+ atmel,config = <
+ /* MXT244_GEN_COMMAND(6) */
+ 0x00 0x00 0x00 0x00 0x00 0x00
+ /* MXT244_GEN_POWER(7) */
+ 0x20 0xff 0x32
+ /* MXT244_GEN_ACQUIRE(8) */
+ 0x0a 0x00 0x05 0x00 0x00 0x00 0x09 0x23
+ /* MXT244_TOUCH_MULTI(9) */
+ 0x00 0x00 0x00 0x13 0x0b 0x00 0x00 0x00 0x02 0x00
+ 0x00 0x01 0x01 0x0e 0x0a 0x0a 0x0a 0x0a 0x00 0x00
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00
+ /* MXT244_TOUCH_KEYARRAY(15) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00
+ /* MXT244_COMMSCONFIG_T18(2) */
+ 0x00 0x00
+ /* MXT244_SPT_GPIOPWM(19) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00 0x00 0x00 0x00 0x00 0x00
+ /* MXT244_PROCI_GRIPFACE(20) */
+ 0x07 0x00 0x00 0x00 0x00 0x00 0x00 0x50 0x28 0x04
+ 0x0f 0x0a
+ /* MXT244_PROCG_NOISE(22) */
+ 0x05 0x00 0x00 0x00 0x00 0x00 0x00 0x03 0x23 0x00
+ 0x00 0x05 0x0f 0x19 0x23 0x2d 0x03
+ /* MXT244_TOUCH_PROXIMITY(23) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00 0x00 0x00 0x00 0x00
+ /* MXT244_PROCI_ONETOUCH(24) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ /* MXT244_SPT_SELFTEST(25) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ 0x00 0x00 0x00 0x00
+ /* MXT244_PROCI_TWOTOUCH(27) */
+ 0x00 0x00 0x00 0x00 0x00 0x00 0x00
+ /* MXT244_SPT_CTECONFIG(28) */
+ 0x00 0x00 0x02 0x08 0x10 0x00
+ >;
+
+ atmel,x_line = <18>;
+ atmel,y_line = <12>;
+ atmel,x_size = <800>;
+ atmel,y_size = <480>;
+ atmel,blen = <0x01>;
+ atmel,threshold = <30>;
+ atmel,voltage = <2800000>;
+ atmel,orient = <0x4>;
+ };
+};
+
+&dss {
+ pinctrl-names = "default";
+ pinctrl-0 = <&vout1_pins>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port {
+ reg = <0>;
-&tlc59108 {
- compatible = "ti,tlc59108-tfcs9700";
+ dpi_out: endpoint {
+ remote-endpoint = <&tlc_in>;
+ data-lines = <24>;
+ };
+ };
+ };
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 11:24:04 +0000