Merge "ARM: dts: add smb1359 device for msmsamarium MTP and CDP" (a5befd3f) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/msmsamarium-cdp-interposer.dts

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,10 @@
		/dts-v1/;

		/include/ "msm8974pro-ac.dtsi"
		&soc {
		i2c_chg: i2c@f9967000 { /* BLSP#11 */
		};
		};
		/include/ "msmsamarium-cdp.dtsi"
		/include/ "dsi-panel-jdi-1080p-video.dtsi"
		/include/ "msmsamarium-camera-sensor-cdp-interposer.dtsi"

+18 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,11 @@

		gpio@cc00 { /* GPIO 13 */
		/* SMB349 STAT */
		qcom,mode = <0>; /* Digital input */
		qcom,pull = <1>; /* Pull up 1.5 uA */
		qcom,vin-sel = <2>; /* PMA8084 S4 = 1.8 V */
		qcom,src-sel = <0>; /* Constant */
		qcom,master-en = <1>;
		};

		gpio@cd00 { /* GPIO 14 */
		@@ -290,3 +295,16 @@
		qcom,mdss-dsi-bl-pmic-bank-select = <3>;
		qcom,mdss-dsi-pwm-gpio = <&pma8084_gpios 8 0>;
		};

		&i2c_chg {
		smb1359_otg_supply: smb1359-charger@1c {
		compatible = "qcom,smb1359-charger";
		reg = <0x1c>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xcc 0x0>; /* PMA8084 GPIO 13 */
		qcom,float-voltage-mv = <4200>;
		qcom,charging-timeout = <1536>;
		qcom,recharge-thresh-mV = <100>;
		regulator-name = "smb1359_otg_supply";
		};
		};

+13 −0

Original line number	Diff line number	Diff line
		@@ -212,3 +212,16 @@
		/* SPI ethernet INT_N */
		};
		};

		&i2c_chg {
		smb1359_otg_supply: smb1359-charger@1c {
		compatible = "qcom,smb1359-charger";
		reg = <0x1c>;
		interrupt-parent = <&spmi_bus>;
		interrupts = <0x0 0xcc 0x0>; /* PMA8084 GPIO 13 */
		qcom,float-voltage-mv = <4200>;
		qcom,charging-timeout = <1536>;
		qcom,recharge-thresh-mV = <100>;
		regulator-name = "smb1359_otg_supply";
		};
		};

+16 −0

Original line number	Diff line number	Diff line
		@@ -1082,6 +1082,22 @@
		< 1458000 1171200 4264 /* 533 MHz */ >;
		};

		i2c_chg: i2c@f9963000 { /* BLSP2 QUP1 */
		cell-index = <5>;
		compatible = "qcom,i2c-qup";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "qup_phys_addr";
		reg = <0xf9963000 0x1000>;
		interrupt-names = "qup_err_intr";
		interrupts = <0 101 0>;
		qcom,i2c-bus-freq = <100000>;
		qcom,i2c-src-freq = <19200000>;
		qcom,sda-gpio = <&msmgpio 55 0>;
		qcom,scl-gpio = <&msmgpio 56 0>;
		qcom,master-id = <84>;
		};

		qcom,wdt@f9017000 {
		compatible = "qcom,msm-watchdog";
		reg = <0xf9017000 0x1000>;

+12 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,18 @@ static struct msm_gpiomux_config msm_blsp_configs[] __initdata = {
		[GPIOMUX_SUSPENDED] = &gpio_uart_config,
		},
		},
		{
		.gpio = 55, /* BLSP2 QUP1 I2C_SDA */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		{
		.gpio = 56, /* BLSP2 QUP1 I2C_SCL */
		.settings = {
		[GPIOMUX_SUSPENDED] = &gpio_i2c_config,
		},
		},
		};

		static struct gpiomux_setting lcd_en_act_cfg = {