[Gta04-owner] Updates for gta04 DTS file.
NeilBrown
neilb at suse.de
Sat Jan 3 20:27:39 CET 2015
Hi Marek, Nikolaus,
I'm wondering what your plans are for pushing more updates for the gta04 dts
file upstream? There are quite a few fixes that both of us have in our
different trees and I'm hoping they can go upstream soon.
I have the following 11 patches which I could send upstream with your
Acked-by, or which I could send you to be forwarded to Tony, or which could
simply become irrelevant if you'll be sending your own patches upstream soon.
I've included the list of patch titles and the combined diff below. The
individual patches are in
git://neil.brown.name/gta04 dts
or at
http://git.neil.brown.name/?p=gta04.git;a=shortlog;h=refs/heads/dts
or I am happy to post them here.
Please let me know how you would like to proceed.
Thanks,
NeilBrown
240032b8e5d0 ARM: dts: omap3-gta04: Fix backup-batter charging in devicetree file.
1952bcfc8ed9 ARM: dts: omap3-gta04: fix 'audio' support in dts file.
cb76288505d5 ARM: dts: omap3-gta04: enable power-off for wifi card.
63b30d81fe70 ARM: dts: omap3-gta04: add support for sdio interrupts.
c37e22cfbc81 ARM: dts: omap3-gta04: enable twl4030 vibra support.
d4fc3348b047 ARM: dts: omap3-gta04: add gyroscope
32fed6f9b265 ARM: dts: omap3-gta04: Fix a GPIO line.
996f155b15ae ARM: dts: omap3-gta04: enable power-off using twl4030.
77e45c0ef4a6 ARM: dts: omap3-gta04: only power DSS when necessary.
0771ff4ceb6d ARM: dts: omap3-gta04: uart4 is not connected, so mark it "disabled"
6335b9eaef8c ARM: dts: omap3-gta04: Disable keypad
diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 655d6e920a86..09ba98c494f3 100644
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -134,6 +134,26 @@
>;
};
+ mmc2_pins: pinmux_mmc2_pins {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_clk */
+ OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_cmd */
+ OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat0 */
+ OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat1 */
+ OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat2 */
+ OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc2_dat3 */
+ OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dir_dat0 */
+ OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_dir_dat1 */
+ OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_cmd */
+ OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_clkin */
+ >;
+ };
+ mmc2_cirq_pin: pinmux_cirq_pin {
+ pinctrl-single,pins = <
+ OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE4) /* sdmmc2_dat1 as GPIO_133 GPIO5,5 */
+ >;
+ };
+
dss_dpi_pins: pinmux_dss_dpi_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0) /* dss_pclk.dss_pclk */
@@ -202,11 +222,12 @@
reg = <0x48>;
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;
- };
- twl_audio: audio {
- compatible = "ti,twl4030-audio";
- codec {
+ twl_audio: audio {
+ compatible = "ti,twl4030-audio";
+ ti,enable-vibra = <1>;
+ codec {
+ };
};
};
};
@@ -222,15 +243,23 @@
compatible = "bosch,bmp085";
reg = <0x77>;
interrupt-parent = <&gpio4>;
- interrupts = <17 IRQ_TYPE_EDGE_RISING>;
+ interrupts = <17 IRQ_TYPE_EDGE_RISING>; /* GPIO_113 */
};
/* accelerometer */
bma180 at 41 {
compatible = "bosch,bma180";
reg = <0x41>;
- interrupt-parent = <&gpio3>;
- interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
+ };
+
+ /* gyroscope */
+ itg3200 at 68 {
+ compatible = "invensense,itg3200";
+ reg = <0x68>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <24 0>; /* GPIO_56 */
};
/* leds */
@@ -281,7 +310,7 @@
compatible = "ti,tsc2007";
reg = <0x48>;
interrupt-parent = <&gpio6>;
- interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
+ interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */
gpios = <&gpio6 0 GPIO_ACTIVE_LOW>;
ti,x-plate-ohms = <600>;
};
@@ -320,12 +349,22 @@
vmmc-supply = <&vaux4>;
bus-width = <4>;
ti,non-removable;
+ cap-power-off-card;
+ interrupts-extended = <&intc 86 &gpio5 5 0>; /* GPIO_133 */
+ pinctrl-names = "default", "active", "idle";
+ pinctrl-0 = <&mmc2_pins>;
+ pinctrl-1 = <&mmc2_pins>;
+ pinctrl-2 = <&mmc2_cirq_pin>;
};
&mmc3 {
status = "disabled";
};
+&twl_keypad {
+ status = "disabled";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins>;
@@ -341,9 +380,13 @@
pinctrl-0 = <&uart3_pins>;
};
+&uart4 {
+ status = "disabled";
+};
+
&charger {
- bb_uvolt = <3200000>;
- bb_uamp = <150>;
+ ti,bb-uvolt = <3200000>;
+ ti,bb-uamp = <150>;
};
/* spare */
@@ -377,16 +420,12 @@
regulator-max-microvolt = <3150000>;
};
-/* Needed to power the DPI pins */
-&vpll2 {
- regulator-always-on;
-};
-
&dss {
pinctrl-names = "default";
pinctrl-0 = < &dss_dpi_pins >;
status = "okay";
+ vdds_dsi-supply = <&vpll2>;
port {
dpi_out: endpoint {
@@ -449,3 +488,11 @@
};
};
};
+
+&mcbsp2 {
+ status = "okay";
+};
+
+&twl_power {
+ ti,use_poweroff;
+};
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 36ae9160b558..863af659be9a 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -25,6 +25,10 @@
bci3v1-supply = <&vusb3v1>;
};
+ twl_power: power {
+ compatible = "ti,twl4030-power";
+ };
+
watchdog {
compatible = "ti,twl4030-wdt";
};
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.goldelico.com/pipermail/gta04-owner/attachments/20150104/d45aa460/attachment.asc>
More information about the Gta04-owner
mailing list