Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 1 Aug 2014 03:17:53 +0000 (20:17 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 1 Aug 2014 03:17:53 +0000 (20:17 -0700)
Merge "Samsung DT 2nd updates for v3.17" from Kukjin Kim:

This is based on tags/exynos-power because this DT changes
are depending PMU cleanup.

Fixes boot for exynos5260 and exynos5410,
- Since exynos cannot boot without obtaining PMU address via
  DT from now on, add PMU node for exynos5260 and exynos5410

For preparing exynos5250-spring,
- move max77686 and cypress,cyapa trackpad from exynos5250-
  cros-common to exynos5250-snow DT file
(Note exynos5250-spring is not included in this branch yet)

For exynos3250,
- add TMU node and remove duplicated interrupt-parent
- add missing pinctrl property for uart0 and uart1

For exynos5250-smdk5250 board
- add max77686 pmic interrupt property which is connected to
  gpx3

* tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (28 commits)
  ARM: dts: Add missing pinctrl for uart0/1 for exynos3250
  ARM: dts: Remove duplicate 'interrput-parent' property for exynos3250
  ARM: dts: Add TMU dt node to monitor the temperature for exynos3250
  ARM: dts: Specify MAX77686 pmic interrupt for exynos5250-smdk5250
  ARM: dts: cypress,cyapa trackpad is exynos5250-Snow only
  ARM: dts: max77686 is exynos5250-snow only
  ARM: EXYNOS: Add exynos5260 PMU compatible string to DT match table
  ARM: dts: Add PMU DT node for exynos5260 SoC
  ARM: EXYNOS: Add support for Exynos5410 PMU
  ARM: dts: Add PMU to exynos5410
  ARM: dts: Document exynos5410 PMU
  ARM: EXYNOS: Move cpufreq and cpuidle device registration to init_machine
  ARM: EXYNOS: Refactored code for using PMU address via DT
  ARM: EXYNOS: Support cluster power off on exynos5420/5800
  ARM: EXYNOS: populate suspend and powered_up callbacks for mcpm
  ARM: EXYNOS: do not allow cpuidle registration for exynos5420
  cpuidle: big.LITTLE: init driver for exynos5420
  cpuidle: big.LITTLE: Add ARCH_EXYNOS entry in config
  ARM: EXYNOS: add generic function to calculate cpu number
  cpuidle: big.LITTLE: add of_device_id structure
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/Kconfig.debug
arch/arm/boot/dts/exynos5250-snow.dts

diff --combined arch/arm/Kconfig.debug
@@@ -582,7 -582,7 +582,7 @@@ choic
                  on Rockchip based platforms.
  
        config DEBUG_RK3X_UART0
 -              bool "Kernel low-level debugging messages via Rockchip RK3X UART0"
 +              bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART0"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
                  on Rockchip based platforms.
  
        config DEBUG_RK3X_UART1
 -              bool "Kernel low-level debugging messages via Rockchip RK3X UART1"
 +              bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART1"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
                  on Rockchip based platforms.
  
        config DEBUG_RK3X_UART2
 -              bool "Kernel low-level debugging messages via Rockchip RK3X UART2"
 +              bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART2"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
                  on Rockchip based platforms.
  
        config DEBUG_RK3X_UART3
 -              bool "Kernel low-level debugging messages via Rockchip RK3X UART3"
 +              bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART3"
                depends on ARCH_ROCKCHIP
                select DEBUG_UART_8250
                help
                  Say Y here if you want kernel low-level debugging support
                  on Rockchip based platforms.
  
 +      config DEBUG_RK32_UART2
 +              bool "Kernel low-level debugging messages via Rockchip RK32 UART2"
 +              depends on ARCH_ROCKCHIP
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Rockchip RK32xx based platforms.
 +
        config DEBUG_S3C_UART0
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 0 for low-level debug"
+               bool "Use Samsung S3C UART 0 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 0. The port must have been initialised
                  by the boot-loader before use.
  
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
        config DEBUG_S3C_UART1
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 1 for low-level debug"
+               bool "Use Samsung S3C UART 1 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 1. The port must have been initialised
                  by the boot-loader before use.
  
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
        config DEBUG_S3C_UART2
                depends on PLAT_SAMSUNG
                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-               bool "Use S3C UART 2 for low-level debug"
+               bool "Use Samsung S3C UART 2 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 2. The port must have been initialised
                  by the boot-loader before use.
  
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
        config DEBUG_S3C_UART3
                depends on PLAT_SAMSUNG && ARCH_EXYNOS
                select DEBUG_EXYNOS_UART
-               bool "Use S3C UART 3 for low-level debug"
+               bool "Use Samsung S3C UART 3 for low-level debug"
                help
                  Say Y here if you want the debug print routines to direct
                  their output to UART 3. The port must have been initialised
                  by the boot-loader before use.
  
-                 The uncompressor code port configuration is now handled
-                 by CONFIG_S3C_LOWLEVEL_UART_PORT.
        config DEBUG_S3C2410_UART0
                depends on ARCH_S3C24XX
                select DEBUG_S3C2410_UART
@@@ -1104,7 -1084,6 +1092,7 @@@ config DEBUG_UART_PHY
        default 0xf991e000 if DEBUG_QCOM_UARTDM
        default 0xfcb00000 if DEBUG_HI3620_UART
        default 0xfe800000 if ARCH_IOP32X
 +      default 0xff690000 if DEBUG_RK32_UART2
        default 0xffc02000 if DEBUG_SOCFPGA_UART
        default 0xffd82340 if ARCH_IOP13XX
        default 0xfff36000 if DEBUG_HIGHBANK_UART
@@@ -1161,7 -1140,6 +1149,7 @@@ config DEBUG_UART_VIR
        default 0xfec02000 if DEBUG_SOCFPGA_UART
        default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
 +      default 0xfec90000 if DEBUG_RK32_UART2
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
        default 0xfed12000 if ARCH_KIRKWOOD
@@@ -1196,7 -1174,7 +1184,7 @@@ config DEBUG_UART_8250_WOR
                ARCH_KEYSTONE || \
                DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
                DEBUG_DAVINCI_DA8XX_UART2 || \
 -              DEBUG_BCM_KONA_UART
 +              DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2
  
  config DEBUG_UART_8250_FLOW_CONTROL
        bool "Enable flow control for 8250 UART"
                                sbs,poll-retry-count = <1>;
                        };
  
 -                      ec: embedded-controller {
 +                      cros_ec: embedded-controller {
                                compatible = "google,cros-ec-i2c";
                                reg = <0x1e>;
                                interrupts = <6 0>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&ec_irq>;
                                wakeup-source;
 -
 -                              keyboard-controller {
 -                                      compatible = "google,cros-ec-keyb";
 -                                      keypad,num-rows = <8>;
 -                                      keypad,num-columns = <13>;
 -                                      google,needs-ghost-filter;
 -                                      linux,keymap = <0x0001007d      /* L_META */
 -                                                      0x0002003b      /* F1 */
 -                                                      0x00030030      /* B */
 -                                                      0x00040044      /* F10 */
 -                                                      0x00060031      /* N */
 -                                                      0x0008000d      /* = */
 -                                                      0x000a0064      /* R_ALT */
 -
 -                                                      0x01010001      /* ESC */
 -                                                      0x0102003e      /* F4 */
 -                                                      0x01030022      /* G */
 -                                                      0x01040041      /* F7 */
 -                                                      0x01060023      /* H */
 -                                                      0x01080028      /* ' */
 -                                                      0x01090043      /* F9 */
 -                                                      0x010b000e      /* BKSPACE */
 -
 -                                                      0x0200001d      /* L_CTRL */
 -                                                      0x0201000f      /* TAB */
 -                                                      0x0202003d      /* F3 */
 -                                                      0x02030014      /* T */
 -                                                      0x02040040      /* F6 */
 -                                                      0x0205001b      /* ] */
 -                                                      0x02060015      /* Y */
 -                                                      0x02070056      /* 102ND */
 -                                                      0x0208001a      /* [ */
 -                                                      0x02090042      /* F8 */
 -
 -                                                      0x03010029      /* GRAVE */
 -                                                      0x0302003c      /* F2 */
 -                                                      0x03030006      /* 5 */
 -                                                      0x0304003f      /* F5 */
 -                                                      0x03060007      /* 6 */
 -                                                      0x0308000c      /* - */
 -                                                      0x030b002b      /* \ */
 -
 -                                                      0x04000061      /* R_CTRL */
 -                                                      0x0401001e      /* A */
 -                                                      0x04020020      /* D */
 -                                                      0x04030021      /* F */
 -                                                      0x0404001f      /* S */
 -                                                      0x04050025      /* K */
 -                                                      0x04060024      /* J */
 -                                                      0x04080027      /* ; */
 -                                                      0x04090026      /* L */
 -                                                      0x040a002b      /* \ */
 -                                                      0x040b001c      /* ENTER */
 -
 -                                                      0x0501002c      /* Z */
 -                                                      0x0502002e      /* C */
 -                                                      0x0503002f      /* V */
 -                                                      0x0504002d      /* X */
 -                                                      0x05050033      /* , */
 -                                                      0x05060032      /* M */
 -                                                      0x0507002a      /* L_SHIFT */
 -                                                      0x05080035      /* / */
 -                                                      0x05090034      /* . */
 -                                                      0x050B0039      /* SPACE */
 -
 -                                                      0x06010002      /* 1 */
 -                                                      0x06020004      /* 3 */
 -                                                      0x06030005      /* 4 */
 -                                                      0x06040003      /* 2 */
 -                                                      0x06050009      /* 8 */
 -                                                      0x06060008      /* 7 */
 -                                                      0x0608000b      /* 0 */
 -                                                      0x0609000a      /* 9 */
 -                                                      0x060a0038      /* L_ALT */
 -                                                      0x060b006c      /* DOWN */
 -                                                      0x060c006a      /* RIGHT */
 -
 -                                                      0x07010010      /* Q */
 -                                                      0x07020012      /* E */
 -                                                      0x07030013      /* R */
 -                                                      0x07040011      /* W */
 -                                                      0x07050017      /* I */
 -                                                      0x07060016      /* U */
 -                                                      0x07070036      /* R_SHIFT */
 -                                                      0x07080019      /* P */
 -                                                      0x07090018      /* O */
 -                                                      0x070b0067      /* UP */
 -                                                      0x070c0069>;    /* LEFT */
 -                              };
                        };
  
                        power-regulator {
        };
  };
  
