openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel-dt-regulator' into devel-dt

This commit is contained in:
Tony Lindgren 2012-08-30 13:47:23 -07:00
parent 85d7ff9b90 624411ceba
commit 39b1bb2e0c
7 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/am33xx.dtsi
View File

@ -163,5 +163,10 @@ i2c3: i2c@4819C000 {
ti,hwmods = "i2c3";
status = "disabled";
};
wdt2: wdt@44e35000 {
compatible = "ti,omap3-wdt";
ti,hwmods = "wd_timer2";
};
};
};

2
arch/arm/boot/dts/omap3-beagle.dts
View File

@ -27,7 +27,7 @@ twl: twl@48 {
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;
vsim: regulator@10 {
vsim: regulator-vsim {
compatible = "ti,twl4030-vsim";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;

4
arch/arm/boot/dts/omap4-sdp.dts
View File

@ -18,7 +18,7 @@ memory {
reg = <0x80000000 0x40000000>; /* 1 GB */
};
vdd_eth: fixedregulator@0 {
vdd_eth: fixedregulator-vdd-eth {
compatible = "regulator-fixed";
regulator-name = "VDD_ETH";
regulator-min-microvolt = <3300000>;
@ -28,7 +28,7 @@ vdd_eth: fixedregulator@0 {
regulator-boot-on;
};
vbat: fixedregulator@2 {
vbat: fixedregulator-vbat {
compatible = "regulator-fixed";
regulator-name = "VBAT";
regulator-min-microvolt = <3750000>;

6
arch/arm/boot/dts/twl4030.dtsi
View File

@ -19,19 +19,19 @@ rtc {
interrupts = <11>;
};
vdac: regulator@0 {
vdac: regulator-vdac {
compatible = "ti,twl4030-vdac";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
vpll2: regulator@1 {
vpll2: regulator-vpll2 {
compatible = "ti,twl4030-vpll2";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
vmmc1: regulator@2 {
vmmc1: regulator-vmmc1 {
compatible = "ti,twl4030-vmmc1";
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <3150000>;

29
arch/arm/boot/dts/twl6030.dtsi
View File

@ -20,67 +20,70 @@ rtc {
interrupts = <11>;
};
vaux1: regulator@0 {
vaux1: regulator-vaux1 {
compatible = "ti,twl6030-vaux1";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3000000>;
};
vaux2: regulator@1 {
vaux2: regulator-vaux2 {
compatible = "ti,twl6030-vaux2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <2800000>;
};
vaux3: regulator@2 {
vaux3: regulator-vaux3 {
compatible = "ti,twl6030-vaux3";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3000000>;
};
vmmc: regulator@3 {
vmmc: regulator-vmmc {
compatible = "ti,twl6030-vmmc";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <3000000>;
};
vpp: regulator@4 {
vpp: regulator-vpp {
compatible = "ti,twl6030-vpp";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2500000>;
};
vusim: regulator@5 {
vusim: regulator-vusim {
compatible = "ti,twl6030-vusim";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <2900000>;
};
vdac: regulator@6 {
vdac: regulator-vdac {
compatible = "ti,twl6030-vdac";
};
vana: regulator@7 {
vana: regulator-vana {
compatible = "ti,twl6030-vana";
};
vcxio: regulator@8 {
vcxio: regulator-vcxio {
compatible = "ti,twl6030-vcxio";
regulator-always-on;
};
vusb: regulator@9 {
vusb: regulator-vusb {
compatible = "ti,twl6030-vusb";
};
v1v8: regulator@10 {
v1v8: regulator-v1v8 {
compatible = "ti,twl6030-v1v8";
regulator-always-on;
};
v2v1: regulator@11 {
v2v1: regulator-v2v1 {
compatible = "ti,twl6030-v2v1";
regulator-always-on;
};
clk32kg: regulator@12 {
clk32kg: regulator-clk32kg {
compatible = "ti,twl6030-clk32kg";
};
};

1
arch/arm/mach-omap2/Kconfig
View File

@ -69,6 +69,7 @@ config SOC_OMAP5
select CPU_V7
select ARM_GIC
select HAVE_SMP
select ARM_CPU_SUSPEND if PM
comment "OMAP Core Type"
depends on ARCH_OMAP2

2
arch/arm/mach-omap2/board-igep0020.c
View File

@ -554,6 +554,8 @@ static const struct usbhs_omap_board_data igep3_usbhs_bdata __initconst = {
#ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = {
/* SMSC9221 LAN Controller ETH IRQ (GPIO_176) */
OMAP3_MUX(MCSPI1_CS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
#endif