-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJSUc9zAAoJEHm+PkMAQRiG9DMH/AtpuAF6LlMRPjrCeuJQ1pyh T0IUO+CsLKO6qtM5IyweP8V6zaasNjIuW1+B6IwVIl8aOrM+M7CwRiKvpey26ldM I8G2ron7hqSOSQqSQs20jN2yGAqQGpYIbTmpdGLAjQ350NNNvEKthbP5SZR5PAmE UuIx5OGEkaOyZXvCZJXU9AZkCxbihlMSt2zFVxybq2pwnGezRUYgCigE81aeyE0I QLwzzMVdkCxtZEpkdJMpLILAz22jN4RoVDbXRa2XC7dA9I2PEEXI9CcLzqCsx2Ii 8eYS+no2K5N2rrpER7JFUB2B/2X8FaVDE+aJBCkfbtwaYTV9UYLq3a/sKVpo1Cs= =xSFJ -----END PGP SIGNATURE----- Merge tag 'v3.12-rc4' into sched/core Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree before applying more scheduler patches. Conflicts: arch/avr32/include/asm/Kbuild Signed-off-by: Ingo Molnar <mingo@kernel.org>tirimbino
Ingo Molnar
11 years ago
commit
37bf06375c
@ -1,14 +1,14 @@ |
||||
* Synopsis Designware Mobile Storage Host Controller |
||||
* Synopsys Designware Mobile Storage Host Controller |
||||
|
||||
The Synopsis designware mobile storage host controller is used to interface |
||||
The Synopsys designware mobile storage host controller is used to interface |
||||
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents |
||||
differences between the core mmc properties described by mmc.txt and the |
||||
properties used by the Synopsis Designware Mobile Storage Host Controller. |
||||
properties used by the Synopsys Designware Mobile Storage Host Controller. |
||||
|
||||
Required Properties: |
||||
|
||||
* compatible: should be |
||||
- snps,dw-mshc: for controllers compliant with synopsis dw-mshc. |
||||
- snps,dw-mshc: for controllers compliant with synopsys dw-mshc. |
||||
* #address-cells: should be 1. |
||||
* #size-cells: should be 0. |
||||
|
||||
@ -0,0 +1,262 @@ |
||||
/* |
||||
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.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 |
||||
* published by the Free Software Foundation. |
||||
*/ |
||||
|
||||
/ { |
||||
model = "TI AM335x BeagleBone"; |
||||
compatible = "ti,am335x-bone", "ti,am33xx"; |
||||
|
||||
cpus { |
||||
cpu@0 { |
||||
cpu0-supply = <&dcdc2_reg>; |
||||
}; |
||||
}; |
||||
|
||||
memory { |
||||
device_type = "memory"; |
||||
reg = <0x80000000 0x10000000>; /* 256 MB */ |
||||
}; |
||||
|
||||
am33xx_pinmux: pinmux@44e10800 { |
||||
pinctrl-names = "default"; |
||||
pinctrl-0 = <&clkout2_pin>; |
||||
|
||||
user_leds_s0: user_leds_s0 { |
||||
pinctrl-single,pins = < |
||||
0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */ |
||||
0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */ |
||||
0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */ |
||||
0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */ |
||||
>; |
||||
}; |
||||
|
||||
i2c0_pins: pinmux_i2c0_pins { |
||||
pinctrl-single,pins = < |
||||
0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ |
||||
0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ |
||||
>; |
||||
}; |
||||
|
||||
uart0_pins: pinmux_uart0_pins { |
||||
pinctrl-single,pins = < |
||||
0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ |
||||
0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ |
||||
>; |
||||
}; |
||||
|
||||
clkout2_pin: pinmux_clkout2_pin { |
||||
pinctrl-single,pins = < |
||||
0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ |
||||
>; |
||||
}; |
||||
|
||||
cpsw_default: cpsw_default { |
||||
pinctrl-single,pins = < |
||||
/* Slave 1 */ |
||||
0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */ |
||||
0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */ |
||||
0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */ |
||||
0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */ |
||||
0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */ |
||||
0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */ |
||||
0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */ |
||||
0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */ |
||||
0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */ |
||||
0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */ |
||||
0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */ |
||||
0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */ |
||||
0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */ |
||||
>; |
||||
}; |
||||
|
||||
cpsw_sleep: cpsw_sleep { |
||||
pinctrl-single,pins = < |
||||
/* Slave 1 reset value */ |
||||
0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
>; |
||||
}; |
||||
|
||||
davinci_mdio_default: davinci_mdio_default { |
||||
pinctrl-single,pins = < |
||||
/* MDIO */ |
||||
0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ |
||||
0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ |
||||
>; |
||||
}; |
||||
|
||||
davinci_mdio_sleep: davinci_mdio_sleep { |
||||
pinctrl-single,pins = < |
||||
/* MDIO reset value */ |
||||
0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) |
||||
>; |
||||
}; |
||||
}; |
||||
|
||||
ocp { |
||||
uart0: serial@44e09000 { |
||||
pinctrl-names = "default"; |
||||
pinctrl-0 = <&uart0_pins>; |
||||
|
||||
status = "okay"; |
||||
}; |
||||
|
||||
musb: usb@47400000 { |
||||
status = "okay"; |
||||
|
||||
control@44e10000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
usb-phy@47401300 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
usb-phy@47401b00 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
usb@47401000 { |
||||
status = "okay"; |
||||
}; |
||||
|
||||
usb@47401800 { |
||||
status = "okay"; |
||||
dr_mode = "host"; |
||||
}; |
||||
|
||||
dma-controller@07402000 { |
||||
status = "okay"; |
||||
}; |
||||
}; |
||||
|
||||
i2c0: i2c@44e0b000 { |
||||
pinctrl-names = "default"; |
||||
pinctrl-0 = <&i2c0_pins>; |
||||
|
||||
status = "okay"; |
||||
clock-frequency = <400000>; |
||||
|
||||
tps: tps@24 { |
||||
reg = <0x24>; |
||||
}; |
||||
|
||||
}; |
||||
}; |
||||
|
||||
leds { |
||||
pinctrl-names = "default"; |
||||
pinctrl-0 = <&user_leds_s0>; |
||||
|
||||
compatible = "gpio-leds"; |
||||
|
||||
led@2 { |
||||
label = "beaglebone:green:heartbeat"; |
||||
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; |
||||
linux,default-trigger = "heartbeat"; |
||||
default-state = "off"; |
||||
}; |
||||
|
||||
led@3 { |
||||
label = "beaglebone:green:mmc0"; |
||||
gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; |
||||
linux,default-trigger = "mmc0"; |
||||
default-state = "off"; |
||||
}; |
||||
|
||||
led@4 { |
||||
label = "beaglebone:green:usr2"; |
||||
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; |
||||
default-state = "off"; |
||||
}; |
||||
|
||||
led@5 { |
||||
label = "beaglebone:green:usr3"; |
||||
gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; |
||||
default-state = "off"; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
/include/ "tps65217.dtsi" |
||||
|
||||
&tps { |
||||
regulators { |
||||
dcdc1_reg: regulator@0 { |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
dcdc2_reg: regulator@1 { |
||||
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ |
||||
regulator-name = "vdd_mpu"; |
||||
regulator-min-microvolt = <925000>; |
||||
regulator-max-microvolt = <1325000>; |
||||
regulator-boot-on; |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
dcdc3_reg: regulator@2 { |
||||
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ |
||||
regulator-name = "vdd_core"; |
||||
regulator-min-microvolt = <925000>; |
||||
regulator-max-microvolt = <1150000>; |
||||
regulator-boot-on; |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
ldo1_reg: regulator@3 { |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
ldo2_reg: regulator@4 { |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
ldo3_reg: regulator@5 { |
||||
regulator-always-on; |
||||
}; |
||||
|
||||
ldo4_reg: regulator@6 { |
||||
regulator-always-on; |
||||
}; |
||||
}; |
||||
}; |
||||
|
||||
&cpsw_emac0 { |
||||
phy_id = <&davinci_mdio>, <0>; |
||||
phy-mode = "mii"; |
||||
}; |
||||
|
||||
&cpsw_emac1 { |
||||
phy_id = <&davinci_mdio>, <1>; |
||||
phy-mode = "mii"; |
||||
}; |
||||
|
||||
&mac { |
||||
pinctrl-names = "default", "sleep"; |
||||
pinctrl-0 = <&cpsw_default>; |
||||
pinctrl-1 = <&cpsw_sleep>; |
||||
|
||||
}; |
||||
|
||||
&davinci_mdio { |
||||
pinctrl-names = "default", "sleep"; |
||||
pinctrl-0 = <&davinci_mdio_default>; |
||||
pinctrl-1 = <&davinci_mdio_sleep>; |
||||
}; |
||||
@ -0,0 +1,17 @@ |
||||
/* |
||||
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.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 |
||||
* published by the Free Software Foundation. |
||||
*/ |
||||
/dts-v1/; |
||||
|
||||
#include "am33xx.dtsi" |
||||
#include "am335x-bone-common.dtsi" |
||||
|
||||
&ldo3_reg { |
||||
regulator-min-microvolt = <1800000>; |
||||
regulator-max-microvolt = <1800000>; |
||||
regulator-always-on; |
||||
}; |
||||
@ -1,2 +1,9 @@ |
||||
/* Simple oneliner include to the PCIv3 early init */ |
||||
#ifdef CONFIG_PCI |
||||
extern int pci_v3_early_init(void); |
||||
#else |
||||
static inline int pci_v3_early_init(void) |
||||
{ |
||||
return 0; |
||||
} |
||||
#endif |
||||
|
||||
@ -1,6 +1,20 @@ |
||||
|
||||
generic-y += clkdev.h |
||||
generic-y += cputime.h |
||||
generic-y += delay.h |
||||
generic-y += device.h |
||||
generic-y += div64.h |
||||
generic-y += emergency-restart.h |
||||
generic-y += exec.h |
||||
generic-y += trace_clock.h |
||||
generic-y += futex.h |
||||
generic-y += preempt.h |
||||
generic-y += irq_regs.h |
||||
generic-y += param.h |
||||
generic-y += preempt.h |
||||
generic-y += local.h |
||||
generic-y += local64.h |
||||
generic-y += percpu.h |
||||
generic-y += scatterlist.h |
||||
generic-y += sections.h |
||||
generic-y += topology.h |
||||
generic-y += trace_clock.h |
||||
generic-y += xor.h |
||||
|
||||
@ -1,6 +0,0 @@ |
||||
#ifndef __ASM_AVR32_CPUTIME_H |
||||
#define __ASM_AVR32_CPUTIME_H |
||||
|
||||
#include <asm-generic/cputime.h> |
||||
|
||||
#endif /* __ASM_AVR32_CPUTIME_H */ |
||||
@ -1 +0,0 @@ |
||||
#include <asm-generic/delay.h> |
||||
@ -1,7 +0,0 @@ |
||||
/*
|
||||
* Arch specific extensions to struct device |
||||
* |
||||
* This file is released under the GPLv2 |
||||
*/ |
||||
#include <asm-generic/device.h> |
||||
|
||||
@ -1,6 +0,0 @@ |
||||
#ifndef __ASM_AVR32_DIV64_H |
||||
#define __ASM_AVR32_DIV64_H |
||||
|
||||
#include <asm-generic/div64.h> |
||||
|
||||
#endif /* __ASM_AVR32_DIV64_H */ |
||||
@ -1,6 +0,0 @@ |
||||
#ifndef __ASM_AVR32_EMERGENCY_RESTART_H |
||||
#define __ASM_AVR32_EMERGENCY_RESTART_H |
||||
|
||||
#include <asm-generic/emergency-restart.h> |
||||
|
||||
#endif /* __ASM_AVR32_EMERGENCY_RESTART_H */ |
||||
@ -1,6 +0,0 @@ |
||||
#ifndef __ASM_AVR32_FUTEX_H |
||||
#define __ASM_AVR32_FUTEX_H |
||||
|
||||
#include <asm-generic/futex.h> |
||||
|
||||
#endif /* __ASM_AVR32_FUTEX_H */ |
||||
@ -1 +0,0 @@ |
||||
#include <asm-generic/irq_regs.h> |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue