Commit 1d04ca21 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'berlin-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt 

Merge "Marvell Berlin DT changes (round 1)" from Sebastian Hesselbarth:

- BG2Q cleanups (DMP eMMC, duplicated interrupt-parents)
- add BG2, BG2CD, BG2Q watchdog nodes
- add BG2Q DMP SDHCI1 nodes

* tag 'berlin-dt-for-4.5-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  arm: dts: berlin2q-marvell-dmp: add sdhci1 fully functionality
  arm: dts: berlin2: add watchdog nodes
  arm: dts: berlin2cd: add watchdog nodes
  arm: dts: berlin2q: add watchdog nodes
  arm: dts: berlin2q: remove duplicated interrupt-parent
  arm: dts: berlin2q-marvell-dmp: remove broken-cd from eMMC node
parents e9093d04 ac4111ab

arch/arm/boot/dts/berlin2.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -435,6 +435,29 @@ 
			ranges = <0 0xfc0000 0x10000>;

			interrupt-parent = <&sic>;



			wdt0: watchdog@1000 {

				compatible = "snps,dw-wdt";

				reg = <0x1000 0x100>;

				clocks = <&refclk>;

				interrupts = <0>;

			};



			wdt1: watchdog@2000 {

				compatible = "snps,dw-wdt";

				reg = <0x2000 0x100>;

				clocks = <&refclk>;

				interrupts = <1>;

				status = "disabled";

			};



			wdt2: watchdog@3000 {

				compatible = "snps,dw-wdt";

				reg = <0x3000 0x100>;

				clocks = <&refclk>;

				interrupts = <2>;

				status = "disabled";

			};



			sm_gpio1: gpio@5000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x5000 0x400>;

arch/arm/boot/dts/berlin2cd.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -396,6 +396,29 @@ 
			ranges = <0 0xfc0000 0x10000>;

			interrupt-parent = <&sic>;



			wdt0: watchdog@1000 {

				compatible = "snps,dw-wdt";

				reg = <0x1000 0x100>;

				clocks = <&refclk>;

				interrupts = <0>;

			};



			wdt1: watchdog@2000 {

				compatible = "snps,dw-wdt";

				reg = <0x2000 0x100>;

				clocks = <&refclk>;

				interrupts = <1>;

				status = "disabled";

			};



			wdt2: watchdog@3000 {

				compatible = "snps,dw-wdt";

				reg = <0x3000 0x100>;

				clocks = <&refclk>;

				interrupts = <2>;

				status = "disabled";

			};



			sm_gpio1: gpio@5000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x5000 0x400>;

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+35 −3
Original line number Diff line number Diff line
@@ -84,17 +84,49 @@ 
			gpio = <&portb 12 GPIO_ACTIVE_HIGH>;

			enable-active-high;

		};



		reg_sdio1_vmmc: regulator@3 {

			compatible = "regulator-fixed";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-name = "sdio1_vmmc";

			enable-active-high;

			regulator-boot-on;

			gpio = <&portb 21 GPIO_ACTIVE_HIGH>;

		};



		reg_sdio1_vqmmc: regulator@4 {

			compatible = "regulator-gpio";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3300000>;

			regulator-name = "sdio1_vqmmc";

			regulator-type = "voltage";

			enable-active-high;

			gpios = <&portb 16 GPIO_ACTIVE_HIGH>;

			states = <3300000 0x1

				  1800000 0x0>;

		};

	};

};



&soc_pinctrl {

	sd1gpio_pmux: sd1pwr-pmux {

		groups = "G23", "G32";

		function = "gpio";

	};

};



&sdhci1 {

	broken-cd;

	sdhci,wp-inverted;

	vmmc-supply = <&reg_sdio1_vmmc>;

	vqmmc-supply = <&reg_sdio1_vqmmc>;

	cd-gpios = <&portc 30 GPIO_ACTIVE_LOW>;

	wp-gpios = <&portd 0 GPIO_ACTIVE_HIGH>;

	pinctrl-0 = <&sd1gpio_pmux>, <&sd1_pmux>;

	pinctrl-names = "default";

	status = "okay";

};



&sdhci2 {

	broken-cd;

	bus-width = <8>;

	non-removable;

	status = "okay";

arch/arm/boot/dts/berlin2q.dtsi

+28 −6
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x1400 0x100>;

				interrupt-parent = <&aic>;

				interrupts = <4>;

				clocks = <&chip_clk CLKID_CFG>;

				pinctrl-0 = <&twsi0_pmux>;
@@ -322,7 +321,6 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x1800 0x100>;

				interrupt-parent = <&aic>;

				interrupts = <5>;

				clocks = <&chip_clk CLKID_CFG>;

				pinctrl-0 = <&twsi1_pmux>;
@@ -417,6 +415,11 @@ 
			soc_pinctrl: pin-controller {

				compatible = "marvell,berlin2q-soc-pinctrl";



				sd1_pmux: sd1-pmux {

					groups = "G31";

					function = "sd1";

				};



				twsi0_pmux: twsi0-pmux {

					groups = "G6";

					function = "twsi0";
@@ -508,6 +511,29 @@ 
			ranges = <0 0xfc0000 0x10000>;

			interrupt-parent = <&sic>;



			wdt0: watchdog@1000 {

				compatible = "snps,dw-wdt";

				reg = <0x1000 0x100>;

				clocks = <&refclk>;

				interrupts = <0>;

			};



			wdt1: watchdog@2000 {

				compatible = "snps,dw-wdt";

				reg = <0x2000 0x100>;

				clocks = <&refclk>;

				interrupts = <1>;

				status = "disabled";

			};



			wdt2: watchdog@3000 {

				compatible = "snps,dw-wdt";

				reg = <0x3000 0x100>;

				clocks = <&refclk>;

				interrupts = <2>;

				status = "disabled";

			};



			sm_gpio1: gpio@5000 {

				compatible = "snps,dw-apb-gpio";

				reg = <0x5000 0x400>;
@@ -528,7 +554,6 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x7000 0x100>;

				interrupt-parent = <&sic>;

				interrupts = <6>;

				clocks = <&refclk>;

				pinctrl-0 = <&twsi2_pmux>;
@@ -541,7 +566,6 @@ 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x8000 0x100>;

				interrupt-parent = <&sic>;

				interrupts = <7>;

				clocks = <&refclk>;

				pinctrl-0 = <&twsi3_pmux>;
@@ -552,7 +576,6 @@ 
			uart0: uart@9000 {

				compatible = "snps,dw-apb-uart";

				reg = <0x9000 0x100>;

				interrupt-parent = <&sic>;

				interrupts = <8>;

				clocks = <&refclk>;

				reg-shift = <2>;
@@ -564,7 +587,6 @@ 
			uart1: uart@a000 {

				compatible = "snps,dw-apb-uart";

				reg = <0xa000 0x100>;

				interrupt-parent = <&sic>;

				interrupts = <9>;

				clocks = <&refclk>;

				reg-shift = <2>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE