mirror of https://gitee.com/openkylin/linux.git
Device-Tree updates for DaVinci. This
contains some clean-up and fixes of device-tree data and addition of i2c1 node for DA850. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJXEM3jAAoJEGFBu2jqvgRNVlYP/0c/6m8c3aiKpIwC7Zs9UhGE pUX/tqr2LsfHQVMoLOcphMpEV6rBebgL9IzIYuODHY7ggcrPENjAFqa8luTjbyAE BbqRyCLnsVW0BWtYcTS4aUiBeY83E7rV9SIn2z5yHr3iB5b6mPkudeuGpwz3sJV0 vTFSlXluCIr/slJuFt7FmpR4Ot5jFl3vMT4eZwEFz5CES/ttsR1oOJ1Uw2WY1Ryc vDD0lJLDuYGnEZyqeEXrTcUG7FX7oC1n+A1x1EjTf8s+Vf+o63Fc3Pw5QiyffN28 o5Xnft75xPFgvkc6sQnaGXKnjxd9FOf6sIjz5XhMS6skM4Eq10LMhpdYOlMXOaxi HjjyS6XjE5na+Boaxi8m0FZqR3wB7jabkMz7aijznAnLHGQnUXxqyzhpVsJwGR4l keTkp0wKv+CCfsgazwJ8CyC56f0aIRl2j7jg7vclwa3BTzP1v8QHJAuRJCGzM5vO UIJo+NPH7Cbc5lM/Fvxq1orLScOzhAfUG1ScqXbvWpKuUqEcvSJDEV6bKTExWvmF KWLr9enkC/HuNNGPEVWYrbbRCuTqa02BEnBNxF4X2Ha4y/fhbcFDx++RNv7uBBAJ /928OM9cvXzEcYi4vJWhR6v4gXEJWBPwh11a8jaGErAT7KL4zJsDWDF3FcMz8Lyw f086vz4bOiZL/nM4rVpW =oMYh -----END PGP SIGNATURE----- Merge tag 'davinci-for-v4.7/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt Merge "Device-Tree updates for DaVinci" from Sekhar Nori: This contains some clean-up and fixes of device-tree data and addition of i2c1 node for DA850. * tag 'davinci-for-v4.7/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for i2c1 ARM: DTS: da850: add node for i2c1 ARM: dts: davinci: use proper address after @ ARM: DTS: da850: fix missing #gpio-cells in gpio node
This commit is contained in:
Arnd Bergmann
commit
cb3ba4f716
|
|
@ -16,14 +16,14 @@ / {
|
|||
compatible = "enbw,cmc", "ti,da850";
|
||||
model = "EnBW CMC";
|
||||
|
||||
soc {
|
||||
serial0: serial@1c42000 {
|
||||
soc@1c00000 {
|
||||
serial0: serial@42000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
serial1: serial@10c000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
serial2: serial@10d000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ / {
|
|||
compatible = "ti,da850-evm", "ti,da850";
|
||||
model = "DA850/AM1808/OMAP-L138 EVM";
|
||||
|
||||
soc {
|
||||
pmx_core: pinmux@1c14120 {
|
||||
soc@1c00000 {
|
||||
pmx_core: pinmux@14120 {
|
||||
status = "okay";
|
||||
|
||||
mcasp0_pins: pinmux_mcasp0_pins {
|
||||
|
|
@ -30,19 +30,19 @@ mcasp0_pins: pinmux_mcasp0_pins {
|
|||
>;
|
||||
};
|
||||
};
|
||||
serial0: serial@1c42000 {
|
||||
serial0: serial@42000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
serial1: serial@10c000 {
|
||||
status = "okay";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
serial2: serial@10d000 {
|
||||
status = "okay";
|
||||
};
|
||||
rtc0: rtc@1c23000 {
|
||||
rtc0: rtc@23000 {
|
||||
status = "okay";
|
||||
};
|
||||
i2c0: i2c@1c22000 {
|
||||
i2c0: i2c@22000 {
|
||||
status = "okay";
|
||||
clock-frequency = <100000>;
|
||||
pinctrl-names = "default";
|
||||
|
|
@ -66,17 +66,17 @@ tlv320aic3106: tlv320aic3106@18 {
|
|||
};
|
||||
|
||||
};
|
||||
wdt: wdt@1c21000 {
|
||||
wdt: wdt@21000 {
|
||||
status = "okay";
|
||||
};
|
||||
mmc0: mmc@1c40000 {
|
||||
mmc0: mmc@40000 {
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <4>;
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mmc0_pins>;
|
||||
};
|
||||
spi1: spi@1f0e000 {
|
||||
spi1: spi@30e000 {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&spi1_pins &spi1_cs0_pin>;
|
||||
|
|
@ -116,18 +116,18 @@ partition@5 {
|
|||
};
|
||||
};
|
||||
};
|
||||
mdio: mdio@1e24000 {
|
||||
mdio: mdio@224000 {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mdio_pins>;
|
||||
bus_freq = <2200000>;
|
||||
};
|
||||
eth0: ethernet@1e20000 {
|
||||
eth0: ethernet@220000 {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mii_pins>;
|
||||
};
|
||||
gpio: gpio@1e26000 {
|
||||
gpio: gpio@226000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ arm {
|
|||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
intc: interrupt-controller {
|
||||
intc: interrupt-controller@fffee000 {
|
||||
compatible = "ti,cp-intc";
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <1>;
|
||||
|
|
@ -23,7 +23,7 @@ intc: interrupt-controller {
|
|||
reg = <0xfffee000 0x2000>;
|
||||
};
|
||||
};
|
||||
soc {
|
||||
soc@1c00000 {
|
||||
compatible = "simple-bus";
|
||||
model = "da850";
|
||||
#address-cells = <1>;
|
||||
|
|
@ -31,7 +31,7 @@ soc {
|
|||
ranges = <0x0 0x01c00000 0x400000>;
|
||||
interrupt-parent = <&intc>;
|
||||
|
||||
pmx_core: pinmux@1c14120 {
|
||||
pmx_core: pinmux@14120 {
|
||||
compatible = "pinctrl-single";
|
||||
reg = <0x14120 0x50>;
|
||||
#address-cells = <1>;
|
||||
|
|
@ -63,6 +63,12 @@ i2c0_pins: pinmux_i2c0_pins {
|
|||
0x10 0x00002200 0x0000ff00
|
||||
>;
|
||||
};
|
||||
i2c1_pins: pinmux_i2c1_pins {
|
||||
pinctrl-single,bits = <
|
||||
/* I2C1_SDA, I2C1_SCL */
|
||||
0x10 0x00440000 0x00ff0000
|
||||
>;
|
||||
};
|
||||
mmc0_pins: pinmux_mmc_pins {
|
||||
pinctrl-single,bits = <
|
||||
/* MMCSD0_DAT[3] MMCSD0_DAT[2]
|
||||
|
|
@ -150,7 +156,7 @@ mii_pins: pinmux_mii_pins {
|
|||
};
|
||||
|
||||
};
|
||||
edma0: edma@01c00000 {
|
||||
edma0: edma@0 {
|
||||
compatible = "ti,edma3-tpcc";
|
||||
/* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
|
||||
reg = <0x0 0x8000>;
|
||||
|
|
@ -161,19 +167,19 @@ edma0: edma@01c00000 {
|
|||
|
||||
ti,tptcs = <&edma0_tptc0 7>, <&edma0_tptc1 0>;
|
||||
};
|
||||
edma0_tptc0: tptc@01c08000 {
|
||||
edma0_tptc0: tptc@8000 {
|
||||
compatible = "ti,edma3-tptc";
|
||||
reg = <0x8000 0x400>;
|
||||
interrupts = <13>;
|
||||
interrupt-names = "edm3_tcerrint";
|
||||
};
|
||||
edma0_tptc1: tptc@01c08400 {
|
||||
edma0_tptc1: tptc@8400 {
|
||||
compatible = "ti,edma3-tptc";
|
||||
reg = <0x8400 0x400>;
|
||||
interrupts = <32>;
|
||||
interrupt-names = "edm3_tcerrint";
|
||||
};
|
||||
edma1: edma@01e30000 {
|
||||
edma1: edma@230000 {
|
||||
compatible = "ti,edma3-tpcc";
|
||||
/* eDMA3 CC1: 0x01e3 0000 - 0x01e3 7fff */
|
||||
reg = <0x230000 0x8000>;
|
||||
|
|
@ -184,41 +190,41 @@ edma1: edma@01e30000 {
|
|||
|
||||
ti,tptcs = <&edma1_tptc0 7>;
|
||||
};
|
||||
edma1_tptc0: tptc@01e38000 {
|
||||
edma1_tptc0: tptc@238000 {
|
||||
compatible = "ti,edma3-tptc";
|
||||
reg = <0x238000 0x400>;
|
||||
interrupts = <95>;
|
||||
interrupt-names = "edm3_tcerrint";
|
||||
};
|
||||
serial0: serial@1c42000 {
|
||||
serial0: serial@42000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x42000 0x100>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <25>;
|
||||
status = "disabled";
|
||||
};
|
||||
serial1: serial@1d0c000 {
|
||||
serial1: serial@10c000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x10c000 0x100>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <53>;
|
||||
status = "disabled";
|
||||
};
|
||||
serial2: serial@1d0d000 {
|
||||
serial2: serial@10d000 {
|
||||
compatible = "ns16550a";
|
||||
reg = <0x10d000 0x100>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <61>;
|
||||
status = "disabled";
|
||||
};
|
||||
rtc0: rtc@1c23000 {
|
||||
rtc0: rtc@23000 {
|
||||
compatible = "ti,da830-rtc";
|
||||
reg = <0x23000 0x1000>;
|
||||
interrupts = <19
|
||||
19>;
|
||||
status = "disabled";
|
||||
};
|
||||
i2c0: i2c@1c22000 {
|
||||
i2c0: i2c@22000 {
|
||||
compatible = "ti,davinci-i2c";
|
||||
reg = <0x22000 0x1000>;
|
||||
interrupts = <15>;
|
||||
|
|
@ -226,12 +232,20 @@ i2c0: i2c@1c22000 {
|
|||
#size-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
wdt: wdt@1c21000 {
|
||||
i2c1: i2c@228000 {
|
||||
compatible = "ti,davinci-i2c";
|
||||
reg = <0x228000 0x1000>;
|
||||
interrupts = <51>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
wdt: wdt@21000 {
|
||||
compatible = "ti,davinci-wdt";
|
||||
reg = <0x21000 0x1000>;
|
||||
status = "disabled";
|
||||
};
|
||||
mmc0: mmc@1c40000 {
|
||||
mmc0: mmc@40000 {
|
||||
compatible = "ti,da830-mmc";
|
||||
reg = <0x40000 0x1000>;
|
||||
interrupts = <16>;
|
||||
|
|
@ -239,7 +253,7 @@ mmc0: mmc@1c40000 {
|
|||
dma-names = "rx", "tx";
|
||||
status = "disabled";
|
||||
};
|
||||
mmc1: mmc@1e1b000 {
|
||||
mmc1: mmc@21b000 {
|
||||
compatible = "ti,da830-mmc";
|
||||
reg = <0x21b000 0x1000>;
|
||||
interrupts = <72>;
|
||||
|
|
@ -247,37 +261,37 @@ mmc1: mmc@1e1b000 {
|
|||
dma-names = "rx", "tx";
|
||||
status = "disabled";
|
||||
};
|
||||
ehrpwm0: ehrpwm@01f00000 {
|
||||
ehrpwm0: ehrpwm@300000 {
|
||||
compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
|
||||
#pwm-cells = <3>;
|
||||
reg = <0x300000 0x2000>;
|
||||
status = "disabled";
|
||||
};
|
||||
ehrpwm1: ehrpwm@01f02000 {
|
||||
ehrpwm1: ehrpwm@302000 {
|
||||
compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
|
||||
#pwm-cells = <3>;
|
||||
reg = <0x302000 0x2000>;
|
||||
status = "disabled";
|
||||
};
|
||||
ecap0: ecap@01f06000 {
|
||||
ecap0: ecap@306000 {
|
||||
compatible = "ti,da850-ecap", "ti,am33xx-ecap";
|
||||
#pwm-cells = <3>;
|
||||
reg = <0x306000 0x80>;
|
||||
status = "disabled";
|
||||
};
|
||||
ecap1: ecap@01f07000 {
|
||||
ecap1: ecap@307000 {
|
||||
compatible = "ti,da850-ecap", "ti,am33xx-ecap";
|
||||
#pwm-cells = <3>;
|
||||
reg = <0x307000 0x80>;
|
||||
status = "disabled";
|
||||
};
|
||||
ecap2: ecap@01f08000 {
|
||||
ecap2: ecap@308000 {
|
||||
compatible = "ti,da850-ecap", "ti,am33xx-ecap";
|
||||
#pwm-cells = <3>;
|
||||
reg = <0x308000 0x80>;
|
||||
status = "disabled";
|
||||
};
|
||||
spi1: spi@1f0e000 {
|
||||
spi1: spi@30e000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "ti,da830-spi";
|
||||
|
|
@ -289,13 +303,13 @@ spi1: spi@1f0e000 {
|
|||
dma-names = "rx", "tx";
|
||||
status = "disabled";
|
||||
};
|
||||
mdio: mdio@1e24000 {
|
||||
mdio: mdio@224000 {
|
||||
compatible = "ti,davinci_mdio";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
reg = <0x224000 0x1000>;
|
||||
};
|
||||
eth0: ethernet@1e20000 {
|
||||
eth0: ethernet@220000 {
|
||||
compatible = "ti,davinci-dm6467-emac";
|
||||
reg = <0x220000 0x4000>;
|
||||
ti,davinci-ctrl-reg-offset = <0x3000>;
|
||||
|
|
@ -309,9 +323,10 @@ eth0: ethernet@1e20000 {
|
|||
36
|
||||
>;
|
||||
};
|
||||
gpio: gpio@1e26000 {
|
||||
gpio: gpio@226000 {
|
||||
compatible = "ti,dm6441-gpio";
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
reg = <0x226000 0x1000>;
|
||||
interrupts = <42 IRQ_TYPE_EDGE_BOTH
|
||||
43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
|
||||
|
|
@ -323,7 +338,7 @@ gpio: gpio@1e26000 {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
mcasp0: mcasp@01d00000 {
|
||||
mcasp0: mcasp@100000 {
|
||||
compatible = "ti,da830-mcasp-audio";
|
||||
reg = <0x100000 0x2000>,
|
||||
<0x102000 0x400000>;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ static void __init da8xx_init_irq(void)
|
|||
|
||||
static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
|
||||
OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
|
||||
OF_DEV_AUXDATA("ti,davinci-i2c", 0x01e28000, "i2c_davinci.2", NULL),
|
||||
OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),
|
||||
OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),
|
||||
OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),
|
||||
|
|
|
|||
Loading…
Reference in New Issue