| author | Anand Balagopalakrishnan <anandb@ti.com> | |
| Mon, 2 Feb 2015 07:39:43 +0000 (13:09 +0530) | ||
| committer | Anand Balagopalakrishnan <anandb@ti.com> | |
| Mon, 2 Feb 2015 07:39:43 +0000 (13:09 +0530) |
diff --combined arch/arm/boot/dts/am57xx-beagle-x15.dts
index a53257cb4d589cc5f87dc46eed4876e431dbddcf,5c6f6a081986a5421a7cb190f86def8527e1c454..506162dce9bdf36d6a5d8ac84e2034c5a12cc0a4
};
hdmi0: connector@1 {
- compatible = "omapdss,hdmi-connector";
+ compatible = "hdmi-connector";
label = "hdmi";
type = "a";
};
tpd12s015: encoder@1 {
- compatible = "omapdss,ti,tpd12s015";
+ compatible = "ti,tpd12s015";
gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>, /* gpio7_10, CT CP HPD */
<&gpio6 28 GPIO_ACTIVE_HIGH>, /* gpio6_28, LS OE */
voltage-tolerance = <1>;
};
+&gpu {
+ gpu0-voltdm = <&voltdm_gpu>;
+ voltage-tolerance = <1>;
+};
+
&mac {
status = "okay";
pinctrl-names = "default", "sleep";
diff --combined arch/arm/boot/dts/dra7-evm.dts
index d7a4a1f62cd000c89f364ba17e2fcb1d9f46a14e,f00db0cb668b9a8074947515c2b7aac46f95f709..1c64dc8f50e25b2c0885775291efa1cee886f7cc
};
hdmi0: connector@1 {
- compatible = "omapdss,hdmi-connector";
+ compatible = "hdmi-connector";
label = "hdmi";
type = "a";
};
};
+ 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 =
"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 {
>;
};
+ 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 */
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 {
#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>;
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>;
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 --combined arch/arm/boot/dts/dra7.dtsi
index a687ade531a6adccc2a845931bf8cb89d8a9a173,e65b69238d3be50f03f62c00318102f8730b72e7..6486cf0ee988bc0b8bce670c17bc201cc6d92aa3
pinctrl-single,function-mask = <0x3fffffff>;
};
+ dra7_iodelay_core: padconf@4844a000 {
+ compatible = "ti,dra7-iodelay";
+ reg = <0x4844a000 0x0d1c>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+
sdma: dma-controller@4a056000 {
compatible = "ti,omap4430-sdma";
reg = <0x4a056000 0x1000>;
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>;
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";
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 --combined arch/arm/boot/dts/dra72-evm.dts
index 1271fd92c82225c65d9db97f4c07e920430685a0,fe8c3e7ca88226bc3c9e922db6109055ceb0bf36..c299b5243bef669b21798874ffc2855019a5ff6f
};
tpd12s015: encoder@0 {
- compatible = "omapdss,ti,tpd12s015";
+ compatible = "ti,tpd12s015";
pinctrl-names = "default";
pinctrl-0 = <&hpd_pin>;
};
hdmi0: connector@0 {
- compatible = "omapdss,hdmi-connector";
+ compatible = "hdmi-connector";
label = "hdmi";
type = "a";
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 =
"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 {
>;
};
+ 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 */
>;
};
+ 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 */
>;
};
+ 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 */
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 {
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>;
>;
};
+&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 --combined ti_config_fragments/baseport.cfg
index 46fce195449920c9fa9f46c7969cb9df631ec4b7,feae1f43eddf37bee7f8f79e59882cf7e15a8002..fabd82a4f8b680d993e4b92476b507c9a1103fbe
CONFIG_REGULATOR_GPIO=y
+ # pinctrl
+ CONFIG_PINCTRL_TI_IODELAY=y
+
# Crypto hardware accelerators
CONFIG_CRYPTO_DEV_OMAP_SHAM=y
CONFIG_CRYPTO_DEV_OMAP_AES=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
CONFIG_JUMP_LABEL=y