29b2031139
commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream.
The pinmuxing was missing for I2C1 which was causing intermittent issues
with the PMIC which is connected to I2C1. The bootloader did not quite
configure the I2C1 either, so when running at 2.6MHz, it was generating
errors at time.
This correctly sets the I2C1 pinmuxing so it can operate at 2.6MHz
Fixes: 687c276761 ("ARM: dts: Add minimal support for LogicPD Torpedo
DM3730 devkit")
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
171 lines
4.2 KiB
Text
171 lines
4.2 KiB
Text
/*
|
|
* 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 <dt-bindings/input/input.h>
|
|
|
|
/ {
|
|
cpus {
|
|
cpu@0 {
|
|
cpu0-supply = <&vcc>;
|
|
};
|
|
};
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
user0 {
|
|
label = "user0";
|
|
gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */
|
|
linux,default-trigger = "none";
|
|
};
|
|
};
|
|
|
|
wl12xx_vmmc: wl12xx_vmmc {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vwl1271";
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <1800000>;
|
|
gpio = <&gpio5 29 0>; /* gpio157 */
|
|
startup-delay-us = <70000>;
|
|
enable-active-high;
|
|
vin-supply = <&vmmc2>;
|
|
};
|
|
};
|
|
|
|
&gpmc {
|
|
ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */
|
|
|
|
nand@0,0 {
|
|
linux,mtd-name = "micron,mt29f4g16abbda3w";
|
|
reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
|
|
nand-bus-width = <16>;
|
|
ti,nand-ecc-opt = "bch8";
|
|
gpmc,sync-clk-ps = <0>;
|
|
gpmc,cs-on-ns = <0>;
|
|
gpmc,cs-rd-off-ns = <44>;
|
|
gpmc,cs-wr-off-ns = <44>;
|
|
gpmc,adv-on-ns = <6>;
|
|
gpmc,adv-rd-off-ns = <34>;
|
|
gpmc,adv-wr-off-ns = <44>;
|
|
gpmc,we-off-ns = <40>;
|
|
gpmc,oe-off-ns = <54>;
|
|
gpmc,access-ns = <64>;
|
|
gpmc,rd-cycle-ns = <82>;
|
|
gpmc,wr-cycle-ns = <82>;
|
|
gpmc,wr-access-ns = <40>;
|
|
gpmc,wr-data-mux-bus-ns = <0>;
|
|
gpmc,device-width = <2>;
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
/* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */
|
|
|
|
x-loader@0 {
|
|
label = "x-loader";
|
|
reg = <0 0x80000>;
|
|
};
|
|
|
|
bootloaders@80000 {
|
|
label = "u-boot";
|
|
reg = <0x80000 0x1e0000>;
|
|
};
|
|
|
|
bootloaders_env@260000 {
|
|
label = "u-boot-env";
|
|
reg = <0x260000 0x20000>;
|
|
};
|
|
|
|
kernel@280000 {
|
|
label = "kernel";
|
|
reg = <0x280000 0x400000>;
|
|
};
|
|
|
|
filesystem@680000 {
|
|
label = "fs";
|
|
reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */
|
|
};
|
|
};
|
|
};
|
|
|
|
&i2c1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&i2c1_pins>;
|
|
clock-frequency = <2600000>;
|
|
|
|
twl: twl@48 {
|
|
reg = <0x48>;
|
|
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
|
|
interrupt-parent = <&intc>;
|
|
};
|
|
};
|
|
|
|
/*
|
|
* Only found on the wireless SOM. For the SOM without wireless, the pins for
|
|
* MMC3 can be routed with jumpers to the second MMC slot on the devkit and
|
|
* gpio157 is not connected. So this should be OK to keep common for now,
|
|
* probably device tree overlays is the way to go with the various SOM and
|
|
* jumpering combinations for the long run.
|
|
*/
|
|
&mmc3 {
|
|
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
|
|
pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>;
|
|
pinctrl-names = "default";
|
|
vmmc-supply = <&wl12xx_vmmc>;
|
|
non-removable;
|
|
bus-width = <4>;
|
|
cap-power-off-card;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
wlcore: wlcore@2 {
|
|
compatible = "ti,wl1283";
|
|
reg = <2>;
|
|
interrupt-parent = <&gpio5>;
|
|
interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */
|
|
ref-clock-frequency = <26000000>;
|
|
tcxo-clock-frequency = <26000000>;
|
|
};
|
|
};
|
|
|
|
&omap3_pmx_core {
|
|
mmc3_pins: pinmux_mm3_pins {
|
|
pinctrl-single,pins = <
|
|
OMAP3_CORE1_IOPAD(0x2164, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat4.sdmmc3_dat0 */
|
|
OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */
|
|
OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */
|
|
OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */
|
|
OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */
|
|
OMAP3_CORE1_IOPAD(0x218e, PIN_OUTPUT | MUX_MODE4) /* mcbsp1_fsr.gpio_157 */
|
|
>;
|
|
};
|
|
i2c1_pins: pinmux_i2c1_pins {
|
|
pinctrl-single,pins = <
|
|
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
|
|
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
|
|
>;
|
|
};
|
|
};
|
|
|
|
&omap3_pmx_core2 {
|
|
mmc3_core2_pins: pinmux_mmc3_core2_pins {
|
|
pinctrl-single,pins = <
|
|
OMAP3630_CORE2_IOPAD(0x25d8, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_clk.sdmmc3_clk */
|
|
OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_ctl.sdmmc3_cmd */
|
|
>;
|
|
};
|
|
};
|
|
|
|
#include "twl4030.dtsi"
|
|
#include "twl4030_omap3.dtsi"
|
|
|
|
&twl {
|
|
twl_power: power {
|
|
compatible = "ti,twl4030-power-idle-osc-off", "ti,twl4030-power-idle";
|
|
ti,use_poweroff;
|
|
};
|
|
};
|
|
|
|
&twl_gpio {
|
|
ti,use-leds;
|
|
};
|