Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Nov 2013 08:34:56 +0000 (17:34 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Nov 2013 08:34:56 +0000 (17:34 +0900)
Pull ARM SoC DT updates from Olof Johansson:
 "Most of this branch consists of updates, additions and general churn
  of the device tree source files in the kernel (arch/arm/boot/dts).
  Besides that, there are a few things to point out:

   - Lots of platform conversion on OMAP2+, with removal of old board
     files for various platforms.
   - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as
     well
   - Some updates to pinctrl and other subsystems.  Most of these are
     for DT-enablement of the various platforms and acks have been
     collected"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits)
  ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
  ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
  ARM: dts: bcm281xx: Add card detect GPIO
  ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
  ARM: bcm281xx: Add device node for the GPIO controller
  ARM: mvebu: Add Netgear ReadyNAS 104 board
  ARM: tegra: fix Tegra114 IOMMU register address
  ARM: kirkwood: add support for OpenBlocks A7 platform
  ARM: dts: omap4-panda: add DPI pinmuxing
  ARM: dts: AM33xx: Add RNG node
  ARM: dts: AM33XX: Add hwspinlock node
  ARM: dts: OMAP5: Add hwspinlock node
  ARM: dts: OMAP4: Add hwspinlock node
  ARM: dts: use 'status' property for PCIe nodes
  ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C
  ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes
  ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts
  ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts
  ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts
  ARM: mvebu: Add the core-divider clock to Armada 370/XP
  ...

22 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos5440-ssdk5440.dts
arch/arm/boot/dts/imx23.dtsi
arch/arm/boot/dts/imx28-evk.dts
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap3-evm-common.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/twl4030.dtsi
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/io.c
arch/arm/mach-s3c64xx/Kconfig
drivers/gpio/gpio-samsung.c
drivers/usb/musb/ux500.c

diff --cc MAINTAINERS
Simple merge
index 7662b71628cdbf7ef09e54d1f989cb07c28accca,6ce9d1d764205efa0784f5d60ffe558400552397..d57c1a65b24f981fb25c62aa58c73c1fedd84ab8
@@@ -100,11 -102,10 +102,10 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
-       kirkwood-ts219-6282.dtb \
-       kirkwood-openblocks_a6.dtb
+       kirkwood-ts219-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 -dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 -      msm8960-cdp.dtb
 +dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 +      qcom-msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
@@@ -197,8 -214,10 +214,10 @@@ dtb-$(CONFIG_ARCH_U8500) += ste-snowbal
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
+ dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
+       s3c6410-smdk6410.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 -      emev2-kzm9d-reference.dtb \
 +      r7s72100-genmai.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
        r8a73a4-ape6evm.dtb \
        r8a73a4-ape6evm-reference.dtb \
        sh7372-mackerel.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
 +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb
- dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
+ dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
+       socfpga_cyclone5_socdk.dtb \
+       socfpga_cyclone5_sockit.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
Simple merge
index aa33393903a87cec3bcef3bb7f5138a779230d96,1f63845b8ce08c3cc23aaeff334d9ee02b56e45e..4267c2b05d600ac8bfb9cf2612a3b72977d7dc0e
                        };
  
                        lradc@80050000 {
+                               fsl,lradc-touchscreen-wires = <4>;
                                status = "okay";
 +                              fsl,lradc-touchscreen-wires = <4>;
 +                              fsl,ave-ctrl = <4>;
 +                              fsl,ave-delay = <2>;
 +                              fsl,settling = <10>;
                        };
  
                        i2c0: i2c@80058000 {
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,b5493296d1038949cc8b08bf8097979b4b9f7f1d..3007e79c9cd6bc2114da07b6c5cf49b29b5b771b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,94 +1,96 @@@
+ /*
+  * Common support for omap3 EVM boards
+  */
+ #include "omap-gpmc-smsc911x.dtsi"
+ / {
+       cpus {
+               cpu@0 {
+                       cpu0-supply = <&vcc>;
+               };
+       };
+       leds {
+               compatible = "gpio-leds";
+               ledb {
+                       label = "omap3evm::ledb";
+                       gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
+                       linux,default-trigger = "default-on";
+               };
+       };
+       wl12xx_vmmc: wl12xx_vmmc {
+               compatible = "regulator-fixed";
+               regulator-name = "vwl1271";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               gpio = <&gpio5 22 0>;   /* gpio150 */
+               startup-delay-us = <70000>;
+               enable-active-high;
+               vin-supply = <&vmmc2>;
+       };
+ };
+ &i2c1 {
+       clock-frequency = <2600000>;
+       twl: twl@48 {
+               reg = <0x48>;
+               interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+               interrupt-parent = <&intc>;
+       };
+ };
+ #include "twl4030.dtsi"
+ #include "twl4030_omap3.dtsi"
+ &i2c2 {
+       clock-frequency = <400000>;
+ };
+ &i2c3 {
+       clock-frequency = <400000>;
+       /*
+        * TVP5146 Video decoder-in for analog input support.
+        */
+       tvp5146@5c {
+               compatible = "ti,tvp5146m2";
+               reg = <0x5c>;
+       };
+ };
+ &mmc1 {
+       vmmc-supply = <&vmmc1>;
+       vmmc_aux-supply = <&vsim>;
+       bus-width = <8>;
+ };
+ &mmc2 {
+       vmmc-supply = <&wl12xx_vmmc>;
+       non-removable;
+       bus-width = <4>;
+       cap-power-off-card;
+ };
+ &twl_gpio {
+       ti,use-leds;
+ };
+ &usb_otg_hs {
+       interface-type = <0>;
+       usb-phy = <&usb2_phy>;
++      phys = <&usb2_phy>;
++      phy-names = "usb2-phy";
+       mode = <3>;
+       power = <50>;
+ };
+ &gpmc {
+       ethernet@gpmc {
+               interrupt-parent = <&gpio6>;
+               interrupts = <16 8>;
+               reg = <5 0 0xff>;
+       };
+ };
index ea4054bfdfd4964c57573813de9306f5f538c034,a5b6e88a41a58e558098f329df03d23a2e0b16b4..a1e05853afcd583c15da3ad259c8f715992b2d7f
                        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,a791846421d1890a74dc02f1c8d458bd33f21513..fc3fad563861ba3caf5818de8ea9594c59dd021f
                        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
Simple merge
Simple merge
index c94624429680e06b8666737d399b8e18b8a753ea,68c9688815aa2fdcb95da2d40b128acc4379772a..dc21df16616119f8341077fd5131537065590088
@@@ -83,10 -89,12 +83,11 @@@ config ARCH_OMAP2PLU
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
        select ARCH_REQUIRE_GPIOLIB
 -      select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 +      select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
 -      select HAVE_CLK
+       select MACH_OMAP_GENERIC
        select OMAP_DM_TIMER
        select PINCTRL
        select PROC_DEVICETREE if PROC_FS
index 9b7619f2c1acf94eb269ccdd5268b0900a2e2976,096d6bbcd3bcc5bfcc3499e7a50e55c175f2f3f0..e15ac005ef17d02a102ad87def740ef1211d53d0
@@@ -235,8 -228,12 +235,8 @@@ endi
  # OMAP2420 MSDI controller integration support ("MMC")
  obj-$(CONFIG_SOC_OMAP2420)            += msdi.o
  
 -ifneq ($(CONFIG_DRM_OMAP),)
 -obj-y                                 += drm.o
 -endif
 -
  # Specific board support
- obj-$(CONFIG_MACH_OMAP_GENERIC)               += board-generic.o
+ obj-$(CONFIG_MACH_OMAP_GENERIC)               += board-generic.o pdata-quirks.o
  obj-$(CONFIG_MACH_OMAP_H4)            += board-h4.o
  obj-$(CONFIG_MACH_OMAP_2430SDP)               += board-2430sdp.o
  obj-$(CONFIG_MACH_OMAP3_BEAGLE)               += board-omap3beagle.o
index 89a8698cd6ed2aa9b4c99c17d826b9350522ea5a,5336c75926cdc8ff23c100c134bb44a0fa4f25df..0dd6398bade4787510c4d5c62210b7a61cfb7595
@@@ -467,49 -465,15 +466,15 @@@ static struct platform_device omap_vout
        .resource       = &omap_vout_resource[0],
        .id             = -1,
  };
 -static void omap_init_vout(void)
 +
 +int __init omap_init_vout(void)
  {
 -      if (platform_device_register(&omap_vout_device) < 0)
 -              printk(KERN_ERR "Unable to register OMAP-VOUT device\n");
 +      return platform_device_register(&omap_vout_device);
  }
  #else
 -static inline void omap_init_vout(void) {}
 +int __init omap_init_vout(void) { return 0; }
  #endif
  
