Merge branch 'master' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/.config

@@ -1745,8 +1745,8 @@ CONFIG_NET_PACKET_ENGINE=y
 # CONFIG_YELLOWFIN is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 CONFIG_NET_VENDOR_QUALCOMM=y
-CONFIG_QCA7000=y
-CONFIG_QCOM_EMAC=y
+CONFIG_QCA7000=m
+CONFIG_QCOM_EMAC=m
 # CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
 # CONFIG_NET_VENDOR_RDC is not set

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/[CCS]am335x-evm.dts

@@ -78,7 +78,7 @@
 			0x034 (PIN_OUTPUT | MUX_MODE7)	/* GPMC_AD13.GPIO1_13*/
 			0x038 (PIN_INPUT | MUX_MODE7)	/* GPMC_AD14.GPIO1_14*/
 			0x03C (PIN_OUTPUT | MUX_MODE7)	/* GPMC_AD15.GPIO1_15*/
-			0x078 (PIN_INPUT | MUX_MODE7)	/* GPMC_BEn1.GPIO1_28*/
+			/*0x078 (PIN_INPUT | MUX_MODE7)	*//* GPMC_BEn1.GPIO1_28*/
 			
 			/** GPIO 2 */
 			0x088 (PIN_INPUT | MUX_MODE7)	/* CCS=>GPMC_CSn3.GPIO2_0*/
@@ -92,9 +92,9 @@
 			0x0C4 (PIN_OUTPUT | MUX_MODE7)	/* LCD_DATA9.GPIO2_15*/
 			0x0CC (PIN_OUTPUT | MUX_MODE7)	/* LCD_DATA11.GPIO2_17*/
 			0x0E0 (PIN_OUTPUT | MUX_MODE7)	/* CCS=>LCD_VSYNC.GPIO2_22*/
-			0x0E4 (PIN_OUTPUT | MUX_MODE7)	/* CCS=>LCD_HSYNC.GPIO2_23*/
+			0x0E4 (PIN_INPUT | MUX_MODE7)	/* CCS=>LCD_HSYNC.GPIO2_23*/
 			0x0E8 (PIN_OUTPUT | MUX_MODE7)	/* CCS=>LCD_PCLK.GPIO2_24*/
-			0x0EC (PIN_OUTPUT | MUX_MODE7)	/* CCS=>LCD_AC_BIAS_EN.GPIO2_25*/
+			0x0EC (PIN_INPUT | MUX_MODE7)	/* CCS=>LCD_AC_BIAS_EN.GPIO2_25*/
 			
 			/** GPIO 3 */
 			0x108 (PIN_OUTPUT | MUX_MODE7)	/* MII1_COL.GPIO3_0 */
@@ -102,6 +102,7 @@
 			0x1A4 (PIN_OUTPUT | MUX_MODE7)	/* MCASP0_FSR.GPIO3_19 */
 			0x1A8 (PIN_INPUT | MUX_MODE7)	/* MCASP0_AXR1.GPIO3_20 */
 			/*0x1AC (PIN_INPUT | MUX_MODE7)	*//* CCS=>MCASP0_AHCLKX.GPIO3_21 */
+	
 		>;
 	};
 	
@@ -125,7 +126,7 @@
 			0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */
 		>;
 	};