+ &i2c_0 {
+       max77686@09 {
+               compatible = "maxim,max77686";
+               interrupt-parent = <&gpx3>;
+               interrupts = <2 0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&max77686_irq>;
+               wakeup-source;
+               reg = <0x09>;
+               #clock-cells = <1>;
+               voltage-regulators {
+                       ldo1_reg: LDO1 {
+                               regulator-name = "P1.0V_LDO_OUT1";
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-always-on;
+                       };
+                       ldo2_reg: LDO2 {
+                               regulator-name = "P1.8V_LDO_OUT2";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+                       ldo3_reg: LDO3 {
+                               regulator-name = "P1.8V_LDO_OUT3";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+                       ldo7_reg: LDO7 {
+                               regulator-name = "P1.1V_LDO_OUT7";
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1100000>;
+                               regulator-always-on;
+                       };
+                       ldo8_reg: LDO8 {
+                               regulator-name = "P1.0V_LDO_OUT8";
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-always-on;
+                       };
+                       ldo10_reg: LDO10 {
+                               regulator-name = "P1.8V_LDO_OUT10";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+                       ldo12_reg: LDO12 {
+                               regulator-name = "P3.0V_LDO_OUT12";
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-always-on;
+                       };
+                       ldo14_reg: LDO14 {
+                               regulator-name = "P1.8V_LDO_OUT14";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+                       ldo15_reg: LDO15 {
+                               regulator-name = "P1.0V_LDO_OUT15";
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <1000000>;
+                               regulator-always-on;
+                       };
+                       ldo16_reg: LDO16 {
+                               regulator-name = "P1.8V_LDO_OUT16";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+                       buck1_reg: BUCK1 {
+                               regulator-name = "vdd_mif";
+                               regulator-min-microvolt = <950000>;
+                               regulator-max-microvolt = <1300000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+                       buck2_reg: BUCK2 {
+                               regulator-name = "vdd_arm";
+                               regulator-min-microvolt = <850000>;
+                               regulator-max-microvolt = <1350000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+                       buck3_reg: BUCK3 {
+                               regulator-name = "vdd_int";
+                               regulator-min-microvolt = <900000>;
+                               regulator-max-microvolt = <1200000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+                       buck4_reg: BUCK4 {
+                               regulator-name = "vdd_g3d";
+                               regulator-min-microvolt = <850000>;
+                               regulator-max-microvolt = <1300000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+                       buck5_reg: BUCK5 {
+                               regulator-name = "P1.8V_BUCK_OUT5";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                               regulator-boot-on;
+                       };
+                       buck6_reg: BUCK6 {
+                               regulator-name = "P1.35V_BUCK_OUT6";
+                               regulator-min-microvolt = <1350000>;
+                               regulator-max-microvolt = <1350000>;
+                               regulator-always-on;
+                       };
+                       buck7_reg: BUCK7 {
+                               regulator-name = "P2.0V_BUCK_OUT7";
+                               regulator-min-microvolt = <2000000>;
+                               regulator-max-microvolt = <2000000>;
+                               regulator-always-on;
+                       };
+                       buck8_reg: BUCK8 {
+                               regulator-name = "P2.85V_BUCK_OUT8";
+                               regulator-min-microvolt = <2850000>;
+                               regulator-max-microvolt = <2850000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+ };
+ &i2c_1 {
+       trackpad {
+               reg = <0x67>;
+               compatible = "cypress,cyapa";
+               interrupts = <2 0>;
+               interrupt-parent = <&gpx1>;
+               wakeup-source;
+       };
+ };
+ &pinctrl_0 {
+       max77686_irq: max77686-irq {
+               samsung,pins = "gpx3-2";
+               samsung,pin-function = <0>;
+               samsung,pin-pud = <0>;
+               samsung,pin-drv = <0>;
+       };
+ };
++
 +#include "cros-ec-keyboard.dtsi"