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

Commit 2b259300 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-4.11' of... 

Merge tag 'sunxi-fixes-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Allwinner fixes for 4.11

A bunch of device tree fixes for various boards / SoCs.

* tag 'sunxi-fixes-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: sun8i: a23/a33: drop bl_en_pin GPIO pinmux in reference design DTSI
  ARM: dts: sun7i: lamobo-r1: Fix CPU port RGMII settings
  ARM: sun8i: Fix the mali clock rate

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fe64ccb2 9693219a

arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
					reg = <8>;

					label = "cpu";

					ethernet = <&gmac>;

					phy-mode = "rgmii";

					phy-mode = "rgmii-txid";

					fixed-link {

						speed = <1000>;

						full-duplex;

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ 
			resets = <&ccu RST_BUS_GPU>;



			assigned-clocks = <&ccu CLK_GPU>;

			assigned-clock-rates = <408000000>;

			assigned-clock-rates = <384000000>;

		};



		gic: interrupt-controller@01c81000 {

arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 


	backlight: backlight {

		compatible = "pwm-backlight";

		pinctrl-names = "default";

		pinctrl-0 = <&bl_en_pin>;

		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;

		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;

		default-brightness-level = <8>;
@@ -93,11 +91,6 @@ 
};



&pio {

	bl_en_pin: bl_en_pin@0 {

		pins = "PH6";

		function = "gpio_in";

	};



	mmc0_cd_pin: mmc0_cd_pin@0 {

		pins = "PB4";

		function = "gpio_in";