]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-soc/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:44 +0000 (11:48 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:44 +0000 (11:48 +0200)
Conflicts:
MAINTAINERS
arch/arm/boot/dts/omap3-evm.dts
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/board-mop500.c

35 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/common/Makefile
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-dm365-evm.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.h
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/mach-highbank/Kconfig
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-integrator/pci_v3.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/fuse.c
arch/arm/mach-ux500/Kconfig
drivers/block/Kconfig
drivers/cpufreq/integrator-cpufreq.c
drivers/cpuidle/Kconfig.arm
drivers/dma/Kconfig
drivers/ide/Kconfig
drivers/input/serio/Kconfig
drivers/pci/host/Kconfig
drivers/pci/host/pci-mvebu.c
drivers/usb/host/ohci-s3c2410.c
drivers/usb/musb/ux500.c
drivers/video/cyber2000fb.c

diff --cc MAINTAINERS
index 5a7ed4c3590e131ff07d35e6a2076b8905b2e574,83685591362a1679fa770424d1c7f68de1dc9856..2906f6af30b24a62683618b2e3efbf5f4da95708
@@@ -2838,10 -2829,8 +2846,10 @@@ M:    Terje Bergström <tbergstrom@nvidia.
  L:    dri-devel@lists.freedesktop.org
  L:    linux-tegra@vger.kernel.org
  T:    git git://anongit.freedesktop.org/tegra/linux.git
- S:    Maintained
+ S:    Supported
 +F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
 +F:    include/linux/host1x.h
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
Simple merge
Simple merge
Simple merge
index ea4054bfdfd4964c57573813de9306f5f538c034,17a3618b190f14e58349fb99a653140e4ab1ca58..513f0c9466dbd3e55e0ceed2d1393217b2e5a57e
                        multipoint = <1>;
                        num-eps = <16>;
                        ram-bits = <12>;
 -                      ti,has-mailbox;
 +                      ctrl-module = <&omap_control_usbotg>;
                };
+               aes: aes@4b501000 {
+                       compatible = "ti,omap4-aes";
+                       ti,hwmods = "aes";
+                       reg = <0x4b501000 0xa0>;
+                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&sdma 111>, <&sdma 110>;
+                       dma-names = "tx", "rx";
+               };
+               des: des@480a5000 {
+                       compatible = "ti,omap4-des";
+                       ti,hwmods = "des";
+                       reg = <0x480a5000 0xa0>;
+                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&sdma 117>, <&sdma 116>;
+                       dma-names = "tx", "rx";
+               };
        };
  };
