OSDN Git Service

Merge branch 'fixes' into next/fixes-non-critical
authorOlof Johansson <olof@lixom.net>
Mon, 20 Apr 2015 14:59:04 +0000 (07:59 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 20 Apr 2015 14:59:04 +0000 (07:59 -0700)
Merge a set of fixes that we missed sending in before v4.0 release. These
will also be sent to -stable.

* fixes: (659 commits)
  ARM: at91/dt: sama5d3 xplained: add phy address for macb1
  kbuild: Create directory for target DTB
  ARM: mvebu: Disable CPU Idle on Armada 38x
  arm64: juno: Fix misleading name of UART reference clock
  ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
  ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
  ARM: socfpga: dts: fix spi1 interrupt
  ARM: dts: Fix gpio interrupts for dm816x
  ARM: dts: dra7: remove ti,hwmod property from pcie phy
  ARM: EXYNOS: Fix build breakage cpuidle on !SMP
  ARM: OMAP: dmtimer: disable pm runtime on remove
  ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
  ARM: dts: fix lid and power pin-functions for exynos5250-spring
  ARM: dts: fix mmc node updates for exynos5250-spring
  ARM: OMAP2+: Fix socbus family info for AM33xx devices
  ARM: dts: omap3: Add missing dmas for crypto
  + Linux 4.0-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
MAINTAINERS
arch/arm/boot/dts/dra7.dtsi

diff --combined MAINTAINERS
@@@ -1030,6 -1030,16 +1030,16 @@@ F:    arch/arm/mach-mxs
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
+ ARM/FREESCALE VYBRID ARM ARCHITECTURE
+ M:    Shawn Guo <shawn.guo@linaro.org>
+ M:    Sascha Hauer <kernel@pengutronix.de>
+ R:    Stefan Agner <stefan@agner.ch>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
+ F:    arch/arm/mach-imx/*vf610*
+ F:    arch/arm/boot/dts/vf*
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1188,6 -1198,7 +1198,7 @@@ ARM/Marvell Dove/MV78xx0/Orion SOC supp
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ M:    Gregory Clement <gregory.clement@free-electrons.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-dove/
@@@ -1351,6 -1362,7 +1362,7 @@@ F:      drivers/i2c/busses/i2c-rk3x.
  F:    drivers/*/*rockchip*
  F:    drivers/*/*/*rockchip*
  F:    sound/soc/rockchip/
+ N:    rockchip
  
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene@kernel.org>
@@@ -2065,7 -2077,7 +2077,7 @@@ F:      include/net/bluetooth
  BONDING DRIVER
  M:    Jay Vosburgh <j.vosburgh@gmail.com>
  M:    Veaceslav Falico <vfalico@gmail.com>
- M:    Andy Gospodarek <andy@greyhouse.net>
+ M:    Andy Gospodarek <gospo@cumulusnetworks.com>
  L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -2107,7 -2119,6 +2119,6 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Christian Daudt <bcm@fixthebug.org>
- M:    Matt Porter <mporter@linaro.org>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/mach-bcm
@@@ -2369,8 -2380,9 +2380,9 @@@ F:      arch/x86/include/asm/tce.
  
  CAN NETWORK LAYER
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
+ M:    Marc Kleine-Budde <mkl@pengutronix.de>
  L:    linux-can@vger.kernel.org
- W:    http://gitorious.org/linux-can
+ W:    https://github.com/linux-can
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
@@@ -2386,7 -2398,7 +2398,7 @@@ CAN NETWORK DRIVER
  M:    Wolfgang Grandegger <wg@grandegger.com>
  M:    Marc Kleine-Budde <mkl@pengutronix.de>
  L:    linux-can@vger.kernel.org
- W:    http://gitorious.org/linux-can
+ W:    https://github.com/linux-can
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
@@@ -6947,8 -6959,6 +6959,8 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
 +F:    arch/arm/configs/omap1_defconfig
 +F:    arch/arm/configs/omap2plus_defconfig
  F:    drivers/i2c/busses/i2c-omap.c
  F:    drivers/irqchip/irq-omap-intc.c
  F:    drivers/mfd/*omap*.c
@@@ -8482,6 -8492,14 +8494,14 @@@ S:    Supporte
  L:    netdev@vger.kernel.org
  F:    drivers/net/ethernet/samsung/sxgbe/
  
+ SAMSUNG THERMAL DRIVER
+ M:    Lukasz Majewski <l.majewski@samsung.com>
+ L:    linux-pm@vger.kernel.org
+ L:    linux-samsung-soc@vger.kernel.org
+ S:    Supported
+ T:    https://github.com/lmajewski/linux-samsung-thermal.git
+ F:    drivers/thermal/samsung/
  SAMSUNG USB2 PHY DRIVER
  M:    Kamil Debski <k.debski@samsung.com>
  L:    linux-kernel@vger.kernel.org
                        };
                };
  
 +              bandgap: bandgap@4a0021e0 {
 +                      reg = <0x4a0021e0 0xc
 +                              0x4a00232c 0xc
 +                              0x4a002380 0x2c
 +                              0x4a0023C0 0x3c
 +                              0x4a002564 0x8
 +                              0x4a002574 0x50>;
 +                              compatible = "ti,dra752-bandgap";
 +                              interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 +                              #thermal-sensor-cells = <1>;
 +              };
 +
                cm_core_aon: cm_core_aon@4a005000 {
                        compatible = "ti,dra7-cm-core-aon";
                        reg = <0x4a005000 0x2000>;
                                              "wkupclk", "refclk",
                                              "div-clk", "phy-div";
                                #phy-cells = <0>;
-                               ti,hwmods = "pcie1-phy";
                        };
  
                        pcie2_phy: pciephy@4a095000 {
                                              "wkupclk", "refclk",
                                              "div-clk", "phy-div";
                                #phy-cells = <0>;
-                               ti,hwmods = "pcie2-phy";
                                status = "disabled";
                        };
                };
                        status = "disabled";
                };
        };
 +
 +      thermal_zones: thermal-zones {
 +              #include "omap4-cpu-thermal.dtsi"
 +              #include "omap5-gpu-thermal.dtsi"
 +              #include "omap5-core-thermal.dtsi"
 +      };
 +
 +};
 +
 +&cpu_thermal {
 +      polling-delay = <500>; /* milliseconds */
  };
  
  /include/ "dra7xx-clocks.dtsi"