Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Linus Torvalds [Thu, 13 Dec 2012 18:39:26 +0000 (10:39 -0800)]
Pull ARM SoC device tree conversions and enablement from Olof Johansson:
 "Continued device tree conversion and enablement across a number of
  platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
  smaller series as well.

  ux500 has seen continued conversion for platforms.  Several platforms
  have seen pinctrl-via-devicetree conversions for simpler
  multiplatform.  Tegra is adding data for new devices/drivers, and
  Exynos has a bunch of new bindings and devices added as well.

  So, pretty much the same progression in the right direction as the
  last few releases."

Fix up conflicts as per Olof.

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
  ARM: ux500: Rename dbx500 cpufreq code to be more generic
  ARM: dts: add missing ux500 device trees
  ARM: ux500: Stop registering the PCM driver from platform code
  ARM: ux500: Move board specific GPIO info out to subordinate DTS files
  ARM: ux500: Disable the MMCI gpio-regulator by default
  ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
  ARM: Kirkwood: Add support LED of OpenBlocks A6
  ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
  ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
  ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
  ARM: kirkwood: Add support DT of second I2C bus
  ARM: kirkwood: Convert mplcec4 board to pinctrl
  ARM: Kirkwood: Convert km_kirkwood to pinctrl
  ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
  ARM: Kirkwood: Convert IX2-200 to pinctrl.
  ARM: Kirkwood: Convert lsxl boards to pinctrl.
  ARM: Kirkwood: Convert ib62x0 to pinctrl.
  ARM: Kirkwood: Convert GoFlex Net to pinctrl.
  ARM: Kirkwood: Convert dreamplug to pinctrl.
  ARM: Kirkwood: Convert dockstar to pinctrl.
  ...

41 files changed:
1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/dbx5x0.dtsi
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/snowball.dts
arch/arm/boot/dts/tegra20-seaboard.dts
arch/arm/configs/u8500_defconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdk4x12.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/clk-imx6q.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-ux500/board-mop500-audio.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/devs.c
arch/arm/plat-samsung/include/plat/devs.h
drivers/clk/Makefile
drivers/gpio/Kconfig
drivers/usb/host/ehci-orion.c

@@@ -547,7 -536,8 +549,9 @@@ config ARCH_KIRKWOO
        select CPU_FEROCEON
        select GENERIC_CLOCKEVENTS
        select PCI
 +      select PCI_QUIRKS
+       select PINCTRL
+       select PINCTRL_KIRKWOOD
        select PLAT_ORION_LEGACY
        help
          Support for the following Marvell Kirkwood series SoCs:
Simple merge
@@@ -1,49 -1,34 +1,54 @@@
  ifeq ($(CONFIG_OF),y)
  
 -dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \
 -      at91sam9263ek.dtb \
 -      at91sam9g20ek_2mmc.dtb \
 -      at91sam9g20ek.dtb \
 -      at91sam9g25ek.dtb \
 -      at91sam9m10g45ek.dtb \
 -      at91sam9n12ek.dtb \
 -      ethernut5.dtb \
 -      evk-pro3.dtb \
 -      kizbox.dtb \
 -      tny_a9260.dtb \
 -      tny_a9263.dtb \
 -      tny_a9g20.dtb \
 -      usb_a9260.dtb \
 -      usb_a9263.dtb \
 -      usb_a9g20.dtb
 +# Keep at91 dtb files sorted alphabetically for each SoC
 +# rm9200
 +dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
 +# sam9260
 +dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
 +dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
 +dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
 +dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
 +# sam9263
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
 +# sam9g20
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
 +dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
 +dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
 +dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
 +# sam9g45
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
 +# sam9n12
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
 +# sam9x5
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
 +dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
 +
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb
+ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
+       da850-evm.dtb
  dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
 +      exynos5250-smdk5250.dtb \
-       exynos5440-ssdk5440.dtb
++      exynos5440-ssdk5440.dtb \
+       exynos4412-smdk4412.dtb \
+       exynos5250-smdk5250.dtb \
+       exynos5250-snow.dtb
 -dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 +dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
 +      ecx-2000.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
@@@ -105,11 -94,13 +114,14 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        am335x-bone.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
- dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
+ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
+       hrefprev60.dtb \
+       hrefv60plus.dtb \
+       ccu9540.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
 -      sh73a0-kzm9g.dtb
 +      sh73a0-kzm9g.dtb \
 +      sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
@@@ -137,13 -126,6 +149,14 @@@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb
+ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
  
 +targets += dtbs
  endif
 +
 +# *.dtb used to be generated in the directory above. Clean out the
 +# old build results so people don't accidentally use them.
 +dtbs: $(addprefix $(obj)/, $(dtb-y))
 +      $(Q)rm -f $(obj)/../*.dtb
 +
 +clean-files := *.dtb
Simple merge
                                status = "disabled";
                        };
  
 +                      mmc0: mmc@fff80000 {
 +                              compatible = "atmel,hsmci";
 +                              reg = <0xfff80000 0x600>;
 +                              interrupts = <10 4 0>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
 +                      mmc1: mmc@fff84000 {
 +                              compatible = "atmel,hsmci";
 +                              reg = <0xfff84000 0x600>;
 +                              interrupts = <11 4 0>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
++
+                       watchdog@fffffd40 {
+                               compatible = "atmel,at91sam9260-wdt";
+                               reg = <0xfffffd40 0x10>;
+                               status = "disabled";
+                       };
                };
  
                nand0: nand@40000000 {
                                };
                        };
  
 +                      mmc0: mmc@fff80000 {
 +                              compatible = "atmel,hsmci";
 +                              reg = <0xfff80000 0x600>;
 +                              interrupts = <11 4 0>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
 +                      mmc1: mmc@fffd0000 {
 +                              compatible = "atmel,hsmci";
 +                              reg = <0xfffd0000 0x600>;
 +                              interrupts = <29 4 0>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
++                      };
++
+                       watchdog@fffffd40 {
+                               compatible = "atmel,at91sam9260-wdt";
+                               reg = <0xfffffd40 0x10>;
+                               status = "disabled";
                        };
                };
  
                        status = "disabled";
                };
  
 +              cpufreq-cooling {
 +                      compatible = "stericsson,db8500-cpufreq-cooling";
 +                      status = "disabled";
 +               };
 +
+               vmmci: regulator-gpio {
+                       compatible = "regulator-gpio";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2600000>;
+                       regulator-name = "mmci-reg";
+                       regulator-type = "voltage";
+                       states = <1800000 0x1
+                                 2900000 0x0>;
+                       status = "disabled";
+               };
        };
  };
Simple merge
Simple merge
@@@ -96,8 -87,7 +96,9 @@@
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70008000 0x4000>;
                                        interrupts = <2>;
 +                                      clocks = <&clks 45>, <&clks 0>, <&clks 72>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
  
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70020000 0x4000>;
                                        interrupts = <3>;
 +                                      clocks = <&clks 46>, <&clks 0>, <&clks 73>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
  
                                        compatible = "fsl,imx51-esdhc";
                                        reg = <0x70024000 0x4000>;
                                        interrupts = <4>;
 +                                      clocks = <&clks 47>, <&clks 0>, <&clks 74>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
                        };
                                compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
                                reg = <0x73f98000 0x4000>;
                                interrupts = <58>;
 +                              clocks = <&clks 0>;
                        };
  
-                       wdog@73f9c000 { /* WDOG2 */
+                       wdog2: wdog@73f9c000 {
                                compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
                                reg = <0x73f9c000 0x4000>;
                                interrupts = <59>;
@@@ -92,8 -85,7 +92,9 @@@
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50004000 0x4000>;
                                        interrupts = <1>;
 +                                      clocks = <&clks 44>, <&clks 0>, <&clks 71>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
  
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50008000 0x4000>;
                                        interrupts = <2>;
 +                                      clocks = <&clks 45>, <&clks 0>, <&clks 72>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
  
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50020000 0x4000>;
                                        interrupts = <3>;
 +                                      clocks = <&clks 46>, <&clks 0>, <&clks 73>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
  
                                        compatible = "fsl,imx53-esdhc";
                                        reg = <0x50024000 0x4000>;
                                        interrupts = <4>;
 +                                      clocks = <&clks 47>, <&clks 0>, <&clks 74>;
 +                                      clock-names = "ipg", "ahb", "per";
+                                       bus-width = <4>;
                                        status = "disabled";
                                };
                        };
                                compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
                                reg = <0x53f98000 0x4000>;
                                interrupts = <58>;
 +                              clocks = <&clks 0>;
                        };
  