-
+	
 	uart2_pins: pinmux_uart2_pins {
 		pinctrl-single,pins = <
 			0x10C (PIN_INPUT_PULLUP | MUX_MODE6)	/* MII1_CRS.AM_UART2_RXD */
@@ -202,66 +203,46 @@
 
 	cpsw_default: cpsw_default {
 		pinctrl-single,pins = <					
-		
-			/* Slave 1 */
-			0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txen.rgmii1_tctl */
-			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxdv.rgmii1_rctl */
-			0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd3.rgmii1_td3 */
-			0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd2.rgmii1_td2 */
-			0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd1.rgmii1_td1 */
-			0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txd0.rgmii1_td0 */
-			0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* mii1_txclk.rgmii1_tclk */
-			0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxclk.rgmii1_rclk */
-			0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd3.rgmii1_rd3 */
-			0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd2.rgmii1_rd2 */
-			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd1.rgmii1_rd1 */
-			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* mii1_rxd0.rgmii1_rd0 */
-		
-			/* Slave 2 */
-			0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a0.rgmii2_tctl */
-			0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a1.rgmii2_rctl */
-			0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a2.rgmii2_td3 */
-			0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a3.rgmii2_td2 */
-			0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a4.rgmii2_td1 */
-			0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a5.rgmii2_td0 */
-			0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a6.rgmii2_tclk */
-			0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a7.rgmii2_rclk */
-			0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a8.rgmii2_rd3 */
-			0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a9.rgmii2_rd2 */
-			0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a10.rgmii2_rd1 */
-			0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2)	/* gpmc_a11.rgmii2_rd0 */
+			
+			AM33XX_IOPAD(0x878, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_ben1.mii2_col */
+			/*AM33XX_IOPAD(0x888, PIN_INPUT_PULLUP | MUX_MODE2)	*/				/* GPMC_CSn3.rmii2_crs_dv*/								
+			/*AM33XX_IOPAD(0x874, PIN_INPUT_PULLUP | MUX_MODE1)*/					/* gpmc_wpn.mii2_rxerr */
+			AM33XX_IOPAD(0x858, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a6.mii2_txclk */
+			AM33XX_IOPAD(0x85c, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a7.mii2_rxclk */
+			AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a1.mii2_rxdv */
+			AM33XX_IOPAD(0x860, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a8.mii2_rxd3 */
+			AM33XX_IOPAD(0x864, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a9.mii2_rxd2 */
+			AM33XX_IOPAD(0x868, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a10.mii2_rxd1 */
+			AM33XX_IOPAD(0x86c, PIN_INPUT_PULLUP | MUX_MODE1)					/* gpmc_a11.mii2_rxd0 */
+			AM33XX_IOPAD(0x840, PIN_OUTPUT_PULLDOWN | MUX_MODE1)				/* gpmc_a0.mii2_txen */
+			AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE1)				/* gpmc_a2.mii2_txd3 */
+			AM33XX_IOPAD(0x84c, PIN_OUTPUT_PULLDOWN | MUX_MODE1)				/* gpmc_a3.mii2_txd2 */
+			AM33XX_IOPAD(0x850, PIN_OUTPUT_PULLDOWN | MUX_MODE1)				/* gpmc_a4.mii2_txd1 */
+			AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE1)				/* gpmc_a5.mii2_txd0 */
+			
 		>;
 	};
 
 	cpsw_sleep: cpsw_sleep {
 		pinctrl-single,pins = <
 			/* Slave 1 reset value */
-			0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-			0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)		
-
-			/* Slave 2 */
-			0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a0.rgmii2_tctl */
-			0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a1.rgmii2_rctl */
-			0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a2.rgmii2_td3 */
-			0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a3.rgmii2_td2 */
-			0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a4.rgmii2_td1 */
-			0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a5.rgmii2_td0 */
-			0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a6.rgmii2_tclk */
-			0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.rgmii2_rclk */
-			0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a8.rgmii2_rd3 */
-			0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a9.rgmii2_rd2 */
-			0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a10.rgmii2_rd1 */
-			0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a11.rgmii2_rd0 */
+
+			/*AM33XX_IOPAD(0x888, PIN_INPUT_PULLDOWN | MUX_MODE7)*/					/* GPMC_CSn3.rmii2_crs_dv*/	
+			AM33XX_IOPAD(0x840, PIN_INPUT_PULLDOWN | MUX_MODE7)				/* gpmc_a0.mii2_txen */
+			AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a1.mii2_rxdv */
+			AM33XX_IOPAD(0x848, PIN_INPUT_PULLDOWN | MUX_MODE7)				/* gpmc_a2.mii2_txd3 */
+			AM33XX_IOPAD(0x84c, PIN_INPUT_PULLDOWN | MUX_MODE7)			/* gpmc_a3.mii2_txd2 */
+			AM33XX_IOPAD(0x850, PIN_INPUT_PULLDOWN | MUX_MODE7)				/* gpmc_a4.mii2_txd1 */
+			AM33XX_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7)				/* gpmc_a5.mii2_txd0 */
+			AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a6.mii2_txclk */
+			AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a7.mii2_rxclk */
+			AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a8.mii2_rxd3 */
+			AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a9.mii2_rxd2 */
+			AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a10.mii2_rxd1 */
+			AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_a11.mii2_rxd0 */
+			/*AM33XX_IOPAD(0x874, PIN_INPUT_PULLDOWN | MUX_MODE7)*/	/* gpmc_wpn.mii2_rxerr */
+			AM33XX_IOPAD(0x878, PIN_INPUT_PULLDOWN | MUX_MODE7)	/* gpmc_ben1.mii2_col */
+
 		>;
 	};
 
@@ -334,6 +315,13 @@
 			AM33XX_IOPAD(0x964, MUX_MODE0)
 		>;
 	};
+	
+	EXTINTn_NMI {
+		compatible = "ti, EXTINTn";
+		status = "okay";
+		interrupt-parent = <&intc>;
+		interrupts = <7>;	
+}	;
     
 };
 
