diff for duplicates of <53DA6D1F.3040102@suse.de> diff --git a/a/1.txt b/N1/1.txt index f5d9cdd..f04de64 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Am 31.07.2014 18:08, schrieb Andreas Färber: +Am 31.07.2014 18:08, schrieb Andreas F?rber: > Hello, > > Based on the preinstalled 3.8 based ChromeOS kernel and previous 3.15 @@ -12,5 +12,12 @@ Once again, resulting Snow vs. Spring diff attached for convenience. Andreas -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: spring-snow.v4.diff +Type: text/x-patch +Size: 17117 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140731/5522a095/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 9625600..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,5 +0,0 @@ -Content-Type: text/x-patch; - name="spring-snow.v4.diff" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename="spring-snow.v4.diff" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 85e0969..0000000 --- a/a/2.txt +++ /dev/null @@ -1,714 +0,0 @@ ---- arch/arm/boot/dts/exynos5250-snow.dts 2014-07-31 18:10:49.680004102 +0200 -+++ arch/arm/boot/dts/exynos5250-spring.dts 2014-07-31 18:10:51.100004102 +0200 -@@ -1,12 +1,13 @@ - /* -- * Google Snow board device tree source -+ * Google Spring board device tree source - * -- * Copyright (c) 2012 Google, Inc -+ * Copyright (c) 2013 Google, Inc -+ * Copyright (c) 2014 SUSE LINUX Products GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. --*/ -+ */ - - /dts-v1/; - #include <dt-bindings/gpio/gpio.h> -@@ -14,26 +15,21 @@ - #include "exynos5250.dtsi" - - / { -- model = "Google Snow"; -- compatible = "google,snow", "samsung,exynos5250", "samsung,exynos5"; -- -- aliases { -- i2c104 = &i2c_104; -- }; -+ model = "Google Spring"; -+ compatible = "google,spring", "samsung,exynos5250", "samsung,exynos5"; - - memory { - reg = <0x40000000 0x80000000>; - }; - - chosen { -- }; -- -- rtc@101E0000 { -- status = "okay"; -+ bootargs = "console=tty1"; - }; - - gpio-keys { - compatible = "gpio-keys"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&power_key_irq>, <&lid_irq>; - - power { - label = "Power"; -@@ -52,145 +48,12 @@ - }; - }; - -- vbat: vbat-fixed-regulator { -- compatible = "regulator-fixed"; -- regulator-name = "vbat-supply"; -- regulator-boot-on; -- }; -- -- i2c-arbitrator { -- compatible = "i2c-arb-gpio-challenge"; -- #address-cells = <1>; -- #size-cells = <0>; -- -- i2c-parent = <&{/i2c@12CA0000}>; -- -- our-claim-gpio = <&gpf0 3 GPIO_ACTIVE_LOW>; -- their-claim-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>; -- slew-delay-us = <10>; -- wait-retry-us = <3000>; -- wait-free-us = <50000>; -- -- pinctrl-names = "default"; -- pinctrl-0 = <&arb_our_claim &arb_their_claim>; -- -- /* Use ID 104 as a hint that we're on physical bus 4 */ -- i2c_104: i2c@0 { -- reg = <0>; -- #address-cells = <1>; -- #size-cells = <0>; -- -- battery: sbs-battery@b { -- compatible = "sbs,sbs-battery"; -- reg = <0xb>; -- sbs,poll-retry-count = <1>; -- }; -- -- cros_ec: embedded-controller { -- compatible = "google,cros-ec-i2c"; -- reg = <0x1e>; -- interrupts = <6 0>; -- interrupt-parent = <&gpx1>; -- pinctrl-names = "default"; -- pinctrl-0 = <&ec_irq>; -- wakeup-source; -- }; -- -- power-regulator { -- compatible = "ti,tps65090"; -- reg = <0x48>; -- -- /* -- * Config irq to disable internal pulls -- * even though we run in polling mode. -- */ -- pinctrl-names = "default"; -- pinctrl-0 = <&tps65090_irq>; -- -- vsys1-supply = <&vbat>; -- vsys2-supply = <&vbat>; -- vsys3-supply = <&vbat>; -- infet1-supply = <&vbat>; -- infet2-supply = <&vbat>; -- infet3-supply = <&vbat>; -- infet4-supply = <&vbat>; -- infet5-supply = <&vbat>; -- infet6-supply = <&vbat>; -- infet7-supply = <&vbat>; -- vsys-l1-supply = <&vbat>; -- vsys-l2-supply = <&vbat>; -- -- regulators { -- dcdc1 { -- ti,enable-ext-control; -- }; -- dcdc2 { -- ti,enable-ext-control; -- }; -- dcdc3 { -- ti,enable-ext-control; -- }; -- fet1 { -- regulator-name = "vcd_led"; -- ti,overcurrent-wait = <3>; -- }; -- tps65090_fet2: fet2 { -- regulator-name = "video_mid"; -- regulator-always-on; -- ti,overcurrent-wait = <3>; -- }; -- fet3 { -- regulator-name = "wwan_r"; -- regulator-always-on; -- ti,overcurrent-wait = <3>; -- }; -- fet4 { -- regulator-name = "sdcard"; -- ti,overcurrent-wait = <3>; -- }; -- fet5 { -- regulator-name = "camout"; -- regulator-always-on; -- ti,overcurrent-wait = <3>; -- }; -- fet6 { -- regulator-name = "lcd_vdd"; -- ti,overcurrent-wait = <3>; -- }; -- tps65090_fet7: fet7 { -- regulator-name = "video_mid_1a"; -- regulator-always-on; -- ti,overcurrent-wait = <3>; -- }; -- ldo1 { -- }; -- ldo2 { -- }; -- }; -- -- charger { -- compatible = "ti,tps65090-charger"; -- }; -- }; -- }; -- }; -- -- sound { -- compatible = "google,snow-audio-max98095"; -- -- samsung,model = "Snow-I2S-MAX98095"; -- samsung,i2s-controller = <&i2s0>; -- samsung,audio-codec = <&max98095>; -- }; -- - usb3_vbus_reg: regulator-usb3 { - compatible = "regulator-fixed"; - regulator-name = "P5.0V_USB3CON"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; -- gpio = <&gpx2 7 GPIO_ACTIVE_HIGH>; -- pinctrl-names = "default"; -- pinctrl-0 = <&usb3_vbus_en>; -+ gpio = <&gpe1 0 GPIO_ACTIVE_LOW>; - enable-active-high; - }; - -@@ -198,6 +61,11 @@ - samsung,vbus-gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>; - }; - -+ usb-hub { -+ compatible = "smsc,usb3503a"; -+ reset-gpios = <&hsic_reset>; -+ }; -+ - fixed-rate-clocks { - xxti { - compatible = "samsung,clock-xxti"; -@@ -211,19 +79,10 @@ - pinctrl-0 = <&hdmi_hpd_irq>; - phy = <&hdmiphy>; - ddc = <&i2c_2>; -- hdmi-en-supply = <&tps65090_fet7>; -- vdd-supply = <&ldo8_reg>; -- vdd_osc-supply = <&ldo10_reg>; -- vdd_pll-supply = <&ldo8_reg>; -- }; -- -- backlight { -- compatible = "pwm-backlight"; -- pwms = <&pwm 0 1000000 0>; -- brightness-levels = <0 100 500 1000 1500 2000 2500 2800>; -- default-brightness-level = <7>; -- pinctrl-0 = <&pwm0_out>; -- pinctrl-names = "default"; -+ hdmi-en-supply = <&s5m_ldo8_reg>; -+ vdd-supply = <&s5m_ldo8_reg>; -+ vdd_osc-supply = <&s5m_ldo10_reg>; -+ vdd_pll-supply = <&s5m_ldo8_reg>; - }; - - fimd@14400000 { -@@ -240,172 +99,241 @@ - samsung,ycbcr-coeff = <0>; - samsung,color-depth = <1>; - samsung,link-rate = <0x0a>; -- samsung,lane-count = <2>; -- samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>; -- -- display-timings { -- native-mode = <&timing1>; -- -- timing1: timing@1 { -- clock-frequency = <70589280>; -- hactive = <1366>; -- vactive = <768>; -- hfront-porch = <40>; -- hback-porch = <40>; -- hsync-len = <32>; -- vback-porch = <10>; -- vfront-porch = <12>; -- vsync-len = <6>; -- }; -- }; -+ samsung,lane-count = <1>; -+ samsung,hpd-gpio = <&gpc3 0 GPIO_ACTIVE_HIGH>; - }; - }; - -+&dp_hpd { -+ samsung,pins = "gpc3-0"; -+ samsung,pin-function = <0>; -+ samsung,pin-pud = <3>; -+ samsung,pin-drv = <0>; -+}; -+ - &i2c_0 { - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - -- max77686@09 { -- compatible = "maxim,max77686"; -+ s5m8767-pmic@66 { -+ compatible = "samsung,s5m8767-pmic"; -+ reg = <0x66>; - interrupt-parent = <&gpx3>; - interrupts = <2 0>; - pinctrl-names = "default"; -- pinctrl-0 = <&max77686_irq>; -+ pinctrl-0 = <&s5m8767_irq &s5m8767_dvs &s5m8767_ds>; - wakeup-source; -- reg = <0x09>; -- #clock-cells = <1>; - -- voltage-regulators { -- ldo1_reg: LDO1 { -- regulator-name = "P1.0V_LDO_OUT1"; -+ s5m8767,pmic-buck-dvs-gpios = <&gpd1 0 GPIO_ACTIVE_LOW>, /* DVS1 */ -+ <&gpd1 1 GPIO_ACTIVE_LOW>, /* DVS2 */ -+ <&gpd1 2 GPIO_ACTIVE_LOW>; /* DVS3 */ -+ -+ s5m8767,pmic-buck-ds-gpios = <&gpx2 3 GPIO_ACTIVE_LOW>, /* SET1 */ -+ <&gpx2 4 GPIO_ACTIVE_LOW>, /* SET2 */ -+ <&gpx2 5 GPIO_ACTIVE_LOW>; /* SET3 */ -+ -+ /* -+ * The following arrays of DVS voltages are not used, since we are -+ * not using GPIOs to control PMIC bucks, but they must be defined -+ * to please the driver. -+ */ -+ s5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>, -+ <1250000>, <1200000>, -+ <1150000>, <1100000>, -+ <1000000>, <950000>; -+ -+ s5m8767,pmic-buck3-dvs-voltage = <1100000>, <1100000>, -+ <1100000>, <1100000>, -+ <1000000>, <1000000>, -+ <1000000>, <1000000>; -+ -+ s5m8767,pmic-buck4-dvs-voltage = <1200000>, <1200000>, -+ <1200000>, <1200000>, -+ <1200000>, <1200000>, -+ <1200000>, <1200000>; -+ -+ clocks { -+ compatible = "samsung,s5m8767-clk"; -+ #clock-cells = <1>; -+ clock-output-names = "en32khz_ap", -+ "en32khz_cp", -+ "en32khz_bt"; -+ }; -+ -+ regulators { -+ s5m_ldo4_reg: LDO4 { -+ regulator-name = "P1.0V_LDO_OUT4"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; -+ op_mode = <0>; - }; - -- ldo2_reg: LDO2 { -- regulator-name = "P1.8V_LDO_OUT2"; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -+ s5m_ldo5_reg: LDO5 { -+ regulator-name = "P1.0V_LDO_OUT5"; -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <1000000>; - regulator-always-on; -+ op_mode = <0>; - }; - -- ldo3_reg: LDO3 { -- regulator-name = "P1.8V_LDO_OUT3"; -- regulator-min-microvolt = <1800000>; -- regulator-max-microvolt = <1800000>; -+ s5m_ldo6_reg: LDO6 { -+ regulator-name = "vdd_mydp"; -+ regulator-min-microvolt = <1000000>; -+ regulator-max-microvolt = <1000000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo7_reg: LDO7 { -+ s5m_ldo7_reg: LDO7 { - regulator-name = "P1.1V_LDO_OUT7"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo8_reg: LDO8 { -+ s5m_ldo8_reg: LDO8 { - regulator-name = "P1.0V_LDO_OUT8"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo10_reg: LDO10 { -+ s5m_ldo10_reg: LDO10 { - regulator-name = "P1.8V_LDO_OUT10"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo12_reg: LDO12 { -+ s5m_ldo11_reg: LDO11 { -+ regulator-name = "P1.8V_LDO_OUT11"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ op_mode = <0>; -+ }; -+ -+ s5m_ldo12_reg: LDO12 { - regulator-name = "P3.0V_LDO_OUT12"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-always-on; -+ op_mode = <3>; -+ }; -+ -+ s5m_ldo13_reg: LDO13 { -+ regulator-name = "P1.8V_LDO_OUT13"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ op_mode = <0>; - }; - -- ldo14_reg: LDO14 { -+ s5m_ldo14_reg: LDO14 { - regulator-name = "P1.8V_LDO_OUT14"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo15_reg: LDO15 { -+ s5m_ldo15_reg: LDO15 { - regulator-name = "P1.0V_LDO_OUT15"; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - regulator-always-on; -+ op_mode = <3>; - }; - -- ldo16_reg: LDO16 { -+ s5m_ldo16_reg: LDO16 { - regulator-name = "P1.8V_LDO_OUT16"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -+ op_mode = <3>; -+ }; -+ -+ s5m_ldo17_reg: LDO17 { -+ regulator-name = "P2.8V_LDO_OUT17"; -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <2800000>; -+ regulator-always-on; -+ op_mode = <0>; -+ }; -+ -+ s5m_ldo25_reg: LDO25 { -+ regulator-name = "vdd_bridge"; -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; -+ regulator-always-on; -+ op_mode = <1>; - }; - -- buck1_reg: BUCK1 { -+ BUCK1 { - regulator-name = "vdd_mif"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1300000>; - regulator-always-on; - regulator-boot-on; -+ op_mode = <3>; - }; - -- buck2_reg: BUCK2 { -+ BUCK2 { - regulator-name = "vdd_arm"; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; -+ op_mode = <3>; - }; - -- buck3_reg: BUCK3 { -+ BUCK3 { - regulator-name = "vdd_int"; - regulator-min-microvolt = <900000>; - regulator-max-microvolt = <1200000>; - regulator-always-on; - regulator-boot-on; -+ op_mode = <3>; - }; - -- buck4_reg: BUCK4 { -+ BUCK4 { - regulator-name = "vdd_g3d"; - regulator-min-microvolt = <850000>; - regulator-max-microvolt = <1300000>; -- regulator-always-on; - regulator-boot-on; -+ op_mode = <3>; - }; - -- buck5_reg: BUCK5 { -+ BUCK5 { - regulator-name = "P1.8V_BUCK_OUT5"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - regulator-boot-on; -+ op_mode = <1>; - }; - -- 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>; -+ BUCK6 { -+ regulator-name = "P1.2V_BUCK_OUT6"; -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <1200000>; - regulator-always-on; -+ regulator-boot-on; -+ op_mode = <0>; - }; - -- buck8_reg: BUCK8 { -- regulator-name = "P2.85V_BUCK_OUT8"; -- regulator-min-microvolt = <2850000>; -- regulator-max-microvolt = <2850000>; -+ BUCK9 { -+ regulator-name = "vdd_ummc"; -+ regulator-min-microvolt = <950000>; -+ regulator-max-microvolt = <3000000>; - regulator-always-on; -+ regulator-boot-on; -+ op_mode = <3>; - }; - }; - }; -@@ -415,14 +343,6 @@ - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; -- -- trackpad { -- reg = <0x67>; -- compatible = "cypress,cyapa"; -- interrupts = <2 0>; -- interrupt-parent = <&gpx1>; -- wakeup-source; -- }; - }; - - /* -@@ -454,6 +374,16 @@ - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; -+ -+ cros_ec: embedded-controller { -+ compatible = "google,cros-ec-i2c"; -+ reg = <0x1e>; -+ interrupts = <6 0>; -+ interrupt-parent = <&gpx1>; -+ wakeup-source; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ec_irq>; -+ }; - }; - - &i2c_5 { -@@ -466,13 +396,6 @@ - status = "okay"; - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; -- -- max98095: codec@11 { -- compatible = "maxim,max98095"; -- reg = <0x11>; -- pinctrl-0 = <&max98095_en>; -- pinctrl-names = "default"; -- }; - }; - - &i2c_8 { -@@ -508,29 +431,7 @@ - }; - }; - --&mmc_2 { -- status = "okay"; -- num-slots = <1>; -- supports-highspeed; -- card-detect-delay = <200>; -- samsung,dw-mshc-ciu-div = <3>; -- samsung,dw-mshc-sdr-timing = <2 3>; -- samsung,dw-mshc-ddr-timing = <1 2>; -- pinctrl-names = "default"; -- pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; -- -- slot@0 { -- reg = <0>; -- bus-width = <4>; -- wp-gpios = <&gpc2 1 0>; -- }; --}; -- --/* -- * On Snow we've got SIP WiFi and so can keep drive strengths low to -- * reduce EMI. -- */ --&mmc_3 { -+&mmc_1 { - status = "okay"; - num-slots = <1>; - supports-highspeed; -@@ -540,7 +441,7 @@ - samsung,dw-mshc-sdr-timing = <2 3>; - samsung,dw-mshc-ddr-timing = <1 2>; - pinctrl-names = "default"; -- pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>; -+ pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>; - - slot@0 { - reg = <0>; -@@ -549,8 +450,15 @@ - }; - - &pinctrl_0 { -- max77686_irq: max77686-irq { -- samsung,pins = "gpx3-2"; -+ s5m8767_dvs: s5m8767-dvs { -+ samsung,pins = "gpd1-0", "gpd1-1", "gpd1-2"; -+ samsung,pin-function = <0>; -+ samsung,pin-pud = <1>; -+ samsung,pin-drv = <0>; -+ }; -+ -+ power_key_irq: power-key-irq { -+ samsung,pins = "gpx1-3"; - samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; -@@ -563,23 +471,23 @@ - samsung,pin-drv = <0>; - }; - -- max98095_en: max98095-en { -- samsung,pins = "gpx1-7"; -+ s5m8767_ds: s5m8767-ds { -+ samsung,pins = "gpx2-3", "gpx2-4", "gpx2-5"; - samsung,pin-function = <0>; -- samsung,pin-pud = <3>; -+ samsung,pin-pud = <1>; - samsung,pin-drv = <0>; - }; - -- tps65090_irq: tps65090-irq { -- samsung,pins = "gpx2-6"; -+ s5m8767_irq: s5m8767-irq { -+ samsung,pins = "gpx3-2"; - samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - -- usb3_vbus_en: usb3-vbus-en { -- samsung,pins = "gpx2-7"; -- samsung,pin-function = <1>; -+ lid_irq: lid-irq { -+ samsung,pins = "gpx3-5"; -+ samsung,pin-function = <0>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; -@@ -593,31 +501,28 @@ - }; - - &pinctrl_1 { -- arb_their_claim: arb-their-claim { -- samsung,pins = "gpe0-4"; -- samsung,pin-function = <0>; -- samsung,pin-pud = <3>; -- samsung,pin-drv = <0>; -- }; -- -- arb_our_claim: arb-our-claim { -- samsung,pins = "gpf0-3"; -+ hsic_reset: hsic-reset { -+ samsung,pins = "gpe1-0"; - samsung,pin-function = <1>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; - --&sd3_clk { -+&sd1_clk { - samsung,pin-drv = <0>; - }; - --&sd3_cmd { -+&sd1_cmd { - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - --&sd3_bus4 { -+&sd1_cd { -+ samsung,pin-drv = <0>; -+}; -+ -+&sd1_bus4 { - samsung,pin-drv = <0>; - }; diff --git a/a/content_digest b/N1/content_digest index bbfb8c7..66047ae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,11 @@ "ref\01406822910-6255-1-git-send-email-afaerber@suse.de\0" - "From\0Andreas F\303\244rber <afaerber@suse.de>\0" - "Subject\0Re: [PATCH v4 0/4] ARM: dts: exynos: Prepare Spring\0" + "From\0afaerber@suse.de (Andreas F\303\244rber)\0" + "Subject\0[PATCH v4 0/4] ARM: dts: exynos: Prepare Spring\0" "Date\0Thu, 31 Jul 2014 18:21:51 +0200\0" - "To\0linux-samsung-soc@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - devicetree@vger.kernel.org - Stephan van Schaik <stephan@synkhronix.com> - Vincent Palatin <vpalatin@chromium.org> - Doug Anderson <dianders@chromium.org> - " Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" - "Am 31.07.2014 18:08, schrieb Andreas F\303\244rber:\n" + "Am 31.07.2014 18:08, schrieb Andreas F?rber:\n" "> Hello,\n" "> \n" "> Based on the preinstalled 3.8 based ChromeOS kernel and previous 3.15 \n" @@ -25,724 +19,14 @@ "Andreas\n" "\n" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" - "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg" - "\01:2\0" - "fn\0spring-snow.v4.diff\0" - "b\0" - "--- arch/arm/boot/dts/exynos5250-snow.dts\t2014-07-31 18:10:49.680004102 +0200\n" - "+++ arch/arm/boot/dts/exynos5250-spring.dts\t2014-07-31 18:10:51.100004102 +0200\n" - "@@ -1,12 +1,13 @@\n" - " /*\n" - "- * Google Snow board device tree source\n" - "+ * Google Spring board device tree source\n" - " *\n" - "- * Copyright (c) 2012 Google, Inc\n" - "+ * Copyright (c) 2013 Google, Inc\n" - "+ * Copyright (c) 2014 SUSE LINUX Products GmbH\n" - " *\n" - " * This program is free software; you can redistribute it and/or modify\n" - " * it under the terms of the GNU General Public License version 2 as\n" - " * published by the Free Software Foundation.\n" - "-*/\n" - "+ */\n" - " \n" - " /dts-v1/;\n" - " #include <dt-bindings/gpio/gpio.h>\n" - "@@ -14,26 +15,21 @@\n" - " #include \"exynos5250.dtsi\"\n" - " \n" - " / {\n" - "-\tmodel = \"Google Snow\";\n" - "-\tcompatible = \"google,snow\", \"samsung,exynos5250\", \"samsung,exynos5\";\n" - "-\n" - "-\taliases {\n" - "-\t\ti2c104 = &i2c_104;\n" - "-\t};\n" - "+\tmodel = \"Google Spring\";\n" - "+\tcompatible = \"google,spring\", \"samsung,exynos5250\", \"samsung,exynos5\";\n" - " \n" - " \tmemory {\n" - " \t\treg = <0x40000000 0x80000000>;\n" - " \t};\n" - " \n" - " \tchosen {\n" - "-\t};\n" - "-\n" - "-\trtc@101E0000 {\n" - "-\t\tstatus = \"okay\";\n" - "+\t\tbootargs = \"console=tty1\";\n" - " \t};\n" - " \n" - " \tgpio-keys {\n" - " \t\tcompatible = \"gpio-keys\";\n" - "+\t\tpinctrl-names = \"default\";\n" - "+\t\tpinctrl-0 = <&power_key_irq>, <&lid_irq>;\n" - " \n" - " \t\tpower {\n" - " \t\t\tlabel = \"Power\";\n" - "@@ -52,145 +48,12 @@\n" - " \t\t};\n" - " \t};\n" - " \n" - "-\tvbat: vbat-fixed-regulator {\n" - "-\t\tcompatible = \"regulator-fixed\";\n" - "-\t\tregulator-name = \"vbat-supply\";\n" - "-\t\tregulator-boot-on;\n" - "-\t};\n" - "-\n" - "-\ti2c-arbitrator {\n" - "-\t\tcompatible = \"i2c-arb-gpio-challenge\";\n" - "-\t\t#address-cells = <1>;\n" - "-\t\t#size-cells = <0>;\n" - "-\n" - "-\t\ti2c-parent = <&{/i2c@12CA0000}>;\n" - "-\n" - "-\t\tour-claim-gpio = <&gpf0 3 GPIO_ACTIVE_LOW>;\n" - "-\t\ttheir-claim-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>;\n" - "-\t\tslew-delay-us = <10>;\n" - "-\t\twait-retry-us = <3000>;\n" - "-\t\twait-free-us = <50000>;\n" - "-\n" - "-\t\tpinctrl-names = \"default\";\n" - "-\t\tpinctrl-0 = <&arb_our_claim &arb_their_claim>;\n" - "-\n" - "-\t\t/* Use ID 104 as a hint that we're on physical bus 4 */\n" - "-\t\ti2c_104: i2c@0 {\n" - "-\t\t\treg = <0>;\n" - "-\t\t\t#address-cells = <1>;\n" - "-\t\t\t#size-cells = <0>;\n" - "-\n" - "-\t\t\tbattery: sbs-battery@b {\n" - "-\t\t\t\tcompatible = \"sbs,sbs-battery\";\n" - "-\t\t\t\treg = <0xb>;\n" - "-\t\t\t\tsbs,poll-retry-count = <1>;\n" - "-\t\t\t};\n" - "-\n" - "-\t\t\tcros_ec: embedded-controller {\n" - "-\t\t\t\tcompatible = \"google,cros-ec-i2c\";\n" - "-\t\t\t\treg = <0x1e>;\n" - "-\t\t\t\tinterrupts = <6 0>;\n" - "-\t\t\t\tinterrupt-parent = <&gpx1>;\n" - "-\t\t\t\tpinctrl-names = \"default\";\n" - "-\t\t\t\tpinctrl-0 = <&ec_irq>;\n" - "-\t\t\t\twakeup-source;\n" - "-\t\t\t};\n" - "-\n" - "-\t\t\tpower-regulator {\n" - "-\t\t\t\tcompatible = \"ti,tps65090\";\n" - "-\t\t\t\treg = <0x48>;\n" - "-\n" - "-\t\t\t\t/*\n" - "-\t\t\t\t * Config irq to disable internal pulls\n" - "-\t\t\t\t * even though we run in polling mode.\n" - "-\t\t\t\t */\n" - "-\t\t\t\tpinctrl-names = \"default\";\n" - "-\t\t\t\tpinctrl-0 = <&tps65090_irq>;\n" - "-\n" - "-\t\t\t\tvsys1-supply = <&vbat>;\n" - "-\t\t\t\tvsys2-supply = <&vbat>;\n" - "-\t\t\t\tvsys3-supply = <&vbat>;\n" - "-\t\t\t\tinfet1-supply = <&vbat>;\n" - "-\t\t\t\tinfet2-supply = <&vbat>;\n" - "-\t\t\t\tinfet3-supply = <&vbat>;\n" - "-\t\t\t\tinfet4-supply = <&vbat>;\n" - "-\t\t\t\tinfet5-supply = <&vbat>;\n" - "-\t\t\t\tinfet6-supply = <&vbat>;\n" - "-\t\t\t\tinfet7-supply = <&vbat>;\n" - "-\t\t\t\tvsys-l1-supply = <&vbat>;\n" - "-\t\t\t\tvsys-l2-supply = <&vbat>;\n" - "-\n" - "-\t\t\t\tregulators {\n" - "-\t\t\t\t\tdcdc1 {\n" - "-\t\t\t\t\t\tti,enable-ext-control;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tdcdc2 {\n" - "-\t\t\t\t\t\tti,enable-ext-control;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tdcdc3 {\n" - "-\t\t\t\t\t\tti,enable-ext-control;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tfet1 {\n" - "-\t\t\t\t\t\tregulator-name = \"vcd_led\";\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\ttps65090_fet2: fet2 {\n" - "-\t\t\t\t\t\tregulator-name = \"video_mid\";\n" - "-\t\t\t\t\t\tregulator-always-on;\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tfet3 {\n" - "-\t\t\t\t\t\tregulator-name = \"wwan_r\";\n" - "-\t\t\t\t\t\tregulator-always-on;\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tfet4 {\n" - "-\t\t\t\t\t\tregulator-name = \"sdcard\";\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tfet5 {\n" - "-\t\t\t\t\t\tregulator-name = \"camout\";\n" - "-\t\t\t\t\t\tregulator-always-on;\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tfet6 {\n" - "-\t\t\t\t\t\tregulator-name = \"lcd_vdd\";\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\ttps65090_fet7: fet7 {\n" - "-\t\t\t\t\t\tregulator-name = \"video_mid_1a\";\n" - "-\t\t\t\t\t\tregulator-always-on;\n" - "-\t\t\t\t\t\tti,overcurrent-wait = <3>;\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tldo1 {\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t\tldo2 {\n" - "-\t\t\t\t\t};\n" - "-\t\t\t\t};\n" - "-\n" - "-\t\t\t\tcharger {\n" - "-\t\t\t\t\tcompatible = \"ti,tps65090-charger\";\n" - "-\t\t\t\t};\n" - "-\t\t\t};\n" - "-\t\t};\n" - "-\t};\n" - "-\n" - "-\tsound {\n" - "-\t\tcompatible = \"google,snow-audio-max98095\";\n" - "-\n" - "-\t\tsamsung,model = \"Snow-I2S-MAX98095\";\n" - "-\t\tsamsung,i2s-controller = <&i2s0>;\n" - "-\t\tsamsung,audio-codec = <&max98095>;\n" - "-\t};\n" - "-\n" - " \tusb3_vbus_reg: regulator-usb3 {\n" - " \t\tcompatible = \"regulator-fixed\";\n" - " \t\tregulator-name = \"P5.0V_USB3CON\";\n" - " \t\tregulator-min-microvolt = <5000000>;\n" - " \t\tregulator-max-microvolt = <5000000>;\n" - "-\t\tgpio = <&gpx2 7 GPIO_ACTIVE_HIGH>;\n" - "-\t\tpinctrl-names = \"default\";\n" - "-\t\tpinctrl-0 = <&usb3_vbus_en>;\n" - "+\t\tgpio = <&gpe1 0 GPIO_ACTIVE_LOW>;\n" - " \t\tenable-active-high;\n" - " \t};\n" - " \n" - "@@ -198,6 +61,11 @@\n" - " \t\tsamsung,vbus-gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;\n" - " \t};\n" - " \n" - "+\tusb-hub {\n" - "+\t\tcompatible = \"smsc,usb3503a\";\n" - "+\t\treset-gpios = <&hsic_reset>;\n" - "+\t};\n" - "+\n" - " \tfixed-rate-clocks {\n" - " \t\txxti {\n" - " \t\t\tcompatible = \"samsung,clock-xxti\";\n" - "@@ -211,19 +79,10 @@\n" - " \t\tpinctrl-0 = <&hdmi_hpd_irq>;\n" - " \t\tphy = <&hdmiphy>;\n" - " \t\tddc = <&i2c_2>;\n" - "-\t\thdmi-en-supply = <&tps65090_fet7>;\n" - "-\t\tvdd-supply = <&ldo8_reg>;\n" - "-\t\tvdd_osc-supply = <&ldo10_reg>;\n" - "-\t\tvdd_pll-supply = <&ldo8_reg>;\n" - "-\t};\n" - "-\n" - "-\tbacklight {\n" - "-\t\tcompatible = \"pwm-backlight\";\n" - "-\t\tpwms = <&pwm 0 1000000 0>;\n" - "-\t\tbrightness-levels = <0 100 500 1000 1500 2000 2500 2800>;\n" - "-\t\tdefault-brightness-level = <7>;\n" - "-\t\tpinctrl-0 = <&pwm0_out>;\n" - "-\t\tpinctrl-names = \"default\";\n" - "+\t\thdmi-en-supply = <&s5m_ldo8_reg>;\n" - "+\t\tvdd-supply = <&s5m_ldo8_reg>;\n" - "+\t\tvdd_osc-supply = <&s5m_ldo10_reg>;\n" - "+\t\tvdd_pll-supply = <&s5m_ldo8_reg>;\n" - " \t};\n" - " \n" - " \tfimd@14400000 {\n" - "@@ -240,172 +99,241 @@\n" - " \t\tsamsung,ycbcr-coeff = <0>;\n" - " \t\tsamsung,color-depth = <1>;\n" - " \t\tsamsung,link-rate = <0x0a>;\n" - "-\t\tsamsung,lane-count = <2>;\n" - "-\t\tsamsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;\n" - "-\n" - "-\t\tdisplay-timings {\n" - "-\t\t\tnative-mode = <&timing1>;\n" - "-\n" - "-\t\t\ttiming1: timing@1 {\n" - "-\t\t\t\tclock-frequency = <70589280>;\n" - "-\t\t\t\thactive = <1366>;\n" - "-\t\t\t\tvactive = <768>;\n" - "-\t\t\t\thfront-porch = <40>;\n" - "-\t\t\t\thback-porch = <40>;\n" - "-\t\t\t\thsync-len = <32>;\n" - "-\t\t\t\tvback-porch = <10>;\n" - "-\t\t\t\tvfront-porch = <12>;\n" - "-\t\t\t\tvsync-len = <6>;\n" - "-\t\t\t};\n" - "-\t\t};\n" - "+\t\tsamsung,lane-count = <1>;\n" - "+\t\tsamsung,hpd-gpio = <&gpc3 0 GPIO_ACTIVE_HIGH>;\n" - " \t};\n" - " };\n" - " \n" - "+&dp_hpd {\n" - "+\tsamsung,pins = \"gpc3-0\";\n" - "+\tsamsung,pin-function = <0>;\n" - "+\tsamsung,pin-pud = <3>;\n" - "+\tsamsung,pin-drv = <0>;\n" - "+};\n" - "+\n" - " &i2c_0 {\n" - " \tstatus = \"okay\";\n" - " \tsamsung,i2c-sda-delay = <100>;\n" - " \tsamsung,i2c-max-bus-freq = <378000>;\n" - " \n" - "-\tmax77686@09 {\n" - "-\t\tcompatible = \"maxim,max77686\";\n" - "+\ts5m8767-pmic@66 {\n" - "+\t\tcompatible = \"samsung,s5m8767-pmic\";\n" - "+\t\treg = <0x66>;\n" - " \t\tinterrupt-parent = <&gpx3>;\n" - " \t\tinterrupts = <2 0>;\n" - " \t\tpinctrl-names = \"default\";\n" - "-\t\tpinctrl-0 = <&max77686_irq>;\n" - "+\t\tpinctrl-0 = <&s5m8767_irq &s5m8767_dvs &s5m8767_ds>;\n" - " \t\twakeup-source;\n" - "-\t\treg = <0x09>;\n" - "-\t\t#clock-cells = <1>;\n" - " \n" - "-\t\tvoltage-regulators {\n" - "-\t\t\tldo1_reg: LDO1 {\n" - "-\t\t\t\tregulator-name = \"P1.0V_LDO_OUT1\";\n" - "+\t\ts5m8767,pmic-buck-dvs-gpios = <&gpd1 0 GPIO_ACTIVE_LOW>, /* DVS1 */\n" - "+\t\t <&gpd1 1 GPIO_ACTIVE_LOW>, /* DVS2 */\n" - "+\t\t <&gpd1 2 GPIO_ACTIVE_LOW>; /* DVS3 */\n" - "+\n" - "+\t\ts5m8767,pmic-buck-ds-gpios = <&gpx2 3 GPIO_ACTIVE_LOW>, /* SET1 */\n" - "+\t\t <&gpx2 4 GPIO_ACTIVE_LOW>, /* SET2 */\n" - "+\t\t <&gpx2 5 GPIO_ACTIVE_LOW>; /* SET3 */\n" - "+\n" - "+\t\t/*\n" - "+\t\t * The following arrays of DVS voltages are not used, since we are\n" - "+\t\t * not using GPIOs to control PMIC bucks, but they must be defined\n" - "+\t\t * to please the driver.\n" - "+\t\t */\n" - "+\t\ts5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>,\n" - "+\t\t <1250000>, <1200000>,\n" - "+\t\t <1150000>, <1100000>,\n" - "+\t\t <1000000>, <950000>;\n" - "+\n" - "+\t\ts5m8767,pmic-buck3-dvs-voltage = <1100000>, <1100000>,\n" - "+\t\t <1100000>, <1100000>,\n" - "+\t\t <1000000>, <1000000>,\n" - "+\t\t <1000000>, <1000000>;\n" - "+\n" - "+\t\ts5m8767,pmic-buck4-dvs-voltage = <1200000>, <1200000>,\n" - "+\t\t <1200000>, <1200000>,\n" - "+\t\t <1200000>, <1200000>,\n" - "+\t\t <1200000>, <1200000>;\n" - "+\n" - "+\t\tclocks {\n" - "+\t\t\tcompatible = \"samsung,s5m8767-clk\";\n" - "+\t\t\t#clock-cells = <1>;\n" - "+\t\t\tclock-output-names = \"en32khz_ap\",\n" - "+\t\t\t \"en32khz_cp\",\n" - "+\t\t\t \"en32khz_bt\";\n" - "+\t\t};\n" - "+\n" - "+\t\tregulators {\n" - "+\t\t\ts5m_ldo4_reg: LDO4 {\n" - "+\t\t\t\tregulator-name = \"P1.0V_LDO_OUT4\";\n" - " \t\t\t\tregulator-min-microvolt = <1000000>;\n" - " \t\t\t\tregulator-max-microvolt = <1000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <0>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo2_reg: LDO2 {\n" - "-\t\t\t\tregulator-name = \"P1.8V_LDO_OUT2\";\n" - "-\t\t\t\tregulator-min-microvolt = <1800000>;\n" - "-\t\t\t\tregulator-max-microvolt = <1800000>;\n" - "+\t\t\ts5m_ldo5_reg: LDO5 {\n" - "+\t\t\t\tregulator-name = \"P1.0V_LDO_OUT5\";\n" - "+\t\t\t\tregulator-min-microvolt = <1000000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <0>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo3_reg: LDO3 {\n" - "-\t\t\t\tregulator-name = \"P1.8V_LDO_OUT3\";\n" - "-\t\t\t\tregulator-min-microvolt = <1800000>;\n" - "-\t\t\t\tregulator-max-microvolt = <1800000>;\n" - "+\t\t\ts5m_ldo6_reg: LDO6 {\n" - "+\t\t\t\tregulator-name = \"vdd_mydp\";\n" - "+\t\t\t\tregulator-min-microvolt = <1000000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo7_reg: LDO7 {\n" - "+\t\t\ts5m_ldo7_reg: LDO7 {\n" - " \t\t\t\tregulator-name = \"P1.1V_LDO_OUT7\";\n" - " \t\t\t\tregulator-min-microvolt = <1100000>;\n" - " \t\t\t\tregulator-max-microvolt = <1100000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo8_reg: LDO8 {\n" - "+\t\t\ts5m_ldo8_reg: LDO8 {\n" - " \t\t\t\tregulator-name = \"P1.0V_LDO_OUT8\";\n" - " \t\t\t\tregulator-min-microvolt = <1000000>;\n" - " \t\t\t\tregulator-max-microvolt = <1000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo10_reg: LDO10 {\n" - "+\t\t\ts5m_ldo10_reg: LDO10 {\n" - " \t\t\t\tregulator-name = \"P1.8V_LDO_OUT10\";\n" - " \t\t\t\tregulator-min-microvolt = <1800000>;\n" - " \t\t\t\tregulator-max-microvolt = <1800000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo12_reg: LDO12 {\n" - "+\t\t\ts5m_ldo11_reg: LDO11 {\n" - "+\t\t\t\tregulator-name = \"P1.8V_LDO_OUT11\";\n" - "+\t\t\t\tregulator-min-microvolt = <1800000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1800000>;\n" - "+\t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <0>;\n" - "+\t\t\t};\n" - "+\n" - "+\t\t\ts5m_ldo12_reg: LDO12 {\n" - " \t\t\t\tregulator-name = \"P3.0V_LDO_OUT12\";\n" - " \t\t\t\tregulator-min-microvolt = <3000000>;\n" - " \t\t\t\tregulator-max-microvolt = <3000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - "+\t\t\t};\n" - "+\n" - "+\t\t\ts5m_ldo13_reg: LDO13 {\n" - "+\t\t\t\tregulator-name = \"P1.8V_LDO_OUT13\";\n" - "+\t\t\t\tregulator-min-microvolt = <1800000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1800000>;\n" - "+\t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <0>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo14_reg: LDO14 {\n" - "+\t\t\ts5m_ldo14_reg: LDO14 {\n" - " \t\t\t\tregulator-name = \"P1.8V_LDO_OUT14\";\n" - " \t\t\t\tregulator-min-microvolt = <1800000>;\n" - " \t\t\t\tregulator-max-microvolt = <1800000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo15_reg: LDO15 {\n" - "+\t\t\ts5m_ldo15_reg: LDO15 {\n" - " \t\t\t\tregulator-name = \"P1.0V_LDO_OUT15\";\n" - " \t\t\t\tregulator-min-microvolt = <1000000>;\n" - " \t\t\t\tregulator-max-microvolt = <1000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tldo16_reg: LDO16 {\n" - "+\t\t\ts5m_ldo16_reg: LDO16 {\n" - " \t\t\t\tregulator-name = \"P1.8V_LDO_OUT16\";\n" - " \t\t\t\tregulator-min-microvolt = <1800000>;\n" - " \t\t\t\tregulator-max-microvolt = <1800000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <3>;\n" - "+\t\t\t};\n" - "+\n" - "+\t\t\ts5m_ldo17_reg: LDO17 {\n" - "+\t\t\t\tregulator-name = \"P2.8V_LDO_OUT17\";\n" - "+\t\t\t\tregulator-min-microvolt = <2800000>;\n" - "+\t\t\t\tregulator-max-microvolt = <2800000>;\n" - "+\t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <0>;\n" - "+\t\t\t};\n" - "+\n" - "+\t\t\ts5m_ldo25_reg: LDO25 {\n" - "+\t\t\t\tregulator-name = \"vdd_bridge\";\n" - "+\t\t\t\tregulator-min-microvolt = <1200000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1200000>;\n" - "+\t\t\t\tregulator-always-on;\n" - "+\t\t\t\top_mode = <1>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck1_reg: BUCK1 {\n" - "+\t\t\tBUCK1 {\n" - " \t\t\t\tregulator-name = \"vdd_mif\";\n" - " \t\t\t\tregulator-min-microvolt = <950000>;\n" - " \t\t\t\tregulator-max-microvolt = <1300000>;\n" - " \t\t\t\tregulator-always-on;\n" - " \t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck2_reg: BUCK2 {\n" - "+\t\t\tBUCK2 {\n" - " \t\t\t\tregulator-name = \"vdd_arm\";\n" - " \t\t\t\tregulator-min-microvolt = <850000>;\n" - " \t\t\t\tregulator-max-microvolt = <1350000>;\n" - " \t\t\t\tregulator-always-on;\n" - " \t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck3_reg: BUCK3 {\n" - "+\t\t\tBUCK3 {\n" - " \t\t\t\tregulator-name = \"vdd_int\";\n" - " \t\t\t\tregulator-min-microvolt = <900000>;\n" - " \t\t\t\tregulator-max-microvolt = <1200000>;\n" - " \t\t\t\tregulator-always-on;\n" - " \t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck4_reg: BUCK4 {\n" - "+\t\t\tBUCK4 {\n" - " \t\t\t\tregulator-name = \"vdd_g3d\";\n" - " \t\t\t\tregulator-min-microvolt = <850000>;\n" - " \t\t\t\tregulator-max-microvolt = <1300000>;\n" - "-\t\t\t\tregulator-always-on;\n" - " \t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck5_reg: BUCK5 {\n" - "+\t\t\tBUCK5 {\n" - " \t\t\t\tregulator-name = \"P1.8V_BUCK_OUT5\";\n" - " \t\t\t\tregulator-min-microvolt = <1800000>;\n" - " \t\t\t\tregulator-max-microvolt = <1800000>;\n" - " \t\t\t\tregulator-always-on;\n" - " \t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <1>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck6_reg: BUCK6 {\n" - "-\t\t\t\tregulator-name = \"P1.35V_BUCK_OUT6\";\n" - "-\t\t\t\tregulator-min-microvolt = <1350000>;\n" - "-\t\t\t\tregulator-max-microvolt = <1350000>;\n" - "-\t\t\t\tregulator-always-on;\n" - "-\t\t\t};\n" - "-\n" - "-\t\t\tbuck7_reg: BUCK7 {\n" - "-\t\t\t\tregulator-name = \"P2.0V_BUCK_OUT7\";\n" - "-\t\t\t\tregulator-min-microvolt = <2000000>;\n" - "-\t\t\t\tregulator-max-microvolt = <2000000>;\n" - "+\t\t\tBUCK6 {\n" - "+\t\t\t\tregulator-name = \"P1.2V_BUCK_OUT6\";\n" - "+\t\t\t\tregulator-min-microvolt = <1200000>;\n" - "+\t\t\t\tregulator-max-microvolt = <1200000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <0>;\n" - " \t\t\t};\n" - " \n" - "-\t\t\tbuck8_reg: BUCK8 {\n" - "-\t\t\t\tregulator-name = \"P2.85V_BUCK_OUT8\";\n" - "-\t\t\t\tregulator-min-microvolt = <2850000>;\n" - "-\t\t\t\tregulator-max-microvolt = <2850000>;\n" - "+\t\t\tBUCK9 {\n" - "+\t\t\t\tregulator-name = \"vdd_ummc\";\n" - "+\t\t\t\tregulator-min-microvolt = <950000>;\n" - "+\t\t\t\tregulator-max-microvolt = <3000000>;\n" - " \t\t\t\tregulator-always-on;\n" - "+\t\t\t\tregulator-boot-on;\n" - "+\t\t\t\top_mode = <3>;\n" - " \t\t\t};\n" - " \t\t};\n" - " \t};\n" - "@@ -415,14 +343,6 @@\n" - " \tstatus = \"okay\";\n" - " \tsamsung,i2c-sda-delay = <100>;\n" - " \tsamsung,i2c-max-bus-freq = <378000>;\n" - "-\n" - "-\ttrackpad {\n" - "-\t\treg = <0x67>;\n" - "-\t\tcompatible = \"cypress,cyapa\";\n" - "-\t\tinterrupts = <2 0>;\n" - "-\t\tinterrupt-parent = <&gpx1>;\n" - "-\t\twakeup-source;\n" - "-\t};\n" - " };\n" - " \n" - " /*\n" - "@@ -454,6 +374,16 @@\n" - " \tstatus = \"okay\";\n" - " \tsamsung,i2c-sda-delay = <100>;\n" - " \tsamsung,i2c-max-bus-freq = <66000>;\n" - "+\n" - "+\tcros_ec: embedded-controller {\n" - "+\t\tcompatible = \"google,cros-ec-i2c\";\n" - "+\t\treg = <0x1e>;\n" - "+\t\tinterrupts = <6 0>;\n" - "+\t\tinterrupt-parent = <&gpx1>;\n" - "+\t\twakeup-source;\n" - "+\t\tpinctrl-names = \"default\";\n" - "+\t\tpinctrl-0 = <&ec_irq>;\n" - "+\t};\n" - " };\n" - " \n" - " &i2c_5 {\n" - "@@ -466,13 +396,6 @@\n" - " \tstatus = \"okay\";\n" - " \tsamsung,i2c-sda-delay = <100>;\n" - " \tsamsung,i2c-max-bus-freq = <66000>;\n" - "-\n" - "-\tmax98095: codec@11 {\n" - "-\t\tcompatible = \"maxim,max98095\";\n" - "-\t\treg = <0x11>;\n" - "-\t\tpinctrl-0 = <&max98095_en>;\n" - "-\t\tpinctrl-names = \"default\";\n" - "-\t};\n" - " };\n" - " \n" - " &i2c_8 {\n" - "@@ -508,29 +431,7 @@\n" - " \t};\n" - " };\n" - " \n" - "-&mmc_2 {\n" - "-\tstatus = \"okay\";\n" - "-\tnum-slots = <1>;\n" - "-\tsupports-highspeed;\n" - "-\tcard-detect-delay = <200>;\n" - "-\tsamsung,dw-mshc-ciu-div = <3>;\n" - "-\tsamsung,dw-mshc-sdr-timing = <2 3>;\n" - "-\tsamsung,dw-mshc-ddr-timing = <1 2>;\n" - "-\tpinctrl-names = \"default\";\n" - "-\tpinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;\n" - "-\n" - "-\tslot@0 {\n" - "-\t\treg = <0>;\n" - "-\t\tbus-width = <4>;\n" - "-\t\twp-gpios = <&gpc2 1 0>;\n" - "-\t};\n" - "-};\n" - "-\n" - "-/*\n" - "- * On Snow we've got SIP WiFi and so can keep drive strengths low to\n" - "- * reduce EMI.\n" - "- */\n" - "-&mmc_3 {\n" - "+&mmc_1 {\n" - " \tstatus = \"okay\";\n" - " \tnum-slots = <1>;\n" - " \tsupports-highspeed;\n" - "@@ -540,7 +441,7 @@\n" - " \tsamsung,dw-mshc-sdr-timing = <2 3>;\n" - " \tsamsung,dw-mshc-ddr-timing = <1 2>;\n" - " \tpinctrl-names = \"default\";\n" - "-\tpinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;\n" - "+\tpinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;\n" - " \n" - " \tslot@0 {\n" - " \t\treg = <0>;\n" - "@@ -549,8 +450,15 @@\n" - " };\n" - " \n" - " &pinctrl_0 {\n" - "-\tmax77686_irq: max77686-irq {\n" - "-\t\tsamsung,pins = \"gpx3-2\";\n" - "+\ts5m8767_dvs: s5m8767-dvs {\n" - "+\t\tsamsung,pins = \"gpd1-0\", \"gpd1-1\", \"gpd1-2\";\n" - "+\t\tsamsung,pin-function = <0>;\n" - "+\t\tsamsung,pin-pud = <1>;\n" - "+\t\tsamsung,pin-drv = <0>;\n" - "+\t};\n" - "+\n" - "+\tpower_key_irq: power-key-irq {\n" - "+\t\tsamsung,pins = \"gpx1-3\";\n" - " \t\tsamsung,pin-function = <0>;\n" - " \t\tsamsung,pin-pud = <0>;\n" - " \t\tsamsung,pin-drv = <0>;\n" - "@@ -563,23 +471,23 @@\n" - " \t\tsamsung,pin-drv = <0>;\n" - " \t};\n" - " \n" - "-\tmax98095_en: max98095-en {\n" - "-\t\tsamsung,pins = \"gpx1-7\";\n" - "+\ts5m8767_ds: s5m8767-ds {\n" - "+\t\tsamsung,pins = \"gpx2-3\", \"gpx2-4\", \"gpx2-5\";\n" - " \t\tsamsung,pin-function = <0>;\n" - "-\t\tsamsung,pin-pud = <3>;\n" - "+\t\tsamsung,pin-pud = <1>;\n" - " \t\tsamsung,pin-drv = <0>;\n" - " \t};\n" - " \n" - "-\ttps65090_irq: tps65090-irq {\n" - "-\t\tsamsung,pins = \"gpx2-6\";\n" - "+\ts5m8767_irq: s5m8767-irq {\n" - "+\t\tsamsung,pins = \"gpx3-2\";\n" - " \t\tsamsung,pin-function = <0>;\n" - " \t\tsamsung,pin-pud = <0>;\n" - " \t\tsamsung,pin-drv = <0>;\n" - " \t};\n" - " \n" - "-\tusb3_vbus_en: usb3-vbus-en {\n" - "-\t\tsamsung,pins = \"gpx2-7\";\n" - "-\t\tsamsung,pin-function = <1>;\n" - "+\tlid_irq: lid-irq {\n" - "+\t\tsamsung,pins = \"gpx3-5\";\n" - "+\t\tsamsung,pin-function = <0>;\n" - " \t\tsamsung,pin-pud = <0>;\n" - " \t\tsamsung,pin-drv = <0>;\n" - " \t};\n" - "@@ -593,31 +501,28 @@\n" - " };\n" - " \n" - " &pinctrl_1 {\n" - "-\tarb_their_claim: arb-their-claim {\n" - "-\t\tsamsung,pins = \"gpe0-4\";\n" - "-\t\tsamsung,pin-function = <0>;\n" - "-\t\tsamsung,pin-pud = <3>;\n" - "-\t\tsamsung,pin-drv = <0>;\n" - "-\t};\n" - "-\n" - "-\tarb_our_claim: arb-our-claim {\n" - "-\t\tsamsung,pins = \"gpf0-3\";\n" - "+\thsic_reset: hsic-reset {\n" - "+\t\tsamsung,pins = \"gpe1-0\";\n" - " \t\tsamsung,pin-function = <1>;\n" - " \t\tsamsung,pin-pud = <0>;\n" - " \t\tsamsung,pin-drv = <0>;\n" - " \t};\n" - " };\n" - " \n" - "-&sd3_clk {\n" - "+&sd1_clk {\n" - " \tsamsung,pin-drv = <0>;\n" - " };\n" - " \n" - "-&sd3_cmd {\n" - "+&sd1_cmd {\n" - " \tsamsung,pin-pud = <3>;\n" - " \tsamsung,pin-drv = <0>;\n" - " };\n" - " \n" - "-&sd3_bus4 {\n" - "+&sd1_cd {\n" - "+\tsamsung,pin-drv = <0>;\n" - "+};\n" - "+\n" - "+&sd1_bus4 {\n" - " \tsamsung,pin-drv = <0>;\n" - }; + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" + "GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: spring-snow.v4.diff\n" + "Type: text/x-patch\n" + "Size: 17117 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140731/5522a095/attachment.bin> -2d513720fe2104c81dbfd2ae342954c5492c01128c19df908083da329b62b3de +a8a0394cdbd21941ba9e2ebe7ae083269eb5c6f15752cbf98a0b671a8551c28d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.