| author | Felipe Balbi <balbi@ti.com> | |
| Wed, 24 Apr 2013 11:36:31 +0000 (14:36 +0300) | ||
| committer | Felipe Balbi <balbi@ti.com> | |
| Wed, 24 Apr 2013 11:36:31 +0000 (14:36 +0300) |
* 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
Revert "ARM: OMAP5: Enable workaround for 798181"
ARM: dts: omap4-panda: move generic sections to panda-common
ARM: OMAP5: Source DPLL_ABE from sys_clk
ARM: OMAP5: Init DPLL_ABE CLKOUTX2_M2 to 196MHz
ARM: OMAP5: Enable workaround for 798181
arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
Revert "ARM: OMAP5: Enable workaround for 798181"
ARM: dts: omap4-panda: move generic sections to panda-common
ARM: OMAP5: Source DPLL_ABE from sys_clk
ARM: OMAP5: Init DPLL_ABE CLKOUTX2_M2 to 196MHz
ARM: OMAP5: Enable workaround for 798181
arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
diff --cc arch/arm/Kconfig
Simple merge
index 0000000000000000000000000000000000000000,122fd99f7bf82d021403882561ef21e20f892e71..52bb823065d1617d7a42b251efafdc3291f7aa45
mode 000000,100644..100644
mode 000000,100644..100644
--- /dev/null
- "AFMR", "Line In";
+ /*
+ * Copyright (C) 2011-2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+ /include/ "elpida_ecb240abacn.dtsi"
+
+ / {
+ model = "TI OMAP4 PandaBoard";
+ compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";
+
+ memory {
+ device_type = "memory";
+ reg = <0x80000000 0x40000000>; /* 1 GB */
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ heartbeat {
+ label = "pandaboard::status1";
+ gpios = <&gpio1 7 0>;
+ linux,default-trigger = "heartbeat";
+ };
+
+ mmc {
+ label = "pandaboard::status2";
+ gpios = <&gpio1 8 0>;
+ linux,default-trigger = "mmc0";
+ };
+ };
+
+ sound: sound {
+ compatible = "ti,abe-twl6040";
+ ti,model = "PandaBoard";
+
+ ti,mclk-freq = <38400000>;
+
+ ti,mcpdm = <&mcpdm>;
++ ti,mcbsp1 = <&mcbsp1>;
++ ti,mcbsp2 = <&mcbsp2>;
++ ti,aess = <&aess>;
+
+ ti,twl6040 = <&twl6040>;
+
+ /* Audio routing */
+ ti,audio-routing =
+ "Headset Stereophone", "HSOL",
+ "Headset Stereophone", "HSOR",
+ "Ext Spk", "HFL",
+ "Ext Spk", "HFR",
+ "Line Out", "AUXL",
+ "Line Out", "AUXR",
+ "HSMIC", "Headset Mic",
+ "Headset Mic", "Headset Mic Bias",
+ "AFML", "Line In",
++ "AFMR", "Line In",
++ "Headset Playback", "PDM_DL1",
++ "Handsfree Playback", "PDM_DL2",
++ "PDM_UL1", "Capture",
++ "40122000.mcbsp Playback", "BT_VX_DL",
++ "BT_VX_UL", "40122000.mcbsp Capture",
++ "40124000.mcbsp Playback", "MM_EXT_DL",
++ "MM_EXT_UL", "40124000.mcbsp Capture";
++ };
++
++ sound_hdmi {
++ compatible = "ti,omap-hdmi-tpd12s015-audio";
++ ti,model = "OMAP4HDMI";
++
++ ti,hdmi_audio = <&hdmi>;
++ ti,level_shifter = <&tpd12s015>;
++ };
++
++ /* HS USB Port 1 RESET */
++ hsusb1_reset: hsusb1_reset_reg {
++ compatible = "regulator-fixed";
++ regulator-name = "hsusb1_reset";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ gpio = <&gpio2 30 0>; /* gpio_62 */
++ startup-delay-us = <70000>;
++ enable-active-high;
++ };
++
++ /* HS USB Port 1 Power */
++ hsusb1_power: hsusb1_power_reg {
++ compatible = "regulator-fixed";
++ regulator-name = "hsusb1_vbus";
++ regulator-min-microvolt = <3300000>;
++ regulator-max-microvolt = <3300000>;
++ gpio = <&gpio1 1 0>; /* gpio_1 */
++ startup-delay-us = <70000>;
++ enable-active-high;
++ };
++
++ /* HS USB Host PHY on PORT 1 */
++ hsusb1_phy: hsusb1_phy {
++ compatible = "usb-nop-xceiv";
++ reset-supply = <&hsusb1_reset>;
++ vcc-supply = <&hsusb1_power>;
++ };
++
++ /* hsusb1_phy is clocked by FREF_CLK3 i.e. auxclk3 */
++ clock_alias {
++ clock-name = "auxclk3_ck";
++ clock-alias = "main_clk";
++ device = <&hsusb1_phy>;
+ };
+ };
+
+ &omap4_pmx_core {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &twl6040_pins
+ &mcpdm_pins
+ &mcbsp1_pins
+ &dss_hdmi_pins
+ &tpd12s015_pins
++ &hsusbb1_pins
+ >;
+
+ twl6040_pins: pinmux_twl6040_pins {
+ pinctrl-single,pins = <
+ 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */
+ 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */
+ >;
+ };
+
+ mcpdm_pins: pinmux_mcpdm_pins {
+ pinctrl-single,pins = <
+ 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */
+ 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */
+ 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */
+ 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */
+ 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */
+ >;
+ };
+
+ mcbsp1_pins: pinmux_mcbsp1_pins {
+ pinctrl-single,pins = <
+ 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */
+ 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */
+ 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */
+ 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */
+ >;
+ };
+
+ dss_hdmi_pins: pinmux_dss_hdmi_pins {
+ pinctrl-single,pins = <
+ 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+ 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
+ 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
+ >;
+ };
+
+ tpd12s015_pins: pinmux_tpd12s015_pins {
+ pinctrl-single,pins = <
+ 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */
+ 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */
+ 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
+ >;
+ };
+
++ hsusbb1_pins: pinmux_hsusbb1_pins {
++ pinctrl-single,pins = <
++ 0x82 0x10C /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk INPUT | PULLDOWN */
++ 0x84 0x4 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */
++ 0x86 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */
++ 0x88 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */
++ 0x8a 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */
++ 0x8c 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */
++ 0x8e 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */
++ 0x90 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */
++ 0x92 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */
++ 0x94 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */
++ 0x96 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */
++ 0x98 0x104 /* USBB1_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */
++ >;
++ };
++
+ i2c1_pins: pinmux_i2c1_pins {
+ pinctrl-single,pins = <
+ 0xe2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */
+ 0xe4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */
+ >;
+ };
+
+ i2c2_pins: pinmux_i2c2_pins {
+ pinctrl-single,pins = <
+ 0xe6 0x118 /* i2c2_scl PULLUP | INPUTENABLE | MODE0 */
+ 0xe8 0x118 /* i2c2_sda PULLUP | INPUTENABLE | MODE0 */
+ >;
+ };
+
+ i2c3_pins: pinmux_i2c3_pins {
+ pinctrl-single,pins = <
+ 0xea 0x118 /* i2c3_scl PULLUP | INPUTENABLE | MODE0 */
+ 0xec 0x118 /* i2c3_sda PULLUP | INPUTENABLE | MODE0 */
+ >;
+ };
+
+ i2c4_pins: pinmux_i2c4_pins {
+ pinctrl-single,pins = <
+ 0xee 0x118 /* i2c4_scl PULLUP | INPUTENABLE | MODE0 */
+ 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */
+ >;
+ };
+ };
+
+ &i2c1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pins>;
+
+ clock-frequency = <400000>;
+
+ twl: twl@48 {
+ reg = <0x48>;
+ /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
+ interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
+ interrupt-parent = <&gic>;
+ };
+
+ twl6040: twl@4b {
+ compatible = "ti,twl6040";
+ reg = <0x4b>;
+ /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
+ interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
+ interrupt-parent = <&gic>;
+ ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */
+
+ vio-supply = <&v1v8>;
+ v2v1-supply = <&v2v1>;
+ enable-active-high;
+ };
+ };
+
+ /include/ "twl6030.dtsi"
++/include/ "twl6040.dtsi"
+
+ &i2c2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pins>;
+
+ clock-frequency = <400000>;
+ };
+
+ &i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins>;
+
+ clock-frequency = <100000>;
+
+ /*
+ * Display monitor features are burnt in their EEPROM as EDID data.
+ * The EEPROM is connected as I2C slave device.
+ */
+ eeprom@50 {
+ compatible = "ti,eeprom";
+ reg = <0x50>;
+ };
+ };
+
+ &i2c4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c4_pins>;
+
+ clock-frequency = <400000>;
+ };
+
+ &mmc1 {
+ vmmc-supply = <&vmmc>;
+ bus-width = <8>;
+ };
+
+ &mmc2 {
+ status = "disabled";
+ };
+
+ &mmc3 {
+ status = "disabled";
+ };
+
+ &mmc4 {
+ status = "disabled";
+ };
+
+ &mmc5 {
+ ti,non-removable;
+ bus-width = <4>;
+ };
+
+ &emif1 {
+ cs1-used;
+ device-handle = <&elpida_ECB240ABACN>;
+ };
+
+ &emif2 {
+ cs1-used;
+ device-handle = <&elpida_ECB240ABACN>;
+ };
+
+ &mcbsp2 {
+ status = "disabled";
+ };
+
+ &mcbsp3 {
+ status = "disabled";
+ };
+
+ &dmic {
+ status = "disabled";
+ };
+
++&dpi {
++ dvi {
++ compatible = "ti,tfp410";
++ data-lines = <24>;
++ gpios = <&gpio1 0 0>; /* 0, power-down */
++ i2c-bus = <&i2c3>;
++ };
++};
++
++&hdmi {
++ tpd12s015: tpd12s015 {
++ compatible = "ti,tpd12s015";
++
++ gpios = <&gpio2 28 0>, /* 60, CT CP HPD */
++ <&gpio2 9 0>, /* 41, LS OE */
++ <&gpio2 31 0>; /* 63, HPD */
++
++ hdmi {
++ compatible = "ti,hdmi_panel";
++ };
++
++ };
++};
++
+ &twl_usb_comparator {
+ usb-supply = <&vusb>;
+ };
++
++&usbhshost {
++ port1-mode = "ehci-phy";
++};
++
++&usbhsehci {
++ phys = <&hsusb1_phy>;
++};
++
++&usb_otg_hs {
++ interface-type = <1>;
++ mode = <3>;
++ power = <50>;
++};
diff --cc arch/arm/boot/dts/omap4-panda-es.dts
Simple merge
diff --cc arch/arm/mach-omap2/cclock54xx_data.c
Simple merge