v20190513

Documentation/devicetree/bindings/arm/amlogic.txt

@@ -96,6 +96,7 @@ Board compatible values (alphabetically, grouped by SoC):
   - "amlogic,p230" (Meson gxl s905d)
   - "amlogic,p231" (Meson gxl s905d)
   - "phicomm,n1" (Meson gxl s905d)
+  - "smartlabs,sml5442tw" (Meson gxl s905d)
 
   - "amlogic,p241" (Meson gxl s805x)
   - "libretech,aml-s805x-ac" (Meson gxl s805x)
@@ -113,7 +114,8 @@ Board compatible values (alphabetically, grouped by SoC):
   - "amlogic,s400" (Meson axg a113d)
 
   - "amlogic,u200" (Meson g12a s905d2)
-  - "amediatech,x96-max" (Meson g12a s905x2)
+  - "amediatech,x96-max" (Meson g12a s905x2 using external PHY)
+  - "amediatech,x96-max-rmii" (Meson g12a s905x2 using internal PHY)
   - "seirobotics,sei510" (Meson g12a s905x2)
 
   - "hardkernel,odroid-n2" (Meson g12b s922x)

Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt

@@ -6,7 +6,8 @@ devices.
 
 Required Properties:
 
-- compatible	: should be "amlogic,axg-audio-clkc" for the A113X and A113D
+- compatible	: should be "amlogic,axg-audio-clkc" for the A113X and A113D,
+		  "amlogic,g12a-audio-clkc" for G12A.
 - reg		: physical base address of the clock controller and length of
 		  memory mapped region.
 - clocks	: a list of phandle + clock-specifier pairs for the clocks listed

Documentation/devicetree/bindings/gpu/arm,mali-bifrost.txt

@@ -4,23 +4,19 @@ ARM Mali Bifrost GPU
 Required properties:
 
 - compatible :
-  * Must contain one of the following:
-    + "arm,mali-g31"
-    + "arm,mali-g51"
-    + "arm,mali-g52"
-    + "arm,mali-g71"
-    + "arm,mali-g72"
-    + "arm,mali-g76"
+  * Since Mali Bifrost GPU model/revision is fully discoverable by reading
+    some determined registers, must contain the following:
+    + "arm,mali-bifrost"
   * which must be preceded by one of the following vendor specifics:
     + "amlogic,meson-g12a-mali"
 
 - reg : Physical base address of the device and length of the register area.
 
-- interrupts : Contains the three IRQ lines required by Mali Bifrost devices.
-
-- interrupt-names : Contains the names of IRQ resources in the order they were
-  provided in the interrupts property. Must contain: "job", "mmu", "gpu".
+- interrupts : Contains the three IRQ lines required by Mali Bifrost devices,
+  in the following defined order.
 
+- interrupt-names : Contains the names of IRQ resources in this exact defined
+  order: "job", "mmu", "gpu".
 
 Optional properties:
 
@@ -38,7 +34,7 @@ Vendor-specific bindings
 ------------------------
 
 The Mali GPU is integrated very differently from one SoC to
-another. In order to accomodate those differences, you have the option
+another. In order to accommodate those differences, you have the option
 to specify one more vendor-specific compatible, among:
 
 - "amlogic,meson-g12a-mali"
