]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'fixes', 'next/cleanup', 'next/drivers' and 'next/soc' into for-next
authorArnd Bergmann <arnd@arndb.de>
Mon, 26 May 2014 19:28:59 +0000 (21:28 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 26 May 2014 19:28:59 +0000 (21:28 +0200)
* fixes:
  ARM: dts: Keep LDO4 always ON for exynos5250-arndale board
  ARM: dts: Fix SPI interrupt numbers for exynos5420
  ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board

* next/cleanup:
  ARM: vexpress: refine dependencies for new code

* next/drivers:
  soc: qcom: fix of_device_id table

* next/soc:
  ARM: sunxi: allow building without reset controller

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2  3  4  5 
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos5420.dtsi
drivers/bus/Kconfig

index 9b6414a9e8a1448b70896cb7b004819cfe240603,b69fbcb7dcb8accc3fc2f7abd713dc754b9fd5ad,c3a9a66c57678f9a5dddd75e11e55be913e3c3c0,c3a9a66c57678f9a5dddd75e11e55be913e3c3c0,c3a9a66c57678f9a5dddd75e11e55be913e3c3c0..15d31f351ee6b1dfed2c157464eb287bbf04850a
                interrupts = <0 112 0>;
                clocks = <&clock 471>;
                clock-names = "secss";
  ---           samsung,power-domain = <&g2d_pd>;
  +++   };
 ++++
 ++++   usbdrd3_0: usb@12000000 {
 ++++           compatible = "samsung,exynos5250-dwusb3";
 ++++           clocks = <&clock CLK_USBD300>;
 ++++           clock-names = "usbdrd30";
 ++++           #address-cells = <1>;
 ++++           #size-cells = <1>;
 ++++           ranges;
 ++++
 ++++           dwc3 {
 ++++                   compatible = "snps,dwc3";
 ++++                   reg = <0x12000000 0x10000>;
 ++++                   interrupts = <0 72 0>;
 ++++                   phys = <&usbdrd_phy0 0>, <&usbdrd_phy0 1>;
 ++++                   phy-names = "usb2-phy", "usb3-phy";
 ++++           };
 ++++   };
 ++++
 ++++   usbdrd_phy0: phy@12100000 {
 ++++           compatible = "samsung,exynos5420-usbdrd-phy";
 ++++           reg = <0x12100000 0x100>;
 ++++           clocks = <&clock CLK_USBD300>, <&clock CLK_SCLK_USBPHY300>;
 ++++           clock-names = "phy", "ref";
 ++++           samsung,pmu-syscon = <&pmu_system_controller>;
 ++++           #phy-cells = <1>;
 ++++   };
 ++++
 ++++   usbdrd3_1: usb@12400000 {
 ++++           compatible = "samsung,exynos5250-dwusb3";
 ++++           clocks = <&clock CLK_USBD301>;
 ++++           clock-names = "usbdrd30";
 ++++           #address-cells = <1>;
 ++++           #size-cells = <1>;
 ++++           ranges;
 ++++
 ++++           dwc3 {
 ++++                   compatible = "snps,dwc3";
 ++++                   reg = <0x12400000 0x10000>;
 ++++                   interrupts = <0 73 0>;
 ++++                   phys = <&usbdrd_phy1 0>, <&usbdrd_phy1 1>;
 ++++                   phy-names = "usb2-phy", "usb3-phy";
 ++++           };
 ++++   };
 ++++
 ++++   usbdrd_phy1: phy@12500000 {
 ++++           compatible = "samsung,exynos5420-usbdrd-phy";
 ++++           reg = <0x12500000 0x100>;
 ++++           clocks = <&clock CLK_USBD301>, <&clock CLK_SCLK_USBPHY301>;
 ++++           clock-names = "phy", "ref";
 ++++           samsung,pmu-syscon = <&pmu_system_controller>;
 ++++           #phy-cells = <1>;
 +      };
     };
index 99ecb58a142adc786024848263aff84c500d3486,552373c4e362ed659cc40ec83ddd6bb564e630f9,2863427788846bbade78dfd5a74592c269fdf2e2,d40d155f423468ec6b33d25d2bff2f5bb9dcd335,552373c4e362ed659cc40ec83ddd6bb564e630f9..a118ec1650fae00d2c269cf1a4299066d9e8f236
@@@@@@ -49,13 -41,4 -41,14 -49,4 -41,4 +49,14 @@@@@@ config ARM_CC
        help
          Driver supporting the CCI cache coherent interconnect for ARM
          platforms.
 + ++
 + ++config VEXPRESS_CONFIG
 + ++   bool "Versatile Express configuration bus"
 + ++   default y if ARCH_VEXPRESS
 + ++   depends on ARM || ARM64
++ ++   depends on OF
 + ++   select REGMAP
 + ++   help
 + ++     Platform configuration infrastructure for the ARM Ltd.
 + ++     Versatile Express.
     endmenu