-                       wdog@53f9c000 { /* WDOG2 */
+                       wdog2: wdog@53f9c000 {
                                compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
                                reg = <0x53f9c000 0x4000>;
                                interrupts = <59>;
                                                >;
                                        };
                                };
+                               uart4 {
+                                       pinctrl_uart4_1: uart4grp-1 {
+                                               fsl,pins = <
+                                                       11 0x1c5        /* MX53_PAD_KEY_COL0__UART4_TXD_MUX */
+                                                       18 0x1c5        /* MX53_PAD_KEY_ROW0__UART4_RXD_MUX */
+                                               >;
+                                       };
+                               };
+                               uart5 {
+                                       pinctrl_uart5_1: uart5grp-1 {
+                                               fsl,pins = <
+                                                       24 0x1c5        /* MX53_PAD_KEY_COL1__UART5_TXD_MUX */
+                                                       31 0x1c5        /* MX53_PAD_KEY_ROW1__UART5_RXD_MUX */
+                                               >;
+                                       };
+                               };
                        };
  
 +                      pwm1: pwm@53fb4000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
 +                              reg = <0x53fb4000 0x4000>;
 +                              clocks = <&clks 37>, <&clks 38>;
 +                              clock-names = "ipg", "per";
 +                              interrupts = <61>;
 +                      };
 +
 +                      pwm2: pwm@53fb8000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx53-pwm", "fsl,imx27-pwm";
 +                              reg = <0x53fb8000 0x4000>;
 +                              clocks = <&clks 39>, <&clks 40>;
 +                              clock-names = "ipg", "per";
 +                              interrupts = <94>;
 +                      };
 +
                        uart1: serial@53fbc000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53fbc000 0x4000>;
                                reg = <0x0207c000 0x4000>;
                        };
  
-                       pwm@02080000 { /* PWM1 */
+                       pwm1: pwm@02080000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                reg = <0x02080000 0x4000>;
                                interrupts = <0 83 0x04>;
 +                              clocks = <&clks 62>, <&clks 145>;
 +                              clock-names = "ipg", "per";
                        };
  
-                       pwm@02084000 { /* PWM2 */
+                       pwm2: pwm@02084000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                reg = <0x02084000 0x4000>;
                                interrupts = <0 84 0x04>;
 +                              clocks = <&clks 62>, <&clks 146>;
 +                              clock-names = "ipg", "per";
                        };
  
-                       pwm@02088000 { /* PWM3 */
+                       pwm3: pwm@02088000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                reg = <0x02088000 0x4000>;
                                interrupts = <0 85 0x04>;
 +                              clocks = <&clks 62>, <&clks 147>;
 +                              clock-names = "ipg", "per";
                        };
  
-                       pwm@0208c000 { /* PWM4 */
+                       pwm4: pwm@0208c000 {
 +                              #pwm-cells = <2>;
 +                              compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                reg = <0x0208c000 0x4000>;
                                interrupts = <0 86 0x04>;
 +                              clocks = <&clks 62>, <&clks 148>;
 +                              clock-names = "ipg", "per";
                        };
  
-                       flexcan@02090000 { /* CAN1 */
+                       can1: flexcan@02090000 {
                                reg = <0x02090000 0x4000>;
                                interrupts = <0 110 0x04>;
                        };
                        };
                };
  
 +              cpufreq-cooling {
 +                      status = "okay";
 +              };