@@ -50,7 +46,7 @@ to specify one more vendor-specific compatible, among:
 Example for a Mali-G31:
 
 gpu@ffa30000 {
-	compatible = "amlogic,meson-g12a-mali", "arm,mali-g31";
+	compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost";
 	reg = <0xffe40000 0x10000>;
 	interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
 		     <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/media/meson-ao-cec.txt

@@ -5,8 +5,8 @@ to handle communication between HDMI connected devices over the CEC bus.
 
 Required properties:
   - compatible : value should be following depending on the SoC :
-  	For GXBB, GXL, GXM and G12A (AO_CEC_A module) :
-  	"amlogic,meson-gx-ao-cec"
+	For GXBB, GXL, GXM and G12A (AO_CEC_A module) :
+	"amlogic,meson-gx-ao-cec"
 	For G12A (AO_CEC_B module) :
 	"amlogic,meson-g12a-ao-cec"
 

Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt

@@ -15,7 +15,7 @@ Required properties in addition to the generic multiplexer properties:
 
 Example :
 
-mdio-mux: mdio-multiplexer@4c000 {
+mdio_mux: mdio-multiplexer@4c000 {
 	compatible = "amlogic,g12a-mdio-mux";
 	reg = <0x0 0x4c000 0x0 0xa4>;
 	clocks = <&clkc CLKID_ETH_PHY>,
@@ -37,7 +37,7 @@ mdio-mux: mdio-multiplexer@4c000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		internal_ephy: ethernet_phy@8 {
+		internal_ephy: ethernet-phy@8 {
 			compatible = "ethernet-phy-id0180.3301",
 				     "ethernet-phy-ieee802.3-c22";
 			interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/pwm/pwm-meson.txt

@@ -7,6 +7,9 @@ Required properties:
                          or "amlogic,meson-gxbb-ao-pwm"
                          or "amlogic,meson-axg-ee-pwm"
                          or "amlogic,meson-axg-ao-pwm"
+                         or "amlogic,meson-g12a-ee-pwm"
+                         or "amlogic,meson-g12a-ao-pwm-ab"
+                         or "amlogic,meson-g12a-ao-pwm-cd"
 - #pwm-cells: Should be 3. See pwm.txt in this directory for a description of
   the cells format.
 

Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

@@ -2,7 +2,9 @@
 
 Required properties:
 - compatible: 'amlogic,axg-toddr' or
-	      'amlogic,axg-frddr'
+	      'amlogic,axg-toddr' or
+	      'amlogic,g12a-frddr' or
+	      'amlogic,g12a-toddr'
 - reg: physical base address of the controller and length of memory
        mapped region.
 - interrupts: interrupt specifier for the fifo.

Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt

@@ -1,7 +1,8 @@
 * Amlogic Audio PDM input
 
 Required properties:
-- compatible: 'amlogic,axg-pdm'
+- compatible: 'amlogic,axg-pdm' or
+	      'amlogic,g12a-pdm'
 - reg: physical base address of the controller and length of memory
        mapped region.
 - clocks: list of clock phandle, one for each entry clock-names.

Documentation/devicetree/bindings/sound/amlogic,axg-spdifin.txt

@@ -1,7 +1,8 @@
 * Amlogic Audio SPDIF Input
 
 Required properties:
-- compatible: 'amlogic,axg-spdifin'
+- compatible: 'amlogic,axg-spdifin' or
+	      'amlogic,g12a-spdifin'
 - interrupts: interrupt specifier for the spdif input.
 - clocks: list of clock phandle, one for each entry clock-names.
 - clock-names: should contain the following:

Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.txt

@@ -1,7 +1,8 @@
 * Amlogic Audio SPDIF Output
 
 Required properties:
-- compatible: 'amlogic,axg-spdifout'
+- compatible: 'amlogic,axg-spdifout' or
+	      'amlogic,g12a-spdifout'
 - clocks: list of clock phandle, one for each entry clock-names.
 - clock-names: should contain the following:
   * "pclk" : peripheral clock.

Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt

@@ -2,7 +2,9 @@
 
 Required properties:
 - compatible: 'amlogic,axg-tdmin' or
-	      'amlogic,axg-tdmout'
+	      'amlogic,axg-tdmout' or
+	      'amlogic,g12a-tdmin' or
+	      'amlogic,g12a-tdmout'
 - reg: physical base address of the controller and length of memory
        mapped region.
 - clocks: list of clock phandle, one for each entry clock-names.

Documentation/devicetree/bindings/vendor-prefixes.txt

@@ -375,6 +375,7 @@ sirf	SiRF Technology, Inc.
 sis	Silicon Integrated Systems Corp.
 sitronix	Sitronix Technology Corporation
 skyworks	Skyworks Solutions, Inc.
+smartlabs	SmartLabs LLC.
 smsc	Standard Microsystems Corporation
 snps	Synopsys, Inc.
 socionext	Socionext Inc.

Documentation/media/lirc.h.rst.exceptions

@@ -63,6 +63,7 @@ ignore symbol RC_PROTO_IMON
 ignore symbol RC_PROTO_RCMM12
 ignore symbol RC_PROTO_RCMM24
 ignore symbol RC_PROTO_RCMM32
+ignore symbol RC_PROTO_XBOX_DVD
 
 # Undocumented macros
 

arch/arm/kernel/asm-offsets.c

@@ -10,7 +10,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/compiler.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>

arch/arm64/boot/dts/amlogic/Makefile

@@ -3,7 +3,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max-2gb.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max-rmii.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
@@ -24,6 +24,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-smartlabs-sml5442tw.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

@@ -171,8 +171,7 @@
 		ranges;
 
 		ethmac: ethernet@ff3f0000 {
-			compatible = "amlogic,meson-axg-dwmac", "snps,dwmac-3.710",
-				     "snps,dwmac";
+			compatible = "amlogic,meson-axg-dwmac", "snps,dwmac";
 			reg = <0x0 0xff3f0000 0x0 0x10000
 			       0x0 0xff634540 0x0 0x8>;
 			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts

@@ -132,6 +132,13 @@
 &cec_AO {
 	pinctrl-0 = <&cec_ao_a_h_pins>;
 	pinctrl-names = "default";
+	status = "disabled";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
+&cecb_AO {
+	pinctrl-0 = <&cec_ao_b_h_pins>;
+	pinctrl-names = "default";
 	status = "okay";
 	hdmi-phandle = <&hdmi_tx>;
 };
@@ -163,6 +170,12 @@
 	};
 };
 
+&ir {
+	status = "okay";
+	pinctrl-0 = <&remote_input_ao_pins>;
+	pinctrl-names = "default";
+};
+
 &uart_AO {
 	status = "okay";
 	pinctrl-0 = <&uart_ao_a_pins>;

arch/arm64/boot/dts/amlogic/meson-g12a-x96-max-2gb.dts → arch/arm64/boot/dts/amlogic/meson-g12a-x96-max-rmii.dts

@@ -10,7 +10,7 @@
 #include <dt-bindings/gpio/meson-g12a-gpio.h>
 
 / {
-	compatible = "amediatech,x96-max", "amlogic,u200", "amlogic,g12a";
+	compatible = "amediatech,x96-max-rmii", "amlogic,u200", "amlogic,g12a";
 	model = "Shenzhen Amediatech Technology Co., Ltd X96 Max";
 
 	aliases {
@@ -64,7 +64,7 @@
 		regulator-name = "FLASH_1V8";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
-		vin-supply = <&vddao_3v3>;
+		vin-supply = <&vcc_3v3>;
 		regulator-always-on;
 	};
 
@@ -115,15 +115,6 @@
 		regulator-always-on;
 	};
 
-	vddio_ao1v8: regulator-vddio_ao1v8 {
-		compatible = "regulator-fixed";
-		regulator-name = "VDDIO_AO1V8";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		vin-supply = <&vddao_3v3>;
-		regulator-always-on;
-	};
-
 	vddao_3v3: regulator-vddao_3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "VDDAO_3V3";
@@ -133,16 +124,6 @@
 		regulator-always-on;
 	};
 
-	vddao_3v3_t: regultor-vddao_3v3_t {
-		compatible = "regulator-fixed";
-		regulator-name = "VDDAO_3V3_T";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vddao_3v3>;
-		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;
-		enable-active-high;
-	};
-
 	wifi32k: wifi32k {
 		compatible = "pwm-clock";
 		#clock-cells = <0>;
@@ -154,6 +135,13 @@
 &cec_AO {
 	pinctrl-0 = <&cec_ao_a_h_pins>;
 	pinctrl-names = "default";
+	status = "disabled";
+	hdmi-phandle = <&hdmi_tx>;
+};
+
+&cecb_AO {
+	pinctrl-0 = <&cec_ao_b_h_pins>;
+	pinctrl-names = "default";
 	status = "okay";
 	hdmi-phandle = <&hdmi_tx>;
 };
@@ -177,6 +165,13 @@
 	};
 };
 
+&ir {
+	status = "okay";
+	pinctrl-0 = <&remote_input_ao_pins>;
+	pinctrl-names = "default";
+	linux,rc-map-name = "rc-x96max";
+};
+
 &ext_mdio {
 	external_phy: ethernet-phy@0 {
 	      compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
@@ -186,24 +181,12 @@
 	};
 };
 
-//&ethmac {
-//	pinctrl-0 = <&eth_rmii_pins>, <&eth_rgmii_pins>;
-//	pinctrl-names = "default";
-//	status = "okay";
-//	phy-mode = "rgmii";
-//	phy-handle = <&external_phy>;
-//	amlogic,tx-delay-ns = <2>;
-//	snps,reset-gpio = <&gpio GPIOZ_14 0>;
-//	snps,reset-delays-us = <0 10000 1000000>;
-//	snps,reset-active-low;
-//};
-
 &ethmac {
-	status = "okay";
-	pinctrl-0 = <&eth_leds_pins>;
-	pinctrl-names = "default";
-	phy-handle = <&internal_ephy>;
-	phy-mode = "rmii";
+        pinctrl-0 = <&eth_rmii_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+        phy-mode = "rmii";
+        phy-handle = <&internal_ephy>;
 };
 
 &pwm_ef {
@@ -212,13 +195,6 @@
 	pinctrl-names = "default";
 };
 
-&ir {
-	status = "okay";
-	pinctrl-0 = <&remote_input_ao_pins>;
-	pinctrl-names = "default";
-	linux,rc-map-name = "rc-geekbox";
-};
-
 &uart_A {
 	status = "okay";
 	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
@@ -262,7 +238,7 @@
 	mmc-pwrseq = <&sdio_pwrseq>;
 
 	vmmc-supply = <&vddao_3v3>;
-	vqmmc-supply = <&vddio_ao1v8>;
+	vqmmc-supply = <&vddao_1v8>;
 
 	brcmf: wifi@1 {
 		reg = <1>;
@@ -299,9 +275,8 @@
 	max-frequency = <100000000>;
 	non-removable;
 	disable-wp;
-	mmc-ddr-1_8v;
 
 	mmc-pwrseq = <&emmc_pwrseq>;
-	vmmc-supply = <&vddao_3v3>;
+	vmmc-supply = <&vcc_3v3>;
 	vqmmc-supply = <&flash_1v8>;
 };