forked from luck/tmp_suning_uos_patched
578f1ef91a
As usual we have a few new drivers: - TI LP8788 - TI OMAP USB TLL - Maxim MAX8907 - SMSC ECE1099 - Dialog Semiconductor DA9055 - A simpler syscon driver that allow us to get rid of the anatop one. Drivers are also gradually getting Device Tree and IRQ domain support. The following drivers got DT support: - palmas, 88pm860x, tc3589x and twl4030-audio And those ones now use the IRQ domain APIs: - 88pm860x, tc3589x, db8500_prcmu Also some other interesting changes: - Intel's ICH LPC now supports Lynx Point - TI's twl4030-audio added a GPO child - tps6527 enabled its backlight subdevice - The twl6030 pwm driver moved to the new PWM subsystem And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x, palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQbVq4AAoJEIqAPN1PVmxKXOsP/ifwoqYkaGUsZ7M8b8iTTxlk a0/SBU1O+FDG7LbIsOyJ6VZCpipj8R4WyVqNdS2CSPVoSdT8KnakrxFY9FAtcmpA c6O7r+9dymcT7HeQ6mBQYYeEyXcZQkTXj9Y298zuRT88gccH5PQIOX8DTj6gKVxN xhuDuAWtizvwAJWfof/57p7JLilCF96Hq0UdeISD10UWJPxPmXFJTzzYw6GbPPOl zk1N6yig3VpK6sfK+QdqZykHFKj23RX57SmceHOISTpEr66ayuKIkJEqWm/IydMO XWDTT2IN80ca+1PnbrQOyiMtXg3EKrZN5WDEp2AcUiKP0fnAoZBTeuZUkqyLc3rJ W8LowQe6x5154CeLwcJc4+kmeGUhbj09GHKCsI7x/lQpMWgJCaGHGvLxAUE1uRZi 4Bn9IUP7OqE465fNolLOd1fRxgzWJxe5rBYKQB7UcOrS0NThPhu0r0qV905zBrBO tyCZz+PexTiirpbv1K0dMTcpWeHVOmtYG5uJTmw9wTRv7jW7aUhkhkW5Q+E5BAdb 9Rj5/vYertqI3VzRQ1w2z1SavzBO3OykTURWGDkwjfFWYbJtEdPYGGjRSFiphVYG 8jvs5UzrDm2ICqkpkKzovVWi9lXyvNVVCgSwxHQeoPXfqb5dXLlbUZZBaCaQpRII XlItAJvIiUNIA8bXLoC8 =n6lp -----END PGP SIGNATURE----- Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFD changes from Samuel Ortiz: "MFD bits for the 3.7 merge window. As usual we have a few new drivers: - TI LP8788 - TI OMAP USB TLL - Maxim MAX8907 - SMSC ECE1099 - Dialog Semiconductor DA9055 - A simpler syscon driver that allow us to get rid of the anatop one. Drivers are also gradually getting Device Tree and IRQ domain support. The following drivers got DT support: - palmas, 88pm860x, tc3589x and twl4030-audio And those ones now use the IRQ domain APIs: - 88pm860x, tc3589x, db8500_prcmu Also some other interesting changes: - Intel's ICH LPC now supports Lynx Point - TI's twl4030-audio added a GPO child - tps6527 enabled its backlight subdevice - The twl6030 pwm driver moved to the new PWM subsystem And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x, palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family." Fix up various annoying conflicts: the DT and IRQ domain support came in twice and was already in 3.6. And then it was apparently rebased. Guys, DON'T REBASE! * tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits) ARM: dts: Enable 88pm860x pmic mfd: 88pm860x: Move gpadc init into touch mfd: 88pm860x: Device tree support mfd: 88pm860x: Use irqdomain mfd: smsc: Add support for smsc gpio io/keypad driver backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe mfd: DA9055 core driver mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list mfd: wm5110: Add register patches for revision B mfd: wm5110: Disable control interface error report for WM5110 rev B mfd: max8907: Remove regulator-compatible from DT docs backlight: Add TPS65217 WLED driver mfd: Add backlight as subdevice to the tps65217 mfd: Provide the PRCMU with its own IRQ domain mfd: Fix max8907 sparse warning mfd: Add lp8788 mfd driver mfd: dbx500: Provide a more accurate smp_twd clock mfd: rc5t583: Fix warning messages regulator: palmas: Add DT support mfd: palmas: Change regulator defns to better suite DT ...
150 lines
3.0 KiB
Plaintext
150 lines
3.0 KiB
Plaintext
/*
|
|
* Copyright (C) 2012 Marvell Technology Group Ltd.
|
|
* Author: Haojian Zhuang <haojian.zhuang@marvell.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
|
|
* publishhed by the Free Software Foundation.
|
|
*/
|
|
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
aliases {
|
|
serial0 = &uart1;
|
|
serial1 = &uart2;
|
|
serial2 = &uart3;
|
|
i2c0 = &twsi1;
|
|
i2c1 = &twsi2;
|
|
};
|
|
|
|
soc {
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "simple-bus";
|
|
interrupt-parent = <&intc>;
|
|
ranges;
|
|
|
|
L2: l2-cache {
|
|
compatible = "marvell,tauros2-cache";
|
|
marvell,tauros2-cache-features = <0x3>;
|
|
};
|
|
|
|
axi@d4200000 { /* AXI */
|
|
compatible = "mrvl,axi-bus", "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0xd4200000 0x00200000>;
|
|
ranges;
|
|
|
|
intc: interrupt-controller@d4282000 {
|
|
compatible = "mrvl,mmp-intc";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
reg = <0xd4282000 0x1000>;
|
|
mrvl,intc-nr-irqs = <64>;
|
|
};
|
|
|
|
};
|
|
|
|
apb@d4000000 { /* APB */
|
|
compatible = "mrvl,apb-bus", "simple-bus";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0xd4000000 0x00200000>;
|
|
ranges;
|
|
|
|
timer0: timer@d4014000 {
|
|
compatible = "mrvl,mmp-timer";
|
|
reg = <0xd4014000 0x100>;
|
|
interrupts = <13>;
|
|
};
|
|
|
|
timer1: timer@d4016000 {
|
|
compatible = "mrvl,mmp-timer";
|
|
reg = <0xd4016000 0x100>;
|
|
interrupts = <29>;
|
|
status = "disabled";
|
|
};
|
|
|
|
uart1: uart@d4017000 {
|
|
compatible = "mrvl,mmp-uart";
|
|
reg = <0xd4017000 0x1000>;
|
|
interrupts = <27>;
|
|
status = "disabled";
|
|
};
|
|
|
|
uart2: uart@d4018000 {
|
|
compatible = "mrvl,mmp-uart";
|
|
reg = <0xd4018000 0x1000>;
|
|
interrupts = <28>;
|
|
status = "disabled";
|
|
};
|
|
|
|
uart3: uart@d4036000 {
|
|
compatible = "mrvl,mmp-uart";
|
|
reg = <0xd4036000 0x1000>;
|
|
interrupts = <59>;
|
|
status = "disabled";
|
|
};
|
|
|
|
gpio@d4019000 {
|
|
compatible = "mrvl,mmp-gpio";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
reg = <0xd4019000 0x1000>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
interrupts = <49>;
|
|
interrupt-names = "gpio_mux";
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|
|
ranges;
|
|
|
|
gcb0: gpio@d4019000 {
|
|
reg = <0xd4019000 0x4>;
|
|
};
|
|
|
|
gcb1: gpio@d4019004 {
|
|
reg = <0xd4019004 0x4>;
|
|
};
|
|
|
|
gcb2: gpio@d4019008 {
|
|
reg = <0xd4019008 0x4>;
|
|
};
|
|
|
|
gcb3: gpio@d4019100 {
|
|
reg = <0xd4019100 0x4>;
|
|
};
|
|
};
|
|
|
|
twsi1: i2c@d4011000 {
|
|
compatible = "mrvl,mmp-twsi";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0xd4011000 0x1000>;
|
|
interrupts = <7>;
|
|
mrvl,i2c-fast-mode;
|
|
status = "disabled";
|
|
};
|
|
|
|
twsi2: i2c@d4037000 {
|
|
compatible = "mrvl,mmp-twsi";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
reg = <0xd4037000 0x1000>;
|
|
interrupts = <54>;
|
|
status = "disabled";
|
|
};
|
|
|
|
rtc: rtc@d4010000 {
|
|
compatible = "mrvl,mmp-rtc";
|
|
reg = <0xd4010000 0x1000>;
|
|
interrupts = <5 6>;
|
|
interrupt-names = "rtc 1Hz", "rtc alarm";
|
|
status = "disabled";
|
|
};
|
|
};
|
|
};
|
|
};
|