index c0ec6dce30fe2dd3e18e799fb1ce0f82f8a17c81,6192c458bea123dc75bce6cb433d229c456fdb22..6d0a1d5f3da73c3e13695de15c603ec8e4811d69
                        hw-caps-temp-alert;
                };
  
 -              omap_control_usb: omap-control-usb@4a002300 {
 -                      compatible = "ti,omap-control-usb";
 -                      reg = <0x4a002300 0x4>,
 -                            <0x4a002370 0x4>;
 -                      reg-names = "control_dev_conf", "phy_power_usb";
 -                      ti,type = <2>;
 +              omap_control_usb2phy: control-phy@4a002300 {
 +                      compatible = "ti,control-phy-usb2";
 +                      reg = <0x4a002300 0x4>;
 +                      reg-names = "power";
 +              };
 +
 +              omap_control_usb3phy: control-phy@4a002370 {
 +                      compatible = "ti,control-phy-pipe3";
 +                      reg = <0x4a002370 0x4>;
 +                      reg-names = "power";
                };
  
-               omap_dwc3@4a020000 {
+               usb3: omap_dwc3@4a020000 {
                        compatible = "ti,dwc3";
                        ti,hwmods = "usb_otg_ss";
                        reg = <0x4a020000 0x10000>;
Simple merge
index c17407b16d7c687292fa6e064978d9ca1699ea0a,a4e7ba82881025db51b05045a310f9c761e7dcf3..61d2906ccefb3660b3061bb1782576bd0a3ec78e
  #include <linux/export.h>
  #include <linux/irqdomain.h>
  #include <linux/of_address.h>
- #include <linux/clocksource.h>
- #include <linux/clk-provider.h>
  #include <linux/irqchip/arm-gic.h>
  #include <linux/irqchip/chained_irq.h>
 +#include <linux/platform_device.h>
  
  #include <asm/proc-fns.h>
  #include <asm/exception.h>
Simple merge
index e2ca238cf0ea7fef2d22d027eb04550356cbba26,fe98df44579cfa5c22c77ebd53dd9efbee15cf1e..92d2ad25d463fcc8a43411420e4ebb06ba42852c
@@@ -8,11 -8,11 +8,11 @@@ config ARCH_HIGHBAN
        select ARM_AMBA
        select ARM_ERRATA_764369
        select ARM_ERRATA_775420
 -      select ARM_ERRATA_798181
 +      select ARM_ERRATA_798181 if SMP
        select ARM_GIC
+       select ARM_PSCI
        select ARM_TIMER_SP804
        select CACHE_L2X0
-       select CLKDEV_LOOKUP
        select COMMON_CLK
        select CPU_V7
        select GENERIC_CLOCKEVENTS
Simple merge
index bb3aeb31a54e4bdf072ca686a60b5795df0f0251,c9c5a33bc802bd2a4dc28f234006949a6a54d44b..aebe5f97a834d2a7f49d0c50d9e26525f672ab45
@@@ -809,50 -808,34 +808,33 @@@ static u8 __init pci_v3_swizzle(struct 
        return pci_common_swizzle(dev, pinp);
  }
  
- static int irq_tab[4] __initdata = {
-       IRQ_AP_PCIINT0, IRQ_AP_PCIINT1, IRQ_AP_PCIINT2, IRQ_AP_PCIINT3
- };
- /*
-  * map the specified device/slot/pin to an IRQ.  This works out such
-  * that slot 9 pin 1 is INT0, pin 2 is INT1, and slot 10 pin 1 is INT1.
-  */
- static int __init pci_v3_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
- {
-       int intnr = ((slot - 9) + (pin - 1)) & 3;
-       return irq_tab[intnr];
- }
- static struct hw_pci pci_v3 __initdata = {
-       .swizzle                = pci_v3_swizzle,
-       .setup                  = pci_v3_setup,
-       .nr_controllers         = 1,
-       .ops                    = &pci_v3_ops,
-       .preinit                = pci_v3_preinit,
-       .postinit               = pci_v3_postinit,
- };
- #ifdef CONFIG_OF
  static int __init pci_v3_map_irq_dt(const struct pci_dev *dev, u8 slot, u8 pin)
  {
 -      struct of_irq oirq;
 +      struct of_phandle_args oirq;
        int ret;
  
 -      ret = of_irq_map_pci(dev, &oirq);
 +      ret = of_irq_parse_pci(dev, &oirq);
        if (ret) {
 -              dev_err(&dev->dev, "of_irq_map_pci() %d\n", ret);
 +              dev_err(&dev->dev, "of_irq_parse_pci() %d\n", ret);
                /* Proper return code 0 == NO_IRQ */
                return 0;
        }
  
 -      return irq_create_of_mapping(oirq.controller, oirq.specifier,
 -                                   oirq.size);
 +      return irq_create_of_mapping(&oirq);
  }
  
- static int __init pci_v3_dtprobe(struct platform_device *pdev,
-                               struct device_node *np)
+ static struct hw_pci pci_v3 __initdata = {
+       .swizzle                = pci_v3_swizzle,
+       .setup                  = pci_v3_setup,
+       .nr_controllers         = 1,
+       .ops                    = &pci_v3_ops,
+       .preinit                = pci_v3_preinit,
+       .postinit               = pci_v3_postinit,
+ };
+ static int __init pci_v3_probe(struct platform_device *pdev)
  {
+       struct device_node *np = pdev->dev.of_node;
        struct of_pci_range_parser parser;
        struct of_pci_range range;
        struct resource *res;
Simple merge
index f26428d8b62a18828a08cd0ff42bc08f35e5b206,56bb6c35d958b62dd971a4d9e70c435342d92d7d..f8d1276d18afca4fd3960a79af12b4cd425e8cf9
@@@ -53,9 -51,9 +51,9 @@@ config ARCH_TEGRA_3x_SO
  
  config ARCH_TEGRA_114_SOC
        bool "Enable support for Tegra114 family"
-       select HAVE_ARM_ARCH_TIMER
 -      select ARM_ERRATA_798181
 +      select ARM_ERRATA_798181 if SMP
        select ARM_L1_CACHE_SHIFT_6
+       select HAVE_ARM_ARCH_TIMER
        select PINCTRL_TEGRA114
        help
          Support for NVIDIA Tegra T114 processor family, based on the
Simple merge
index 7a3fc1af6944b2cd9175a46f7c1749c83a090220,c67f8ad5ccd5d89eb087fbbf3a4ff75cc5039775..0034d2cd69734e7cad97bf11cbc4976a3b9790c5
@@@ -16,24 -27,9 +27,8 @@@ config ARCH_U850
  
  if ARCH_U8500
  
- config UX500_SOC_COMMON
-       bool
-       default y
-       select ABX500_CORE
-       select AB8500_CORE
-       select ARM_ERRATA_754322
-       select ARM_ERRATA_764369 if SMP
-       select ARM_GIC
-       select CACHE_L2X0
-       select CLKSRC_NOMADIK_MTU
-       select COMMON_CLK
-       select PINCTRL
-       select PINCTRL_NOMADIK
-       select PINCTRL_ABX500
-       select PL310_ERRATA_753970 if CACHE_PL310
  config UX500_SOC_DB8500
        bool
 -      select CPU_FREQ_TABLE if CPU_FREQ
        select MFD_DB8500_PRCMU
        select PINCTRL_DB8500
        select PINCTRL_DB8540
Simple merge
Simple merge
index f23bd75426cdfcac5da246ef6f23adef0a15b0da,d6f57d5d963181e1125c2aba5f938a48a9afa339..d988948a89a069510c32bda5ca79a1a422b8827b
@@@ -2,20 -2,9 +2,20 @@@
  # ARM CPU Idle drivers
  #
  
 +config ARM_BIG_LITTLE_CPUIDLE
 +      bool "Support for ARM big.LITTLE processors"
 +      depends on ARCH_VEXPRESS_TC2_PM
 +      select ARM_CPU_SUSPEND
 +      select CPU_IDLE_MULTIPLE_DRIVERS
 +      help
 +        Select this option to enable CPU idle driver for big.LITTLE based
 +        ARM systems. Driver manages CPUs coordination through MCPM and
 +        define different C-states for little and big cores through the
 +        multiple CPU idle drivers infrastructure.
 +
  config ARM_HIGHBANK_CPUIDLE
        bool "CPU Idle Driver for Calxeda processors"
-       depends on ARCH_HIGHBANK
+       depends on ARM_PSCI
        select ARM_CPU_SUSPEND
        help
          Select this to enable cpuidle on Calxeda processors.
Simple merge
Simple merge
Simple merge
Simple merge
index 3a8d01ec50f7f35e2fd2f42d78a9e6a226971424,80b2250ea19a6f892e3645e8736216c7dd96aafd..94dc22f6eed84f5a0bd977fb191ff9d66c69c817
@@@ -645,12 -665,12 +665,12 @@@ static int mvebu_pcie_setup(int nr, str
        return 1;
  }
  
- static int __init mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+ static int mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
  {
 -      struct of_irq oirq;
 +      struct of_phandle_args oirq;
        int ret;
  
 -      ret = of_irq_map_pci(dev, &oirq);
 +      ret = of_irq_parse_pci(dev, &oirq);
        if (ret)
                return ret;
  
Simple merge
Simple merge
Simple merge