Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 04aa1110 authored by derfelot's avatar derfelot
Browse files

yoshino: Integrate kddi/sov36 support and update defconfigs 

* Introduce CONFIG_MACH_SONY_POPLAR_KDDI
* Add kddi dt's
* Add kddi defconfig
* Update remaining defconfigs
* Add Sony's carillon NFC driver
parent 8d3ebe52

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ dtb-$(CONFIG_MACH_SONY_POPLAR) += msm8998-yoshino-poplar_generic.dtb \ 
dtb-$(CONFIG_MACH_SONY_POPLAR_DSDS) += msm8998-yoshino-poplar_dsds.dtb \

	msm8998-v2-yoshino-poplar_dsds.dtb \

	msm8998-v2.1-yoshino-poplar_dsds.dtb

dtb-$(CONFIG_MACH_SONY_POPLAR_KDDI) += msm8998-v2.1-yoshino-poplar_kddi.dtb

dtb-$(CONFIG_MACH_SONY_LILAC) += msm8998-yoshino-lilac_generic.dtb \

	msm8998-v2-yoshino-lilac_generic.dtb \

	msm8998-v2.1-yoshino-lilac_generic.dtb

arch/arm/boot/dts/qcom/msm8998-v2.1-yoshino-poplar_kddi.dts

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

/*

 * Copyright (C) 2017 Sony Mobile Communications Inc.

 *

 * 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 "msm8998-v2.1.dtsi"

#include "msm8998-mdss-panels.dtsi"

#include "msm8998-mtp.dtsi"

#include "msm8998-yoshino-poplar_kddi.dtsi"



/ {

	model = "SoMC Poplar-KDDI(MSM8998 v2.1)";

	compatible = "somc,poplar-kddi", "qcom,msm8998";

	qcom,board-id = <8 0>;

};

arch/arm/boot/dts/qcom/msm8998-yoshino-poplar_jp-common.dtsi

0 → 100644
+251 −0
Original line number Diff line number Diff line 
/* arch/arm64/boot/dts/qcom/msm8998-yoshino-poplar_jp-common.dtsi

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

/*

 * Copyright (C) 2017 Sony Mobile Communications Inc.

 *

 * 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.

 */



#include "msm8998-yoshino-poplar_common.dtsi"



&soc {

	somc_pinctrl: somc_pinctrl {

		pinctrl-2 = <&msm_gpio_37 &msm_gpio_49 &msm_gpio_50 &msm_gpio_51 &msm_gpio_52

			     &msm_gpio_90 &msm_gpio_91 &msm_gpio_92 &msm_gpio_105 &msm_gpio_106

			     &msm_gpio_107 &msm_gpio_127 &msm_gpio_136 >;

	};



	/* SPI: BLSP9 */

	spi@c1b7000 { /* BLSP2 QUP3 */

		pinctrl-0 = <&msm_gpio_49 &msm_gpio_50 &msm_gpio_51 &msm_gpio_52>;

		pinctrl-1 = <&msm_gpio_49 &msm_gpio_50 &msm_gpio_51 &msm_gpio_52>;

		qcom,clk-freq-out = <30000000>;

		status = "okay";

	};



	felica,pm-ops {

		compatible = "sony,cxd224x-pm-ops";

	};

};



&pm8998_gpios {

	/* GPIO_14: DIV_CLK2 */

	gpio@cd00 {

		qcom,master-en = <1>;           /* Enable */

		status = "okay";

	};

};