++
+               prcmu@80157000 {
+                       db8500-prcmu-regulators {
+                               db8500_vape_reg: db8500_vape {
+                                       regulator-name = "db8500-vape";
+                               };
+                               db8500_varm_reg: db8500_varm {
+                                       regulator-name = "db8500-varm";
+                               };
+                               db8500_vmodem_reg: db8500_vmodem {
+                                       regulator-name = "db8500-vmodem";
+                               };
+                               db8500_vpll_reg: db8500_vpll {
+                                       regulator-name = "db8500-vpll";
+                               };
+                               db8500_vsmps1_reg: db8500_vsmps1 {
+                                       regulator-name = "db8500-vsmps1";
+                               };
+                               db8500_vsmps2_reg: db8500_vsmps2 {
+                                       regulator-name = "db8500-vsmps2";
+                               };
+                               db8500_vsmps3_reg: db8500_vsmps3 {
+                                       regulator-name = "db8500-vsmps3";
+                               };
+                               db8500_vrf1_reg: db8500_vrf1 {
+                                       regulator-name = "db8500-vrf1";
+                               };
+                               db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
+                                       regulator-name = "db8500-sva-mmdsp";
+                               };
+                               db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
+                                       regulator-name = "db8500-sva-mmdsp-ret";
+                               };
+                               db8500_sva_pipe_reg: db8500_sva_pipe {
+                                       regulator-name = "db8500_sva_pipe";
+                               };
+                               db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
+                                       regulator-name = "db8500_sia_mmdsp";
+                               };
+                               db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
+                                       regulator-name = "db8500-sia-mmdsp-ret";
+                               };
+                               db8500_sia_pipe_reg: db8500_sia_pipe {
+                                       regulator-name = "db8500-sia-pipe";
+                               };
+                               db8500_sga_reg: db8500_sga {
+                                       regulator-name = "db8500-sga";
+                               };
+                               db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
+                                       regulator-name = "db8500-b2r2-mcde";
+                               };
+                               db8500_esram12_reg: db8500_esram12 {
+                                       regulator-name = "db8500-esram12";
+                               };
+                               db8500_esram12_ret_reg: db8500_esram12_ret {
+                                       regulator-name = "db8500-esram12-ret";
+                               };
+                               db8500_esram34_reg: db8500_esram34 {
+                                       regulator-name = "db8500-esram34";
+                               };
+                               db8500_esram34_ret_reg: db8500_esram34_ret {
+                                       regulator-name = "db8500-esram34-ret";
+                               };
+                       };
+                       ab8500@5 {
+                               ab8500-regulators {
+                                       ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                                               regulator-name = "V-DISPLAY";
+                                       };
+                                       ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
+                                               regulator-name = "V-eMMC1";
+                                       };
+                                       ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
+                                               regulator-name = "V-MMC-SD";
+                                       };
+                                       ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
+                                               regulator-name = "V-INTCORE";
+                                       };
+                                       ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
+                                               regulator-name = "V-TVOUT";
+                                       };
+                                       ab8500_ldo_usb_reg: ab8500_ldo_usb {
+                                               regulator-name = "dummy";
+                                       };
+                                       ab8500_ldo_audio_reg: ab8500_ldo_audio {
+                                               regulator-name = "V-AUD";
+                                       };
+                                       ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
+                                               regulator-name = "V-AMIC1";
+                                       };
+                                       ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
+                                               regulator-name = "V-AMIC2";
+                                       };
+                                       ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
+                                               regulator-name = "V-DMIC";
+                                       };
+                                       ab8500_ldo_ana_reg: ab8500_ldo_ana {
+                                               regulator-name = "V-CSI/DSI";
+                                       };
+                               };
+                       };
+               };
        };
  };
Simple merge
Simple merge
@@@ -50,9 -50,9 +50,8 @@@ obj-$(CONFIG_MACH_EXYNOS5_DT)         += mach-
  obj-y                                 += dev-uart.o
  obj-$(CONFIG_ARCH_EXYNOS4)            += dev-audio.o
  obj-$(CONFIG_EXYNOS4_DEV_AHCI)                += dev-ahci.o
 -obj-$(CONFIG_EXYNOS4_DEV_DWMCI)               += dev-dwmci.o
  obj-$(CONFIG_EXYNOS_DEV_DMA)          += dma.o
  obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)    += dev-ohci.o