- #if IS_ENABLED(CONFIG_WL12XX)
- static struct wl12xx_platform_data wl12xx __initdata;
- void __init omap_init_wl12xx_of(void)
- {
-       int ret;
-       if (!of_have_populated_dt())
-               return;
-       if (of_machine_is_compatible("ti,omap4-sdp")) {
-               wl12xx.board_ref_clock = WL12XX_REFCLOCK_26;
-               wl12xx.board_tcxo_clock = WL12XX_TCXOCLOCK_26;
-               wl12xx.irq = gpio_to_irq(53);
-       } else if (of_machine_is_compatible("ti,omap4-panda")) {
-               wl12xx.board_ref_clock = WL12XX_REFCLOCK_38;
-               wl12xx.irq = gpio_to_irq(53);
-       } else {
-               return;
-       }
-       ret = wl12xx_set_platform_data(&wl12xx);
-       if (ret) {
-               pr_err("error setting wl12xx data: %d\n", ret);
-               return;
-       }
- }
- #else
- static inline void omap_init_wl12xx_of(void)
- {
- }
- #endif
  /*-------------------------------------------------------------------------*/
  
  static int __init omap2_init_devices(void)
                omap_init_sham();
                omap_init_aes();
                omap_init_rng();
-       } else {
-               /* These can be removed when bindings are done */
-               omap_init_wl12xx_of();
        }
        omap_init_sti();
 -      omap_init_vout();
  
        return 0;
  }