&tlmm{

/* GPIO_37 : NC */

	msm_gpio_37: msm_gpio_37 {

		mux {

			pins = "gpio37";

			function = "gpio";

		};



		config {

			pins = "gpio37";

			drive-strength = <2>;

			/delete-property/ bias-disable;

			bias-pull-up;

			/delete-property/ output-low;

			input-enable;

		};

	};



/* GPIO_49 : DTV_SPI_MOSI */

	msm_gpio_49: msm_gpio_49 {

		mux {

			pins = "gpio49";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio49";

			drive-strength = <2>;

			/delete-property/ output-low;

			bias-disable;

		};

	};



/* GPIO_50 : DTV_SPI_MISO */

	msm_gpio_50: msm_gpio_50 {

		mux {

			pins = "gpio50";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio50";

			drive-strength = <2>;

			/delete-property/ bias-disable;

			bias-pull-down;

			/delete-property/ output-low;

		};

	};



/* GPIO_51 : DTV_SPI_CS_N */

	msm_gpio_51: msm_gpio_51 {

		mux {

			pins = "gpio51";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio51";

			drive-strength = <2>;

			bias-disable;

			/delete-property/ output-low;

		};

	};



/* GPIO_52 : DTV_SPI_CLK */

	msm_gpio_52: msm_gpio_52 {

		mux {

			pins = "gpio52";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio52";

			drive-strength = <2>;

			bias-disable;

			/delete-property/ output-low;

		};

	};



/* GPIO_90 : DTV_RST_N */

	msm_gpio_90: msm_gpio_90 {

		mux {

			pins = "gpio90";

			function = "gpio";

		};



		config {

			pins = "gpio90";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



/* GPIO_91 : DTV_INT */

	msm_gpio_91: msm_gpio_91 {

		mux {

			pins = "gpio91";

			function = "gpio";

		};



		config {

			pins = "gpio91";

			drive-strength = <2>;

			/delete-property/ bias-disable;

			bias-pull-down;

			/delete-property/ output-low;

			input-enable;

		};

	};



/* GPIO_92 : NFC_IRQ_FELICA_INT_N */

	msm_gpio_92: msm_gpio_92 {

		mux {

			pins = "gpio92";

			function = "gpio";

		};



		config {

			pins = "gpio92";

			drive-strength = <2>;

			/delete-property/ bias-pull-down;

			bias-disable;

			input-enable;

		};

	};



/* GPIO_105 : NC */

	msm_gpio_105: msm_gpio_105 {

		mux {

			pins = "gpio105";

			function = "gpio";

		};



		config {

			pins = "gpio105";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



/* GPIO_106 : NC */

	msm_gpio_106: msm_gpio_106 {

		mux {

			pins = "gpio106";

			function = "gpio";

		};



		config {

			pins = "gpio106";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



/* GPIO_107 : NC */

	msm_gpio_107: msm_gpio_107 {

		mux {

			pins = "gpio107";

			function = "gpio";

		};



		config {

			pins = "gpio107";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



/* GPIO_127 : NC */

	msm_gpio_127: msm_gpio_127 {

		mux {

			pins = "gpio127";

			function = "gpio";

	};



		config {

			pins = "gpio127";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



/* GPIO_136 : NC */

	msm_gpio_136: msm_gpio_136 {

		mux {

			pins = "gpio136";

			function = "gpio";

		};



		config {

			pins = "gpio136";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};

};

arch/arm/boot/dts/qcom/msm8998-yoshino-poplar_kddi.dtsi

0 → 100644
+233 −0
Original line number Diff line number Diff line 
/* arch/arm64/boot/dts/qcom/msm8998-yoshino-poplar_kddi.dtsi

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

/*

 * Copyright (C) 2017 Sony Mobile Communications Inc.

 *

 * 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.

 */



#include "msm8998-yoshino-poplar_jp-common.dtsi"



&soc {

	/* I2C: BLSP7 */

	i2c@c1b5000 { /* BLSP2 QUP1 */

		felica_ldo@1e {

			compatible = "rohm,bd7602";

			reg = <0x1e>;

		};

		felica@29 {

			compatible = "sony,cxd224x-i2c";

			reg = <0x29>;

			interrupt-parent = <&tlmm>;

			interrupts = <92 0x2002>;

			sony,nfc_int = <&tlmm 92 0>;

			sony,nfc_wake = <&tlmm 93 0>;



			pinctrl-names = "felica_active","felica_suspend";

			pinctrl-0 = <&msm_gpio_92>;

			pinctrl-1 = <&msm_gpio_92>;



			/* Defined in Clock Distribution */

			clocks = <&clock_gcc clk_ln_bb_clk3_pin>;

			clock-names = "felica_clk";

		};

	};



	/* SPI: BLSP9 */

	spi@c1b7000 { /* BLSP2 QUP3 */

		pinctrl-0 = <&spi_9_active &spi_9_miso_active>;

		pinctrl-1 = <&spi_9_sleep &spi_9_miso_sleep>;

		qcom,clk-freq-out = <30000000>;

		qcom,infinite-mode = <0>;

		qcom,gpio-clk  = <&tlmm 52 0>;

		qcom,gpio-cs0  = <&tlmm 51 0>;

		qcom,gpio-mosi = <&tlmm 49 0>;

		qcom,gpio-miso = <&tlmm 50 0>;

		qcom,rt-priority;

		status = "okay";



		tmm3spi@0 {

			compatible = "socionext,mn553-spi";

			reg = <0>;

			spi-max-frequency = <30000000>;

			spi-mode = <0>;

		};

	};



	dtv_tuner: mn88553 {

		compatible = "socionext,mn88553";

		interrupt-parent = <&tlmm>;

		interrupts = <91 0>;

		gpios = <&pm8998_gpios 20 0>,  /* DTV_ACTIVE  */

			<&tlmm 90 0>,  /* DTV_RESET_N */

			<&tlmm 91 0>;  /* DTV_INT     */

	};



	tlmm: pinctrl@03400000 {

		spi_9 {

			spi_9_active: spi_9_active {

				qcom,pin-func = <1>;

				mux {

					pins = "gpio49", "gpio51", "gpio52";

					function = "blsp_spi9";

				};



				config {

					pins = "gpio49", "gpio51", "gpio52";

					drive-strength = <2>;

					bias-disable;

				};

			};



			spi_9_sleep: spi_9_sleep {

				qcom,pin-func = <1>;

				mux {

					pins = "gpio49", "gpio51", "gpio52";

					function = "blsp_spi9";

				};



				config {

					pins = "gpio49", "gpio51", "gpio52";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		spi_9_miso {

			spi_9_miso_active: spi_9_miso_active {

				qcom,pin-func = <1>;

				mux {

					pins = "gpio50";

					function = "blsp_spi9";

				};



				config {

					pins = "gpio50";

					drive-strength = <2>;

					bias-pull-down;

				};

			};



			spi_9_miso_sleep: spi_9_miso_sleep {

				qcom,pin-func = <1>;

				mux {

					pins = "gpio50";

					function = "blsp_spi9";

				};



				config {

					pins = "gpio50";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};

	};

};



&tlmm {

	/* GPIO_49 : DTV_SPI_MOSI */

	msm_gpio_49: msm_gpio_49 {

		mux {

			pins = "gpio49";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio49";

			drive-strength = <2>;

			bias-disable;

			/delete-property/ output-low;

		};

	};



	/* GPIO_50 : DTV_SPI_MISO */

	msm_gpio_50: msm_gpio_50{

		mux {

			pins = "gpio50";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio50";

			drive-strength = <2>;

			/delete-property/ bias-disable;

			bias-pull-down;

			/delete-property/ output-low;

		};

	};



	/* GPIO_51 : DTV_SPI_CS_N */

	msm_gpio_51: msm_gpio_51{

		mux {

			pins = "gpio51";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio51";

			drive-strength = <2>;

			bias-disable;

			/delete-property/ output-low;

		};

	};



	/* GPIO_52 : DTV_SPI_CLK */

	msm_gpio_52: msm_gpio_52{

		mux {

			pins = "gpio52";

			function = "blsp_spi9";

		};



		config {

			pins = "gpio52";

			drive-strength = <2>;

			bias-disable;

			/delete-property/ output-low;

		};

	};



	/* GPIO_90 : DTV_RST_N */

	msm_gpio_90: msm_gpio_90 {

		mux {

			pins="gpio90";

			function = "gpio";

		};



		config {

			pins = "gpio90";

			drive-strength = <2>;

			bias-disable;

			output-low;

		};

	};



	/* GPIO_91 : DTV_INT */

	msm_gpio_91: msm_gpio_91 {

		mux {

			pins = "gpio91";

			function = "gpio";

		};



		config {

			pins = "gpio91";

			drive-strength = <2>;

			/delete-property/ bias-disable;

			bias-pull-down;

			/delete-property/ output-low;

			input-enable;

		};

	};

};

arch/arm64/Kconfig.platforms

+9 −0
Original line number Diff line number Diff line
@@ -123,6 +123,15 @@ config MACH_SONY_POPLAR_DSDS 
	If you enable this config,

	please use SONY Mobile device tree.



config MACH_SONY_POPLAR_KDDI

	bool "Sony Mobile Poplar Kddi"

	depends on ARCH_SONY_YOSHINO

	help

	Support for the SONY Mobile Poplar Kddi device

	which is based on SONY Yoshino platform.

	If you enable this config,

	please use SONY Mobile device tree.



config MACH_SONY_LILAC

	bool "Sony Mobile Lilac"

	depends on ARCH_SONY_YOSHINO