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

Commit e2e927c8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.2/fixes-rc5' of... 

Merge tag 'omap-for-v4.2/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few trivial omap MMC regression fixes for card voltages where
the syscon areas for PBIAS regulator were missing "simple-bus"
that prevents probing of the children in the mapped region.

This probably was not noticed earlier as the bootloader has
already configured the regulator for the card in the slot.

* tag 'omap-for-v4.2/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: dra7: Fix broken pbias device creation
  ARM: dts: OMAP5: Fix broken pbias device creation
  ARM: dts: OMAP4: Fix broken pbias device creation
  ARM: dts: omap243x: Fix broken pbias device creation

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bf64dd26 cd455673

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
				ranges = <0 0x2000 0x2000>;



				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x1400>;

					#address-cells = <1>;

					#size-cells = <1>;

arch/arm/boot/dts/omap2430.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ 
				};



				scm_conf: scm_conf@270 {

					compatible = "syscon";

					compatible = "syscon",

						     "simple-bus";

					reg = <0x270 0x240>;

					#address-cells = <1>;

					#size-cells = <1>;

arch/arm/boot/dts/omap4.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ 
				};



				omap4_padconf_global: omap4_padconf_global@5a0 {

					compatible = "syscon";

					compatible = "syscon",

						     "simple-bus";

					reg = <0x5a0 0x170>;

					#address-cells = <1>;

					#size-cells = <1>;

arch/arm/boot/dts/omap5.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ 
				};



				omap5_padconf_global: omap5_padconf_global@5a0 {

					compatible = "syscon";

					compatible = "syscon",

						     "simple-bus";

					reg = <0x5a0 0xec>;

					#address-cells = <1>;

					#size-cells = <1>;