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

Commit 920c74f0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-ab-dt2' of... 

Merge tag 'at91-ab-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Merge "Second batch of DT changes for 4.4" from Alexandre Belloni:

- some DT fixes: pullups, disabled property
- the PMC is now a syscon
- great improvement of sama5d2 support

* tag 'at91-ab-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91/dt: sama5d2: add missing devices
  ARM: at91/dt: sama5d4: add the macb1 node
  ARM: at91/dt: add pullup on mmc2 data signals
  ARM: at91/dt: sama5d2_xplained: add regulator nodes
  ARM: at91/dt: fix "disabled" property on at91rm9200
  ARM: at91/dt: use syscon for PMC
parents 8d1a327c 512fc048

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+57 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,63 @@ 
				pinctrl-names = "default";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2c0_default>;

				pinctrl-0 = <&pinctrl_i2c0_default>;

				status = "okay";

				status = "okay";



				pmic: act8865@5b {

					compatible = "active-semi,act8865";

					reg = <0x5b>;

					active-semi,vsel-high;

					status = "okay";



					regulators {

						vdd_1v35_reg: DCDC_REG1 {

							regulator-name = "VDD_1V35";

							regulator-min-microvolt = <1350000>;

							regulator-max-microvolt = <1350000>;

							regulator-always-on;

						};



						vdd_1v2_reg: DCDC_REG2 {

							regulator-name = "VDD_1V2";

							regulator-min-microvolt = <1100000>;

							regulator-max-microvolt = <1300000>;

							regulator-always-on;

						};



						vdd_3v3_reg: DCDC_REG3 {

							regulator-name = "VDD_3V3";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						vdd_fuse_reg: LDO_REG1 {

							regulator-name = "VDD_FUSE";

							regulator-min-microvolt = <2500000>;

							regulator-max-microvolt = <2500000>;

							regulator-always-on;

						};



						vdd_3v3_lp_reg: LDO_REG2 {

							regulator-name = "VDD_3V3_LP";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						vdd_led_reg: LDO_REG3 {

							regulator-name = "VDD_LED";

							regulator-min-microvolt = <3300000>;

							regulator-max-microvolt = <3300000>;

							regulator-always-on;

						};



						vdd_sdhc_1v8_reg: LDO_REG4 {

							regulator-name = "VDD_SDHC_1V8";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <1800000>;

						};

					};

				};

			};

			};





			uart3: serial@fc008000 {

			uart3: serial@fc008000 {

arch/arm/boot/dts/at91rm9200.dtsi

+4 −4
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ 
			};

			};





			pmc: pmc@fffffc00 {

			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				compatible = "atmel,at91rm9200-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				interrupt-controller;
@@ -426,7 +426,7 @@ 
				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;

				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;

				clocks = <&ssc0_clk>;

				clocks = <&ssc0_clk>;

				clock-names = "pclk";

				clock-names = "pclk";

				status = "disable";

				status = "disabled";

			};

			};





			ssc1: ssc@fffd4000 {

			ssc1: ssc@fffd4000 {
@@ -437,7 +437,7 @@ 
				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;

				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;

				clocks = <&ssc1_clk>;

				clocks = <&ssc1_clk>;

				clock-names = "pclk";

				clock-names = "pclk";

				status = "disable";

				status = "disabled";

			};

			};





			ssc2: ssc@fffd8000 {

			ssc2: ssc@fffd8000 {
@@ -448,7 +448,7 @@ 
				pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;

				pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;

				clocks = <&ssc2_clk>;

				clocks = <&ssc2_clk>;

				clock-names = "pclk";

				clock-names = "pclk";

				status = "disable";

				status = "disabled";

			};

			};





			macb0: ethernet@fffbc000 {

			macb0: ethernet@fffbc000 {

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,7 @@ 
			};

			};





			pmc: pmc@fffffc00 {

			pmc: pmc@fffffc00 {

				compatible = "atmel,at91sam9260-pmc";

				compatible = "atmel,at91sam9260-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				interrupt-controller;

arch/arm/boot/dts/at91sam9261.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -568,7 +568,7 @@ 
			};

			};





			pmc: pmc@fffffc00 {

			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				compatible = "atmel,at91rm9200-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				interrupt-controller;

arch/arm/boot/dts/at91sam9263.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ 
			};

			};





			pmc: pmc@fffffc00 {

			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				compatible = "atmel,at91rm9200-pmc", "syscon";

				reg = <0xfffffc00 0x100>;

				reg = <0xfffffc00 0x100>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				interrupt-controller;

				interrupt-controller;