index c90f64765a3d01b2429c2c739dccfa05b7300261,a2cbb44582e4554d9464bb26db0084f85386273f..cd22262a2cc09a1ad5b951254500a11afdfc8e30
@@@ -594,14 -599,13 +599,19 @@@ void __init am43xx_init_early(void
                                  NULL);
        omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));
        omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL);
 +      omap_prm_base_init();
 +      omap_cm_base_init();
        omap3xxx_check_revision();
 +      am43xx_powerdomains_init();
 +      am43xx_clockdomains_init();
 +      am43xx_hwmod_init();
 +      omap_hwmod_init_postsetup();
  }
+ void __init am43xx_init_late(void)
+ {
+       omap_common_late_init();
+ }
  #endif
  
  #ifdef CONFIG_ARCH_OMAP4
index a2d5bb33647da0d43a66a41c061c6f1f26773166,bd14e3a37128ef9c1b84559a5c31a74eb1c06752..2cb8dc55b50ecbc4aa612ab805b52f03efec3eb9
@@@ -298,4 -307,18 +298,20 @@@ config MACH_WLF_CRAGG_641
        help
          Machine support for the Wolfson Cragganmore S3C6410 variant.
  
+ config MACH_S3C64XX_DT
+       bool "Samsung S3C6400/S3C6410 machine using Device Tree"
+       select CLKSRC_OF
+       select CPU_S3C6400
+       select CPU_S3C6410
+       select PINCTRL
+       select PINCTRL_S3C64XX
+       select USE_OF
+       help
+         Machine support for Samsung S3C6400/S3C6410 machines with Device Tree
+         enabled.
+         Select this if a fdt blob is available for your S3C64XX SoC based
+         board.
+         Note: This is under development and not all peripherals can be
+         supported with this machine file.
++
 +endif
Simple merge
Simple merge