- obj-$(CONFIG_EXYNOS_DEV_DRM)          += dev-drm.o
  obj-$(CONFIG_EXYNOS_DEV_SYSMMU)               += dev-sysmmu.o
  
  obj-$(CONFIG_ARCH_EXYNOS)             += setup-i2c0.o
Simple merge
Simple merge
Simple merge
  #define EXYNOS4_PA_TWD                        0x10500600
  #define EXYNOS4_PA_L2CC                       0x10502000
  
+ #define EXYNOS4_PA_TMU                        0x100C0000
  #define EXYNOS4_PA_MDMA0              0x10810000
  #define EXYNOS4_PA_MDMA1              0x12850000
 +#define EXYNOS4_PA_S_MDMA1            0x12840000
  #define EXYNOS4_PA_PDMA0              0x12680000
  #define EXYNOS4_PA_PDMA1              0x12690000
  #define EXYNOS5_PA_MDMA0              0x10800000
@@@ -77,7 -77,8 +77,9 @@@ static const struct of_dev_auxdata exyn
                                "exynos4210-spi.2", NULL),
        OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
        OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
 +      OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
+       OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
+                               "exynos-tmu", NULL),
        {},
  };
  
  */
  
  #include <linux/of_platform.h>
 +#include <linux/of_fdt.h>
  #include <linux/serial_core.h>
+ #include <linux/memblock.h>
+ #include <linux/of_fdt.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>
@@@ -112,11 -137,12 +153,12 @@@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG E
        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
        .init_irq       = exynos5_init_irq,
        .smp            = smp_ops(exynos_smp_ops),
 -      .map_io         = exynos5250_dt_map_io,
 +      .map_io         = exynos5_dt_map_io,
        .handle_irq     = gic_handle_irq,
 -      .init_machine   = exynos5250_dt_machine_init,
 +      .init_machine   = exynos5_dt_machine_init,
        .init_late      = exynos_init_late,
        .timer          = &exynos4_timer,
 -      .dt_compat      = exynos5250_dt_compat,
 +      .dt_compat      = exynos5_dt_compat,
        .restart        = exynos5_restart,
+       .reserve        = exynos5_reserve,
  MACHINE_END
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include <linux/smsc911x.h>
  #include <linux/gpio_keys.h>
  #include <linux/delay.h>
- #include <linux/of.h>
- #include <linux/of_platform.h>
  #include <linux/leds.h>
  #include <linux/pinctrl/consumer.h>
 +#include <linux/platform_data/pinctrl-nomadik.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <linux/platform_device.h>
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
- #include <linux/platform_data/usb-musb-ux500.h>
- #include <linux/platform_data/pinctrl-nomadik.h>
+ #include <linux/mfd/dbx500-prcmu.h>
+ #include <linux/of.h>
+ #include <linux/of_platform.h>
+ #include <linux/regulator/machine.h>
 +#include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>
+ #include <asm/mach/arch.h>
+ #include <asm/hardware/gic.h>
 -#include <plat/gpio-nomadik.h>
  #include <mach/hardware.h>
  #include <mach/setup.h>
  #include <mach/devices.h>
Simple merge
@@@ -19,7 -19,7 +19,8 @@@ endi
  obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
  obj-$(CONFIG_ARCH_U8500)      += ux500/
  obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
 +obj-$(CONFIG_ARCH_SUNXI)      += clk-sunxi.o
+ obj-$(CONFIG_ARCH_ZYNQ)               += clk-zynq.o
  
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
Simple merge
@@@ -167,7 -184,9 +170,9 @@@ ehci_orion_conf_mbus_windows(struct usb
        }
  }
  
+ static u64 ehci_orion_dma_mask = DMA_BIT_MASK(32);
 -static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
 +static int ehci_orion_drv_probe(struct platform_device *pdev)
  {
        struct orion_ehci_data *pd = pdev->dev.platform_data;
        const struct mbus_dram_target_info *dram;