@@ -386,11 +374,11 @@
 		reg = <0x2d>;
 	};
 
-/*	rtc0: rtc@51 {
+	rtc0: rtc@51 {
                 compatible = "nxp,pcf85063";
                 reg = <0x51>;
         };
-*/
+
 };
 
 &i2c1 {
@@ -399,11 +387,6 @@
 
 	status = "okay";
 	clock-frequency = <400000>;
-
-	 rtc0: rtc@51 {
-                compatible = "nxp,pcf85063";
-                reg = <0x51>;
-        };
 };
 
 &usb {
@@ -539,27 +522,27 @@
 		};
 		partition@8 {
 			label = "Primary rootfs";
-			reg = <0x03000000 0x03000000>;
+			reg = <0x01800000 0x03000000>;
 		};
 		partition@9 {
 			label = "Secondary rootfs";
-			reg = <0x06000000 0x03000000>;
+			reg = <0x04800000 0x03000000>;
 		};
 		partition@10 {
 			label = "Primary user configuration";
-			reg = <0x09000000 0x00600000>;
+			reg = <0x07800000 0x00600000>;
 		};
 		partition@11 {
 			label = "Secondary user configuration";
-			reg = <0x09600000 0x00600000>;
+			reg = <0x07E00000 0x00600000>;
 		};
 		partition@12 {
 			label = "Factory default configuration";
-			reg = <0x09C00000 0x00600000>;
+			reg = <0x08400000 0x00600000>;
 		};
 		partition@13 {
 			label = "Storage";
-			reg = <0x0A200000 0x75E00000>;
+			reg = <0x08A00000 0x77600000>;
 		};
 	};
 };
@@ -642,13 +625,12 @@
 		};
 	};
 };
-#if 0
+
 &mac {
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&cpsw_default>;
 	pinctrl-1 = <&cpsw_sleep>;
 	status = "okay";
-	dual_emac;
 };
 
 &davinci_mdio {
@@ -659,15 +641,12 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
- 	phy-mode = "rgmii-txid";
-};
-
-&cpsw_emac1 {
 	phy_id = <&davinci_mdio>, <1>;
- 	phy-mode = "rgmii-txid";
+ 	phy-mode = "mii";
 };
-#endif
+
+
+
 &tscadc {
 	status = "okay";
 	/*tsc {
@@ -678,10 +657,11 @@
 	};*/
 
 	adc {
-		ti,adc-channels = <0 1 2 3 4 5 6 7>;
+		ti,adc-channels = <0 1 2 3>;
 	};
 };
 
+
 &mmc1 {
 	status = "okay";
 	vmmc-supply = <&vmmc_reg>;
@@ -753,3 +733,6 @@ The SPI should be used in burst mode, meaning that the chip select is held low d
 		pinctrl-0 = <&ecap0_pins>;
 	};
 };
+
+
+

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/am33xx-clocks.dtsi

@@ -21,7 +21,7 @@
 		compatible = "fixed-factor-clock";
 		clocks = <&sys_clkin_ck>;
 		clock-mult = <1>;
-		clock-div = <1>;
+		clock-div = <8>;
 	};
 
 	dcan0_fck: dcan0_fck {

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/am33xx.dtsi

@@ -1043,6 +1043,7 @@
 			status = "disabled";
 			dmas = <&edma 53 0>, <&edma 57 0>;
 			dma-names = "fifo0", "fifo1";
+			clocks = <&adc_tsc_fck>;
 
 			tsc {
 				compatible = "ti,am3359-tsc";